diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/artillery.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/artillery.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/artillery.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/artillery.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/cypress.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/cypress.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/cypress.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/cypress.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/global-template.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/global-template.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/gradle.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/gradle.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/gradle.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/gradle.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/jmeter.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/jmeter.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/jmeter.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/jmeter.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/k6.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/k6.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/k6.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/k6.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/maven.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/maven.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/maven.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/maven.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/playwright.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/playwright.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/playwright.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/playwright.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/postman.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/postman.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/postman.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/postman.yaml
diff --git a/charts/testkube-operator/templates/testworkflows/builtin-templates/serviceaccount.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/serviceaccount.yaml
similarity index 100%
rename from charts/testkube-operator/templates/testworkflows/builtin-templates/serviceaccount.yaml
rename to charts/testkube-api/templates/testworkflows/builtin-templates/serviceaccount.yaml
diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
index bb554bea5..da0156bd4 100644
--- a/charts/testkube-api/values.yaml
+++ b/charts/testkube-api/values.yaml
@@ -16,6 +16,13 @@ global:
   tolerations: []
   features:
     logsV2: false
+  testWorkflows:
+    createServiceAccountTemplates: true
+    createOfficialTemplates: true
+    globalTemplate:
+      enabled: false
+      name: global-template
+      spec: {}
 
 ### @section Common parameters
 ## Kubernetes version (using Helm capabilities if not set)
diff --git a/charts/testkube-operator/values.yaml b/charts/testkube-operator/values.yaml
index 2fb0b3197..b329541e1 100644
--- a/charts/testkube-operator/values.yaml
+++ b/charts/testkube-operator/values.yaml
@@ -16,13 +16,6 @@ global:
   nodeSelector: {}
   affinity: {}
   tolerations: []
-  testWorkflows:
-    createServiceAccountTemplates: true
-    createOfficialTemplates: true
-    globalTemplate:
-      enabled: false
-      name: global-template
-      spec: {}
 
 ### @section Common parameters
 ## Kubernetes version (using Helm capabilities if not set)