diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml
index 02f35b8..1e8b4a8 100644
--- a/meta/domain-devspaces/index.yaml
+++ b/meta/domain-devspaces/index.yaml
@@ -87,11 +87,6 @@ options:
     examples:
     - true
     type: boolean
-  autoCI:
-    default: true
-    examples:
-    - true
-    type: boolean
   backups:
     default:
       enable: false
@@ -255,6 +250,11 @@ options:
           type: string
       type: object
     type: array
+  haveFlux:
+    default: false
+    examples:
+    - false
+    type: boolean
   haveGitea:
     default: false
     examples:
diff --git a/meta/domain-devspaces/organisations.tf b/meta/domain-devspaces/organisations.tf
index 5ac9a4f..3824bf4 100644
--- a/meta/domain-devspaces/organisations.tf
+++ b/meta/domain-devspaces/organisations.tf
@@ -30,7 +30,7 @@ resource "kubectl_manifest" "organisations" {
           "datasets" = []
           "haveGitea" = var.haveGitea
           "haveTekton" = var.haveTekton
-          "autoCI" = var.autoCI
+          "haveFlux" = var.haveFlux
           "autoCD" = var.autoCD
         },
         { for k, v in local.sorted-organisations[count.index] : k => v if !contains(["name"], k) }
diff --git a/share/gitea-tekton-org/auto-ci.tf b/share/gitea-tekton-org/auto-ci.tf
index 83070e7..aa9dcba 100644
--- a/share/gitea-tekton-org/auto-ci.tf
+++ b/share/gitea-tekton-org/auto-ci.tf
@@ -86,7 +86,7 @@ resource "kubectl_manifest" "auto-ci-detector" {
 }
 
 resource "kubectl_manifest" "ci-trigger-push" {
-  count = var.autoCI?1:0
+  count = var.haveFlux?0:1
   yaml_body  = <<-EOF
     apiVersion: triggers.tekton.dev/v1beta1
     kind: Trigger
@@ -189,7 +189,7 @@ resource "kubectl_manifest" "ci-trigger-push" {
   EOF
 }
 resource "kubectl_manifest" "ci-trigger-tag" {
-  count = var.autoCI?1:0
+  count = var.haveFlux?0:1
   yaml_body  = <<-EOF
     apiVersion: triggers.tekton.dev/v1beta1
     kind: Trigger
diff --git a/share/gitea-tekton-org/index.yaml b/share/gitea-tekton-org/index.yaml
index 5d90b80..c977ede 100644
--- a/share/gitea-tekton-org/index.yaml
+++ b/share/gitea-tekton-org/index.yaml
@@ -11,11 +11,6 @@ options:
     examples:
     - true
     type: boolean
-  autoCI:
-    default: true
-    examples:
-    - true
-    type: boolean
   domain:
     default: your-company
     examples:
@@ -26,6 +21,11 @@ options:
     examples:
     - your_company.com
     type: string
+  haveFlux:
+    default: false
+    examples:
+    - false
+    type: boolean
   issuer:
     default: letsencrypt-prod
     examples:
diff --git a/share/organisation/ci-space.tf b/share/organisation/ci-space.tf
index e77e5a5..9959c9f 100644
--- a/share/organisation/ci-space.tf
+++ b/share/organisation/ci-space.tf
@@ -27,8 +27,8 @@ resource "kubectl_manifest" "tekton" {
         issuer: "${var.issuer}"
         organization: "${trimprefix(var.instance,"org-")}"
         stages: ${jsonencode(local.sorted-stage-name)}
-        autoCI: ${jsonencode(var.haveGitea&&var.haveTekton&& var.autoCI)}
-        autoCD: ${jsonencode(var.haveGitea&&var.haveTekton&& var.autoCD)}
+        haveFlux: ${jsonencode(var.haveFlux)}
+        autoCD: ${jsonencode(var.autoCD)}
 
   EOF
 }
diff --git a/share/organisation/index.yaml b/share/organisation/index.yaml
index 13216df..373ee21 100644
--- a/share/organisation/index.yaml
+++ b/share/organisation/index.yaml
@@ -16,11 +16,6 @@ options:
     examples:
     - true
     type: boolean
-  autoCI:
-    default: true
-    examples:
-    - true
-    type: boolean
   backups:
     default:
       enable: false
@@ -93,6 +88,11 @@ options:
     examples:
     - ''
     type: string
+  haveFlux:
+    default: false
+    examples:
+    - false
+    type: boolean
   haveGitea:
     default: false
     examples: