diff --git a/apps/sonar/sonar_Job.tf b/apps/sonar/sonar_Job.tf
index a270e47..d62c048 100644
--- a/apps/sonar/sonar_Job.tf
+++ b/apps/sonar/sonar_Job.tf
@@ -1,4 +1,5 @@
 resource "kubectl_manifest" "post_install_job" {
+  force_new = true
   yaml_body  = <<-EOF
     apiVersion: batch/v1
     kind: Job
diff --git a/share/organisation/check.rhai b/share/organisation/check.rhai
index 7fb03cb..45642cb 100644
--- a/share/organisation/check.rhai
+++ b/share/organisation/check.rhai
@@ -6,6 +6,9 @@ fn check_domain() {
 fn pre_check() {
     check_domain();
 }
+fn have_taiga() {
+    have_namespace(`${global::DOMAIN}-ci`) && have_install(`${global::DOMAIN}-ci`, "taiga") && have_service(`${global::DOMAIN}-ci`, "taiga-taiga") && have_secret(`${global::DOMAIN}-ci`, "taiga-taiga")
+}
 fn conditions() {
     let org = global::NAME;
     org.replace("org-","");
@@ -22,6 +25,7 @@ fn conditions() {
         log_info(`Found ${repos.len} repos`);
     }
     json_encode(#{
-        repos: repos
+        repos: repos,
+        have_taiga: have_taiga()
     })
 }
\ No newline at end of file
diff --git a/share/organisation/postconfig.tf b/share/organisation/postconfig.tf
index b67ff5b..ab0a547 100644
--- a/share/organisation/postconfig.tf
+++ b/share/organisation/postconfig.tf
@@ -1,6 +1,7 @@
 resource "kubectl_manifest" "post_install_job_taiga" {
   count  = var.conditions.have_taiga ? 1:0
-  yaml_body  = <<-EOF
+  force_new = true
+  yaml_body = <<-EOF
     apiVersion: batch/v1
     kind: Job
     metadata:
@@ -12,7 +13,7 @@ resource "kubectl_manifest" "post_install_job_taiga" {
         spec:
           restartPolicy: OnFailure
           initContainers:
-          - name: wait-for-sonar
+          - name: wait-for-taiga
             image: "${var.images.kubectl.registry}/${var.images.kubectl.repository}:${var.images.kubectl.tag}"
             imagePullPolicy: ${var.images.kubectl.pull_policy}
             securityContext: