diff --git a/canary-app-automatic/rollout.yaml b/canary-app-automatic/rollout.yaml
index 2f064adbb..1ac68d171 100644
--- a/canary-app-automatic/rollout.yaml
+++ b/canary-app-automatic/rollout.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/gitops-canary-app:v1.0
+        image: docker.io/containous/whoami:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/canary-app-manual/rollout.yaml b/canary-app-manual/rollout.yaml
index aedb19280..9219328cf 100644
--- a/canary-app-manual/rollout.yaml
+++ b/canary-app-manual/rollout.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/gitops-canary-app:v1.0
+        image: docker.io/kostiscodefresh/gitops-canary-app:v2.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/declarative/single-app/my-application.yml b/declarative/single-app/my-application.yml
index 022ae16fe..43ee751c4 100644
--- a/declarative/single-app/my-application.yml
+++ b/declarative/single-app/my-application.yml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: demo
+  name: democi
   # 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.
diff --git a/helm-apps/many-envs-chart/staging-values.yaml b/helm-apps/many-envs-chart/staging-values.yaml
index f7639508f..12d2e410d 100644
--- a/helm-apps/many-envs-chart/staging-values.yaml
+++ b/helm-apps/many-envs-chart/staging-values.yaml
@@ -1,3 +1,3 @@
 replicaCount: 1
 image:
-  tag: v2.0
+  tag: v3.0
diff --git a/kustomize-apps/base/deployment.yaml b/kustomize-apps/base/deployment.yaml
index ee51eebdc..9f724b6af 100644
--- a/kustomize-apps/base/deployment.yaml
+++ b/kustomize-apps/base/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
  labels:
    deployment: demo
 spec:
-  replicas: 1
+  replicas: 2
   template:
     metadata:
       labels:
diff --git a/kustomize-apps/overlays/production/config-map.yaml b/kustomize-apps/overlays/production/config-map.yaml
index da0d47b66..41698b1b1 100644
--- a/kustomize-apps/overlays/production/config-map.yaml
+++ b/kustomize-apps/overlays/production/config-map.yaml
@@ -3,5 +3,4 @@ kind: ConfigMap
 metadata:
   name: my-configuration
 data:
-  mysqlDB: "qa-mysql.example.com:3306"
- 
+  mysqlDB: "prod-mysql.acme.inc:3306"
diff --git a/secret-app/manifests/db-creds-encrypted.yaml b/secret-app/manifests/db-creds-encrypted.yaml
index 8b1378917..252414287 100644
--- a/secret-app/manifests/db-creds-encrypted.yaml
+++ b/secret-app/manifests/db-creds-encrypted.yaml
@@ -1 +1,18 @@
-
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: mysql-credentials
+  namespace: default
+spec:
+  encryptedData:
+    connection: AgBtsqc4f5w4rRXGASmMSRHrO8jyAWbrLqzb3jWcYQlhpvAImQmUn7MjPAXhmSIMu6kBQWokgzEhd8VJ3E8HDlMdsp9YGvNhEq1n2qqrm6cE6FGL3nnsarvFNa7yTPngs28MBKHPXwDg5O6tRS0e3IdoDN/R7cNWDQ4Mp4NoTKNzoIs1lmxQSZuYfJTWU5sfKZ3butaiTdnzOPdf+h+vwBqsEJxwSEfPujImBKF+/saMkQQiGgPbE9BhXoSfVUAf0d7f/AsInoD6aW3l2gcNG4+Iq8SUSBn07Ed2gNkPq+7WZ2afhJ2tUmG1mgyqLGweBxF3NhlL1+5m/gpvPXQ+2JlPTuxgvSM6ihZKbhrkVbRJ9Y3p/9zfliLs2MiyLyAMyRRZtLNPG9BaajmLSipTcKgkbFNfFWMMJ8jA9a2DKTi/gR9dIkuxBUSMs3vbt/OcRuzJsdRPkUJx83Bk0g2twx0hwCm5vLLcnLx++pNU3x8yBLsJJtia7Y11R3HRVls4vVboaw3+mL3lzw78lXgWWSj7kIQEcBFeq6lElIbSQmoc0eVPv68D5+gg6C33TyAAUx8CRweWsanEStMm/MxSD/9S3LlAF/rHDxFrpyrZwoRQPvjTLvDD76YVlky6QFXH18rUJPIwNROcrDxxPeBKuGIhUfv6ckwNIGUaVToP71yVkQg+Va2Wpi+nL6JvLrlNEFdm4cy9fqQh6GxUES5O3Kpcss68X/rQD2rXxBN1+IOZ9KU=
+    password: AgCLaW1YBjgIrvbef09xoScV2bNsH1q4YEoCq0MIyNWcfK4kD69l/rnKrLi61MTtJ8lS3CdUQwUF/hD2SgUJdzsGSdqwgVCE17lL6URB8UcWk36oFAObb/hCcm0iirKaAmsd69hi7FuCXI1lLuMhb214NwJ/vNGajD6Ta7FQdN0haisV582dqoi1fAZwiCF1ukkg6awI9V5hu6A1ISWzGlix2wmrTuWpIy7dhGw2tHqR/f7NJ1a3ZsLSjUJpIEQ1ZJ1uIzC1h0xxcIXSB+Qo2W5dminMUC2a62Y9BvOpb9Ucimqmgq4bw7zot6qFh4sBWIzkFzjUD6CvPteKN5zkuzEdvmJ7SF7cSqyTrSH8+RV3IJCa3/LJ2AD2zDnq+lF8ZvPIK/lrdTXs0CQEXMtQSccPYzjZsfZFHX6unGGPQKiw3z3UQKA98P+hAzam0ApnVW9VbT9h3mQ4xkVXxLrcSYrwcIIBGH1GXa7vpEku07M8Un6GldsgtAYvvarpG1eU7DA0e+iOIRsfBxo5/WLzFfcKpDnWYHDhF1d4UA4XYPMgGj/slxupdR1f0LDd29uVT3YmMNnOBjyNtaN35zHx1asYutaqgHb0Rsso+NFU2PPkU+fGqXlHWAtYY4D8CTsKBCZ6SgTRFwrfYn1sdwR+ow6Fdmw+pLgDUlsXF4ty27cFhiPeiA54Q1VDoS5HjN7nxW80BXZF1tr4Gq5Cct7VTHY=
+    username: AgA1Qj2vxjqJaujNc1PN1wI3l2+af5uzNDQKr68mWf5oZKkr5LV51gIKXhUZlHcNcin+uCUyLBCDqoVbCdMbvWpVzdrn6ItXZwSuj/67YeWxPS5O9c/s7iUWcyvJZuwmPLG6Lm7Kh9J/UuCfFtFLr483yHdBywM/zj+fNHH6i5B1efLHdADiTFWBtk680Oe2dlXfQH7MNjTHnvIhi2er2nAZqbVD4J14sX3zAVt7IAtFslA5d6SdL57uQPwKbY/wvM5ok9ba3j93+/64ZfLvRv5+Vt9oTIrdnPgRSoH+Wd4Heyq5RaRAOiwWiiqunVvC4R1QgbuSx8YkInXsRnDg3HtmzPR3Bu0PtaBdLF52fami4Gq3vicj60+YVrKrBpDZOGf2SZYTnXgAuYVdu77+UM5rRSfMV8judQaUhbvj63EVvuApA1AzGPTCALf0to/3Ms+EL88j7zyDXTiRQFmneGzVkNFvqtX35fWNBy7ti2yExBN5adXwk75LR6avuD13QtrjnkSFySP4gV6PPefLMzzvqEFZ32O42RuEGfzEZ/Ss7siBtC+nh0NrMyixHaYzHAdjNfcOci6GNjtlZZWStbqA7FA1+Qr76f7gxHXg8BuwCCVoRnxZ/W2NgPzPXWstqHOTLpSM9ZX+ysKBETn0Pz+6qN7OPbceb09fWf/QhoM9KnqZYUH5dEhZ2qX8PiaeboWFwanKKUsj6pTSCg==
+  template:
+    metadata:
+      creationTimestamp: null
+      name: mysql-credentials
+      namespace: default
+    type: Opaque
diff --git a/secret-app/manifests/paypal-cert-encrypted.yaml b/secret-app/manifests/paypal-cert-encrypted.yaml
index e69de29bb..361ca037e 100644
--- a/secret-app/manifests/paypal-cert-encrypted.yaml
+++ b/secret-app/manifests/paypal-cert-encrypted.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: paypal-cert
+  namespace: default
+spec:
+  encryptedData:
+    paypal.crt: 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
+  template:
+    metadata:
+      creationTimestamp: null
+      name: paypal-cert
+      namespace: default
+    type: Opaque
diff --git a/simple-app/deployment.yml b/simple-app/deployment.yml
index 7d8f54dfd..c845c3d90 100644
--- a/simple-app/deployment.yml
+++ b/simple-app/deployment.yml
@@ -15,6 +15,6 @@ spec:
     spec:
       containers:
       - name: webserver-simple
-        image: docker.io/kostiscodefresh/gitops-simple-app:v1.0
+        image: docker.io/kostiscodefresh/gitops-simple-app:v2.0
         ports:
         - containerPort: 8080
diff --git a/sync-strategies/deployment.yml b/sync-strategies/deployment.yml
deleted file mode 100644
index 7d8f54dfd..000000000
--- a/sync-strategies/deployment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: simple-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: trivial-go-web-app
-  template:
-    metadata:
-      labels:
-        app: trivial-go-web-app
-    spec:
-      containers:
-      - name: webserver-simple
-        image: docker.io/kostiscodefresh/gitops-simple-app:v1.0
-        ports:
-        - containerPort: 8080