diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
index 78ad3e0e6f80..f0db4e18b262 100644
--- a/manifests/quick-start-minimal.yaml
+++ b/manifests/quick-start-minimal.yaml
@@ -3612,7 +3612,7 @@ spec:
         - --auth-mode
         - client
         env: []
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -3658,7 +3658,11 @@ spec:
         app: workflow-controller
     spec:
       containers:
-      - args: []
+      - args:
+        - --configmap
+        - workflow-controller-configmap
+        - --executor-image
+        - quay.io/codefresh/argoexec:latest
         command:
         - workflow-controller
         env:
@@ -3667,7 +3671,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: quay.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
index 9cb62fe1bd6a..4296be2f518b 100644
--- a/manifests/quick-start-mysql.yaml
+++ b/manifests/quick-start-mysql.yaml
@@ -3656,7 +3656,7 @@ spec:
         - --auth-mode
         - client
         env: []
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -3702,7 +3702,11 @@ spec:
         app: workflow-controller
     spec:
       containers:
-      - args: []
+      - args:
+        - --configmap
+        - workflow-controller-configmap
+        - --executor-image
+        - quay.io/codefresh/argoexec:latest
         command:
         - workflow-controller
         env:
@@ -3711,7 +3715,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: quay.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
index 7cb175c2cea6..0b5924468174 100644
--- a/manifests/quick-start-postgres.yaml
+++ b/manifests/quick-start-postgres.yaml
@@ -3656,7 +3656,7 @@ spec:
         - --auth-mode
         - client
         env: []
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -3702,7 +3702,11 @@ spec:
         app: workflow-controller
     spec:
       containers:
-      - args: []
+      - args:
+        - --configmap
+        - workflow-controller-configmap
+        - --executor-image
+        - quay.io/codefresh/argoexec:latest
         command:
         - workflow-controller
         env:
@@ -3711,7 +3715,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: quay.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:
diff --git a/test/e2e/testdata/artifact-workflow-stopped.yaml b/test/e2e/testdata/artifact-workflow-stopped.yaml
index ae85aa207a3f..9f34f1f6f2a7 100644
--- a/test/e2e/testdata/artifact-workflow-stopped.yaml
+++ b/test/e2e/testdata/artifact-workflow-stopped.yaml
@@ -15,7 +15,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -53,7 +53,7 @@ spec:
             done
     - name: workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop
diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml
index ddce1199d629..fb7a1919d844 100644
--- a/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml
+++ b/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml
@@ -20,7 +20,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -59,7 +59,7 @@ spec:
             done
     - name: artgc-dag-workflow-deleter
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - delete
diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml
index a1cf99967bb1..030756ed9305 100644
--- a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml
+++ b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml
@@ -18,7 +18,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -60,7 +60,7 @@ spec:
             done
     - name: artgc-dag-workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop
diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml
index 12251ae51238..bb32a17b5095 100644
--- a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml
+++ b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml
@@ -20,7 +20,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -62,7 +62,7 @@ spec:
             done
     - name: artgc-dag-workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop
diff --git a/test/e2e/testdata/retry-on-stopped.yaml b/test/e2e/testdata/retry-on-stopped.yaml
index 6b7276f570cb..81f77648282f 100644
--- a/test/e2e/testdata/retry-on-stopped.yaml
+++ b/test/e2e/testdata/retry-on-stopped.yaml
@@ -24,11 +24,11 @@ spec:
     - name: sleep
       container:
         image: alpine:latest
-        command: [ sleep, "10" ]
+        command: [sleep, "10"]
 
     - name: stop
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop