diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 84a0c7762c..680c5356c7 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Setup ArgoCD
         run: |
           mkdir "$GITHUB_WORKSPACE/bin"
-          curl -L https://github.com/argoproj/argo-cd/releases/download/v2.0.3/argocd-linux-amd64 > "$GITHUB_WORKSPACE/bin/argocd"
+          curl -L https://github.com/argoproj/argo-cd/releases/download/v2.0.4/argocd-linux-amd64 > "$GITHUB_WORKSPACE/bin/argocd"
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
           chmod +x "$GITHUB_WORKSPACE/bin/argocd"
 
@@ -111,7 +111,7 @@ jobs:
       - name: Setup ArgoCD
         run: |
           mkdir "$GITHUB_WORKSPACE/bin"
-          curl -L https://github.com/argoproj/argo-cd/releases/download/v2.0.3/argocd-linux-amd64 > "$GITHUB_WORKSPACE/bin/argocd"
+          curl -L https://github.com/argoproj/argo-cd/releases/download/v2.0.4/argocd-linux-amd64 > "$GITHUB_WORKSPACE/bin/argocd"
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
           chmod +x "$GITHUB_WORKSPACE/bin/argocd"
 
@@ -171,7 +171,7 @@ jobs:
 
       - name: ArgoCD app diff with ${{ github.ref }}
         id: app-diff
-        uses: docker://argoproj/argocd:v2.0.3
+        uses: docker://argoproj/argocd:v2.0.4
         env:
           KUBECONFIG: ${{ github.workspace }}/kubeconfig
           APP_OF_APPS_VALUES_0 : ${{ github.workspace }}/values0.yaml
diff --git a/.gitlab-ci/pipeline.yaml b/.gitlab-ci/pipeline.yaml
index cc0639c09e..e37bdd2080 100644
--- a/.gitlab-ci/pipeline.yaml
+++ b/.gitlab-ci/pipeline.yaml
@@ -1,6 +1,6 @@
 ---
 variables:
-  ARGOCD_VERSION: "2.0.3"
+  ARGOCD_VERSION: "2.0.4"
   TERRAFORM_VERSION: "1.0.0"
   TF_ROOT: "terraform"
 
diff --git a/modules/argocd-helm/main.tf b/modules/argocd-helm/main.tf
index d150010ede..d61e24fd92 100644
--- a/modules/argocd-helm/main.tf
+++ b/modules/argocd-helm/main.tf
@@ -125,9 +125,7 @@ resource "null_resource" "wait_for_app_of_apps" {
     KUBECONFIG=$(mktemp /tmp/kubeconfig.XXXXXX)
     echo "$KUBECONFIG_CONTENT" > "$KUBECONFIG"
     export KUBECONFIG
-    for i in `seq 1 60`; do
-      argocd app wait apps --sync --health --timeout 30 && rm "$KUBECONFIG" && exit 0
-    done
+    argocd app wait apps --sync --health --timeout 1800 && rm "$KUBECONFIG" && exit 0
     echo TIMEOUT
     rm "$KUBECONFIG"
     exit 1
diff --git a/modules/values.tmpl.yaml b/modules/values.tmpl.yaml
index db89922098..45d6783f0e 100644
--- a/modules/values.tmpl.yaml
+++ b/modules/values.tmpl.yaml
@@ -54,6 +54,9 @@ ${yamlencode({"extraApplicationSets": extra_application_sets})}
 
 argo-cd:
   installCRDs: false
+  global:
+    image:
+      tag: "v2.0.4"
   configs:
     %{ if length(repositories) > 0 }
     repositoryCredentials: