diff --git a/CHANGELOG/release-notes-v0.6.21.md b/CHANGELOG/release-notes-v0.6.21.md
new file mode 100644
index 00000000000..7edb2f41fae
--- /dev/null
+++ b/CHANGELOG/release-notes-v0.6.21.md
@@ -0,0 +1,26 @@
+## v0.6.21
+
+## Bugs
+- fix: deployment timelines fix for helm apps (#3794)
+- fix: duplicate role-group-fix (#3774)
+- fix: prevented chart updation when its in use (#3755)
+- fix: Unable to delete chart group with existing helm chart (#3795)
+- fix: fix for deleting all pre-post cd at once didn't delete them  (#3786)
+## Enhancements
+- feat: removed additionalBackends from app-values.yaml (#3807)
+- feat: added support for extra backendPath in ingress  (#3793)
+- perf: hibernate check optimisation (#3788)
+## Documentation
+- doc: Update devtron-reference charts with pdb (#3719)
+- doc: include the purpose of admin login in Devtron installation doc + FAQ (#3790)
+- doc: manual image approval (#3649)
+- doc: mandatory tags feature (#3630)
+- doc: ci-trigger documentation update (#3629)
+- docs: container lifecycle  (#3623)
+- doc: security feature doc (#3622)
+- doc: HashiCorp external secret operator (#3608)
+## Others
+- chore: adding logs in chart repo code (#3810)
+- chore: Config approval scripts and refactoring (#3762)
+
+
diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
index 068b89b51a6..b31a0455366 100644
--- a/charts/devtron/Chart.yaml
+++ b/charts/devtron/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 0.6.20
+appVersion: 0.6.21
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.59
+version: 0.22.60
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
index 5161fc3b746..9a9f0c051fc 100644
--- a/charts/devtron/devtron-bom.yaml
+++ b/charts/devtron/devtron-bom.yaml
@@ -9,13 +9,13 @@ global:
     runAsNonRoot: true
 
 installer:
-  release: "v0.6.20"
+  release: "v0.6.21"
   image: "quay.io/devtron/inception"
   tag: "44b30917-185-13275"
   
 components:
   dashboard:
-    image: "quay.io/devtron/dashboard:0ec7e2f2-325-14899"
+    image: "quay.io/devtron/dashboard:2bc7be59-325-14997"
     config:
       extraConfigs:
         USE_V2: "true"
@@ -23,10 +23,10 @@ components:
         ENABLE_RESTART_WORKLOAD: "true"
         HIDE_EXCLUDE_INCLUDE_GIT_COMMITS: "false"
   devtron:
-    image: "quay.io/devtron/hyperion:30c1c3c4-280-14903"
-    cicdImage: "quay.io/devtron/devtron:30c1c3c4-434-14904"
+    image: "quay.io/devtron/hyperion:f1cf1ba4-280-15016"
+    cicdImage: "quay.io/devtron/devtron:f1cf1ba4-434-15017"
     customOverrides:
-      DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:71e590dd-138-14841"
+      DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:8a9f8b8c-138-15021"
   argocdDexServer:
     image: "ghcr.io/dexidp/dex:v2.30.2"
     initContainer:
@@ -52,10 +52,10 @@ components:
     envVars:
       devtron:
         GIT_BRANCH: "main"
-        GIT_HASH: "30c1c3c4d544f1c5df9b5c35825f6c248c8c458b"
+        GIT_HASH: "f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d"
       casbin:
         GIT_BRANCH: "main"
-        GIT_HASH: "30c1c3c4d544f1c5df9b5c35825f6c248c8c458b"
+        GIT_HASH: "f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d"
         
 argo-cd:
   global:
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
index f64c37d0275..4c3000e1b7d 100644
--- a/charts/devtron/values.yaml
+++ b/charts/devtron/values.yaml
@@ -10,7 +10,7 @@ global:
 installer:
   repo: "devtron-labs/devtron"
 #  For Kubernetes version < 1.16, set release: legacy. You won't be able to upgrade Devtron unless you upgrade the K8s version to 1.16 or above.
-  release: "v0.6.20" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
+  release: "v0.6.21" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
   image: quay.io/devtron/inception
   tag: 44b30917-185-13275
   source: "github" # Available options are github and gitee
@@ -57,15 +57,15 @@ components:
         ENABLE_BUILD_CONTEXT: "true"
         ENABLE_RESTART_WORKLOAD: "true"
         HIDE_EXCLUDE_INCLUDE_GIT_COMMITS: "false"
-    image: "quay.io/devtron/dashboard:0ec7e2f2-325-14899"
+    image: "quay.io/devtron/dashboard:2bc7be59-325-14997"
     imagePullPolicy: IfNotPresent
 
   devtron:
-    image: "quay.io/devtron/hyperion:30c1c3c4-280-14903"
-    cicdImage: "quay.io/devtron/devtron:30c1c3c4-434-14904"
+    image: "quay.io/devtron/hyperion:f1cf1ba4-280-15016"
+    cicdImage: "quay.io/devtron/devtron:f1cf1ba4-434-15017"
     imagePullPolicy: IfNotPresent
     customOverrides:
-      DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:71e590dd-138-14841"
+      DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:8a9f8b8c-138-15021"
     serviceMonitor:
       enabled: false
     service:
@@ -123,13 +123,13 @@ components:
         SCRIPT_LOCATION: "scripts/sql/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "orchestrator"
-        GIT_HASH: "30c1c3c4d544f1c5df9b5c35825f6c248c8c458b"
+        GIT_HASH: "f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d"
       casbin:
         GIT_BRANCH: "main"
         SCRIPT_LOCATION: "scripts/casbin/"
         GIT_REPO_URL: "https://github.com/devtron-labs/devtron.git"
         DB_NAME: "casbin"
-        GIT_HASH: "30c1c3c4d544f1c5df9b5c35825f6c248c8c458b"
+        GIT_HASH: "f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d"
 
 # values for argocd integration
 argo-cd:
diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml
index 87cd83a7fab..03ec2cdf872 100644
--- a/manifests/install/devtron-installer.yaml
+++ b/manifests/install/devtron-installer.yaml
@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.20/manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.21/manifests/installation-script
diff --git a/manifests/installation-script b/manifests/installation-script
index 9a83199a905..2e603725257 100644
--- a/manifests/installation-script
+++ b/manifests/installation-script
@@ -1,4 +1,4 @@
-LTAG="v0.6.20";
+LTAG="v0.6.21";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 
 operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret;
diff --git a/manifests/release.txt b/manifests/release.txt
index 5c04854aa30..c5b715dc58d 100644
--- a/manifests/release.txt
+++ b/manifests/release.txt
@@ -1 +1 @@
-stable -1 v0.6.20
+stable -1 v0.6.21
diff --git a/manifests/version.txt b/manifests/version.txt
index 672c01a4513..a0387771ce3 100644
--- a/manifests/version.txt
+++ b/manifests/version.txt
@@ -1 +1 @@
-v0.6.20
+v0.6.21
diff --git a/manifests/yamls/dashboard.yaml b/manifests/yamls/dashboard.yaml
index fff67abb11a..eb82cf5e5b2 100644
--- a/manifests/yamls/dashboard.yaml
+++ b/manifests/yamls/dashboard.yaml
@@ -235,7 +235,7 @@ spec:
             - name: envoy-config-volume
               mountPath: /etc/envoy-config/
         - name: dashboard
-          image: "quay.io/devtron/dashboard:0ec7e2f2-325-14899"
+          image: "quay.io/devtron/dashboard:2bc7be59-325-14997"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/manifests/yamls/devtron.yaml b/manifests/yamls/devtron.yaml
index e6400f8a455..8150342c8ba 100644
--- a/manifests/yamls/devtron.yaml
+++ b/manifests/yamls/devtron.yaml
@@ -53,7 +53,7 @@ data:
   CD_NODE_TAINTS_VALUE: "ci"
   CD_ARTIFACT_LOCATION_FORMAT: "%d/%d.zip"
   DEFAULT_CD_NAMESPACE: "devtron-cd"
-  DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:71e590dd-138-14841"
+  DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:8a9f8b8c-138-15021"
   DEFAULT_CD_TIMEOUT: "3600"
   WF_CONTROLLER_INSTANCE_ID: "devtron-runner"
   CI_LOGS_KEY_PREFIX: "ci-artifacts"
@@ -162,7 +162,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: devtron
-          image: "quay.io/devtron/devtron:30c1c3c4-434-14904"
+          image: "quay.io/devtron/devtron:f1cf1ba4-434-15017"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 1000
diff --git a/manifests/yamls/migrator.yaml b/manifests/yamls/migrator.yaml
index 24adfb7232d..62057606133 100644
--- a/manifests/yamls/migrator.yaml
+++ b/manifests/yamls/migrator.yaml
@@ -47,7 +47,7 @@ spec:
         - name: MIGRATE_TO_VERSION
           value: "0"
         - name: GIT_HASH
-          value: 30c1c3c4d544f1c5df9b5c35825f6c248c8c458b
+          value: f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d
         envFrom:
           - secretRef:
               name: postgresql-migrator
@@ -96,7 +96,7 @@ spec:
         - name: MIGRATE_TO_VERSION
           value: "0"
         - name: GIT_HASH
-          value: 30c1c3c4d544f1c5df9b5c35825f6c248c8c458b
+          value: f1cf1ba4a9000f084ac6fdd669501f57d1ef4f2d
         - name: GIT_BRANCH
           value: main
         envFrom:
diff --git a/manifests/yamls/serviceaccount.yaml b/manifests/yamls/serviceaccount.yaml
index 010d0b3de7a..4fb66aaadb7 100644
--- a/manifests/yamls/serviceaccount.yaml
+++ b/manifests/yamls/serviceaccount.yaml
@@ -32,6 +32,18 @@ metadata:
   # "namespace" omitted since ClusterRoles are not namespaced
   name: workflow-cluster-role
 rules:
+- apiGroups:
+  - '*'
+  resources:
+  - deployment
+  - pods
+  - pods/exec
+  verbs:
+  - create
+  - list
+  - get
+  - update
+  - exec
 - apiGroups:
   - ""
   resources:
diff --git a/releasenotes.md b/releasenotes.md
index 3c23cf7f5d9..7edb2f41fae 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,71 +1,26 @@
-## v0.6.20
+## v0.6.21
 
 ## Bugs
-- fix: resource tree panic fix (#3775)
-- fix: remove use-buildx flag to use k8s buildx driver (#3773)
-- fix: updated user flow update api unlock condition (#3770)
-- fix: rbac fix terminal connection on view and edit in helm apps (#3723)
-- fix:  Intermittent helm apps deployment fail deployed through gitops (#3756)
-- fix: server version check for ephemeral suport bug fix (#3757)
-- fix:  app status fix for helm apps which are deployed via acd (#3746)
-- fix: Showing port number instead of string port_number. (#3729)
-- fix:migration script issue  (#3750)
-- fix: resource tree error handling miss (#3704)
-- fix: manifest output is not in sync with selected chart version and wrong manifest coming in deployment history (#3701)
-- fix: empty format type in global variable fix (#3695)
-- fix: matching k8s version using regex for ephemeral container feature support (#3688)
-- fix: auto deploy fix for migrated pre/post cd steps where inly one is configured (#3677)
-- fix: blob storage upload failed due to USE_BLOB_STORAGE_CONFIG_IN_CI_WORKFLOW flag (#3667)
-- fix: Pod for in-cluster not getting scheduled because of node affinity selector. (#3663)
-- fix: optimized fetch deployment status timeline api (#3653)
-- fix: critical vulnerabilities in dependencies (#3632)
-- fix: Scan tool metadata enabling for Security Module (#3598)
-- fix: obfuscate secret for devtron/helm apps (#3602)
-- Fix: SSO configuration gets change after refreshing the page (#3605)
-- fix Role group delete fix (#3609)
-- fix: Deployment enforcement config save err(#3626)
-- fix: updated ValidateRegistryStorageType for OCI registry configs(#3634)
-- fix: Clone of app with external-ci (#3624)
-- Fix: optimizing when querying DB to get running Helm deployments (#3637)
+- fix: deployment timelines fix for helm apps (#3794)
+- fix: duplicate role-group-fix (#3774)
+- fix: prevented chart updation when its in use (#3755)
+- fix: Unable to delete chart group with existing helm chart (#3795)
+- fix: fix for deleting all pre-post cd at once didn't delete them  (#3786)
 ## Enhancements
-- feat: support for docker buildx k8s driver (#3743)
-- perf:  user update api concurrent request handling (#3760)
-- feat: workflow to validate PRs if an issue is linked or not (#3730)
-- feat:sql script file added for Approval node notification  (#3725)
-- feat: Allow changing chart ref (#3706)
-- feat: Patch branch api (#3722)
-- feat: App grouping admin access (#3692)
-- feat: description for apps and jobs (#3668)
-- Enhancement: Kubernetes api refactoring (#3635)
-- feat: Patch source of ci material api (#3661)
-- feat: Bulk deployemnt with appName and EnvName (#3644)
-- feat: Ephemeral containers (#3618)
-- feat: flag for node (#3654)
-- feat: plugin and step support in pre post cd (#3563)
-- feat: edit Ingress for specific host (#3640)
-- feat: enhancement app workflow clone, added specific deployment clone in workflow (#3645)
-- Feature: Run Devtron Jobs in application environment (#3572)
-- feat: support for official argo rollout with Canary (#3591)
-- feat: image tagging feat (3446)
-- feat: pod manifest edit feature and option to connect session with node debug pod (#3116)
-- feat: devtronContainerImageRepo variable added (#3604)
-- feat: Integrated OCI registries in global config artifact store.(#3567)
-- feat: Flag to pass build platform globally(#3625)
-- enhancement: enforcing deployment type in environment (#3616)
+- feat: removed additionalBackends from app-values.yaml (#3807)
+- feat: added support for extra backendPath in ingress  (#3793)
+- perf: hibernate check optimisation (#3788)
 ## Documentation
-- docs: removed new line from token generation command (#3710)
-- docs: disaster recovery docs (#3236)
-- docs: added devtron release note in summary.md (#3681)
-- docs: Updated readme for 4.18 chart for winter soldier. (#3673)
+- doc: Update devtron-reference charts with pdb (#3719)
+- doc: include the purpose of admin login in Devtron installation doc + FAQ (#3790)
+- doc: manual image approval (#3649)
+- doc: mandatory tags feature (#3630)
+- doc: ci-trigger documentation update (#3629)
+- docs: container lifecycle  (#3623)
+- doc: security feature doc (#3622)
+- doc: HashiCorp external secret operator (#3608)
 ## Others
-- chore: Addition of K9s image in cluster terminal (#3779)
-- chore: migration for kubectl proxy (#3731)
-- chore: Update pr-issue-validator.yaml (#3740)
-- chore: Removed path-ignore section in pr-issue-validator (#3739)
-- fix : Resource list fetch for K8s (#3713)
-- integration test cases FW (#3508)
-- task: Updated chart version for v0.6.19 (#3639)
-- chore: added migration for reference chart 5-0-0 with active false (#3692)
-- task: updated plugin list to include i/o vars, refactored detail get api (#3627)
+- chore: adding logs in chart repo code (#3810)
+- chore: Config approval scripts and refactoring (#3762)