diff --git a/app-of-apps/my-app-list/argo-workflows.yml b/app-of-apps/my-app-list/argo-workflows.yml
new file mode 100644
index 0000000000..bd43d9c93d
--- /dev/null
+++ b/app-of-apps/my-app-list/argo-workflows.yml
@@ -0,0 +1,32 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: argo-workflows
+  # You'll usually want to add your resources to the argocd namespace.
+  namespace: argocd
+  # Add a this finalizer ONLY if you want these to cascade delete.
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  # The project the application belongs to.
+  project: default
+
+  # Source of the application manifests
+  source:
+    repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git
+    targetRevision: HEAD
+    path: ./app-of-apps/manifests
+   
+  # Destination cluster and namespace to deploy the application
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argo-workflows
+
+  # Sync policy
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true  
+    automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field.
+      prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ).
+      selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ).
+  
diff --git a/app-of-apps/my-app-list/kubeview.yml b/app-of-apps/my-app-list/kubeview.yml
new file mode 100644
index 0000000000..91cb797c23
--- /dev/null
+++ b/app-of-apps/my-app-list/kubeview.yml
@@ -0,0 +1,32 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kubeview
+  # You'll usually want to add your resources to the argocd namespace.
+  namespace: argocd
+  # Add a this finalizer ONLY if you want these to cascade delete.
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  # The project the application belongs to.
+  project: default
+
+  # Source of the application manifests
+  source:
+    repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git
+    targetRevision: HEAD
+    path: ./app-of-apps/manifests
+   
+  # Destination cluster and namespace to deploy the application
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: kubeview
+
+  # Sync policy
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true  
+    automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field.
+      prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ).
+      selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ).
+  
diff --git a/app-of-apps/root-app/my-application.yml b/app-of-apps/root-app/my-application.yml
index a5bc9b98c3..3fb03a98eb 100644
--- a/app-of-apps/root-app/my-application.yml
+++ b/app-of-apps/root-app/my-application.yml
@@ -13,7 +13,7 @@ spec:
 
   # Source of the application manifests
   source:
-    repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git
+    repoURL: https://github.com/larrietacohen/gitops-cert-level-2-examples.git
     targetRevision: HEAD
     path: ./app-of-apps/my-app-list
    
diff --git a/application-sets/my-application-sets/many-apps-many-cluster.yml b/application-sets/my-application-sets/many-apps-many-cluster.yml
new file mode 100644
index 0000000000..6d34162182
--- /dev/null
+++ b/application-sets/my-application-sets/many-apps-many-cluster.yml
@@ -0,0 +1,35 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: cluster-git
+spec:
+  generators:
+    # matrix 'parent' generator
+    - matrix:
+        generators:
+          # git generator, 'child' #1
+          - git:
+              repoURL: https://github.com/larrietacohen/gitops-cert-level-2-examples.git
+              revision: HEAD
+              directories:
+                - path: application-sets/example-apps/*
+          # cluster generator, 'child' #2
+          - clusters: {}
+  template:
+    metadata:
+      name: '{{path.basename}}-{{name}}'
+    spec:
+      project: default
+      source:
+        repoURL: https://github.com/larrietacohen/gitops-cert-level-2-examples.git
+        targetRevision: HEAD
+        path: '{{path}}'
+      destination:
+        server: '{{server}}'
+        namespace: '{{path.basename}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
diff --git a/application-sets/my-application-sets/single-app-many-times.yml b/application-sets/my-application-sets/single-app-many-times.yml
deleted file mode 100644
index 2a4c107b7f..0000000000
--- a/application-sets/my-application-sets/single-app-many-times.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: billing-application-set
-  namespace: argocd
-spec:
-  generators:
-  - list:
-      elements:
-      - namespace: team-a
-      - namespace: team-b
-      - namespace: team-c
-      - namespace: staging
-  template:      
-    metadata:
-      name: '{{namespace}}-billing'
-    spec:
-      # The project the application belongs to.
-      project: default
-
-      # Source of the application manifests
-      source:
-        repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git
-        targetRevision: HEAD
-        path: ./application-sets/manifests
-      
-      # Destination cluster and namespace to deploy the application
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: '{{namespace}}'
-
-      # Sync policy
-      syncPolicy:
-        syncOptions:
-          - CreateNamespace=true  
-        automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field.
-          prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ).
-          selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ).
-      
diff --git a/environment-promotion/envs/prod/settings.yml b/environment-promotion/envs/prod/settings.yml
index 2b94ef8ad9..400ffc97fb 100644
--- a/environment-promotion/envs/prod/settings.yml
+++ b/environment-promotion/envs/prod/settings.yml
@@ -10,7 +10,7 @@ spec:
       - name: webserver-simple
         env:
         - name: UI_THEME
-          value: "dark"
+          value: "light"
         - name: CACHE_SIZE
           value: "1024kb"
         - name: PAGE_LIMIT
@@ -18,4 +18,4 @@ spec:
         - name: SORTING
           value: "ascending"    
         - name: N_BUCKETS
-          value: "12"          
+          value: "24"          
\ No newline at end of file
diff --git a/environment-promotion/envs/prod/version.yml b/environment-promotion/envs/prod/version.yml
index 51bc5350da..c088376339 100644
--- a/environment-promotion/envs/prod/version.yml
+++ b/environment-promotion/envs/prod/version.yml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/simple-env-app:1.0
+        image: docker.io/kostiscodefresh/simple-env-app:3.0
diff --git a/environment-promotion/envs/qa/settings.yml b/environment-promotion/envs/qa/settings.yml
index 738a5bec3a..400ffc97fb 100644
--- a/environment-promotion/envs/qa/settings.yml
+++ b/environment-promotion/envs/qa/settings.yml
@@ -12,10 +12,10 @@ spec:
         - name: UI_THEME
           value: "light"
         - name: CACHE_SIZE
-          value: "2048kb"
+          value: "1024kb"
         - name: PAGE_LIMIT
           value: "25"
         - name: SORTING
           value: "ascending"    
         - name: N_BUCKETS
-          value: "42"          
\ No newline at end of file
+          value: "24"          
\ No newline at end of file
diff --git a/environment-promotion/envs/staging/version.yml b/environment-promotion/envs/staging/version.yml
index 0423d0fa0a..c088376339 100644
--- a/environment-promotion/envs/staging/version.yml
+++ b/environment-promotion/envs/staging/version.yml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/simple-env-app:2.0
+        image: docker.io/kostiscodefresh/simple-env-app:3.0
diff --git a/sync-hooks-waves/03-postsync-cleanup/cleanup.yml b/sync-hooks-waves/03-postsync-cleanup/cleanup.yml
index 3a6550aa12..69b04f5791 100644
--- a/sync-hooks-waves/03-postsync-cleanup/cleanup.yml
+++ b/sync-hooks-waves/03-postsync-cleanup/cleanup.yml
@@ -5,8 +5,8 @@ metadata:
   generateName: cleanup-after-sync-
   labels:
     codefresh.io/cert: cleanup-job
-  #annotations:
-      #argocd.argoproj.io/hook: PostSync
+  annotations:
+      argocd.argoproj.io/hook: PostSync
 spec:
   template:
     spec: