diff --git a/enforcer/CHANGELOG.md b/enforcer/CHANGELOG.md
index 75da1e7f..7d15ff81 100644
--- a/enforcer/CHANGELOG.md
+++ b/enforcer/CHANGELOG.md
@@ -1,4 +1,12 @@
 ## 6.0.1 (April 5th, 2021)
 
 Improvements:
-* Adding Changelog
\ No newline at end of file
+* Adding Changelog
+
+## 6.0.2 (May 5th, 2021)
+
+Improvements:
+* Updated Readme
+
+Bugs:
+* Service Account naming error #[241](https://github.com/aquasecurity/aqua-helm/pull/241)
diff --git a/enforcer/Chart.yaml b/enforcer/Chart.yaml
index e262cc90..8dbcc5cd 100644
--- a/enforcer/Chart.yaml
+++ b/enforcer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.0"
 description: A Helm chart for the Aqua Enforcer
 name: enforcer
-version: 6.0.1
+version: 6.0.2
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 home: https://www.aquasec.com/
 maintainers:
diff --git a/enforcer/README.md b/enforcer/README.md
index 4f08f92a..513da31a 100644
--- a/enforcer/README.md
+++ b/enforcer/README.md
@@ -29,14 +29,14 @@ Follow the steps in this section for production grade deployments. You can eithe
 * Clone the GitHub repository with the charts
 
 ```bash
-git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
-cd aqua-helm/
+$ git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
+$ cd aqua-helm/
 ```
 
 * Install Aqua Enforcer
 
 ```bash
-helm upgrade --install --namespace aqua aqua-enforcer ./enforcer --set imageCredentials.username=<>,imageCredentials.password=<>,enforcerToken=<aquasec-token>
+$ helm upgrade --install --namespace aqua aqua-enforcer ./enforcer --set imageCredentials.username=<>,imageCredentials.password=<>,enforcerToken=<aquasec-token>
 ```
 
 ### Installing Aqua Enforcer from Helm Private Repository
@@ -46,10 +46,15 @@ helm upgrade --install --namespace aqua aqua-enforcer ./enforcer --set imageCred
 $ helm repo add aqua-helm https://helm.aquasec.com
 ```
 
+* Check for the available chart versions either from [Changelog](./CHANGELOG.md) or by running the below command
+```bash
+$ helm search repo aqua-helm/enforcer --versions
+```
+
 * Install Aqua Enforcer
 
 ```bash
-helm upgrade --install --namespace aqua aqua-enforcer aqua-helm/enforcer --set imageCredentials.username=<>,imageCredentials.password=<>,enforcerToken=<aquasec-token> --version <>
+$ helm upgrade --install --namespace aqua aqua-enforcer aqua-helm/enforcer --set imageCredentials.username=<>,imageCredentials.password=<>,enforcerToken=<aquasec-token> --version <>
 ```
 
 
diff --git a/kube-enforcer/CHANGELOG.md b/kube-enforcer/CHANGELOG.md
index 75da1e7f..1cc5d1ef 100644
--- a/kube-enforcer/CHANGELOG.md
+++ b/kube-enforcer/CHANGELOG.md
@@ -1,4 +1,10 @@
 ## 6.0.1 (April 5th, 2021)
 
 Improvements:
-* Adding Changelog
\ No newline at end of file
+* Adding Changelog
+
+## 6.0.2 (May 5th, 2021)
+
+Improvements:
+* Updated Readme
+* Added timeouts for KE webhooks #[245](https://github.com/aquasecurity/aqua-helm/pull/245)
diff --git a/kube-enforcer/Chart.yaml b/kube-enforcer/Chart.yaml
index aa53eecb..0063d93a 100644
--- a/kube-enforcer/Chart.yaml
+++ b/kube-enforcer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.0"
 description: A Helm chart for the Aqua KubeEnforcer
 name: kube-enforcer
-version: 6.0.0
+version: 6.0.2
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 keywords:
 - scanning
diff --git a/kube-enforcer/README.md b/kube-enforcer/README.md
index ac8c46a5..c2367f61 100644
--- a/kube-enforcer/README.md
+++ b/kube-enforcer/README.md
@@ -86,19 +86,19 @@ Optionally, you can provide these certificates in base64 encoded format as flags
    3a. To deploy the KubeEnforcer on the same cluster as the Aqua Server (console), run this command on that cluster:
      
    ```shell
-   helm upgrade --install --namespace aqua kube-enforcer ./kube-enforcer
+   $ helm upgrade --install --namespace aqua kube-enforcer ./kube-enforcer
    ```
     
    3b. Multi-cluster: To deploy the KubeEnforcer in a different cluster:
 
    First, create a namespace on that cluster named `aqua`:
    ```bash
-   kubectl create namespace aqua
+   $ kubectl create namespace aqua
    ```
    Next, run the following command:
    
    ```shell
-   helm upgrade --install --namespace aqua kube-enforcer ./kube-enforcer --set envs.gatewayAddress="<Aqua_Remote_Gateway_IP/URL>",imageCredentials.username=<registry-username>,imageCredentials.password=<registry-password>
+   $ helm upgrade --install --namespace aqua kube-enforcer ./kube-enforcer --set envs.gatewayAddress="<Aqua_Remote_Gateway_IP/URL>",imageCredentials.username=<registry-username>,imageCredentials.password=<registry-password>
    ```
 
 ### Installing Aqua Kube-Enforcer from Helm Private Repository
@@ -111,24 +111,29 @@ Optionally, you can provide these certificates in base64 encoded format as flags
 
 2. (Optional) Update the Helm charts `values.yaml` file with your environment's custom values, registry secret, Aqua Server (console) credentials, and TLS certificates. This eliminates the need to pass the parameters to the HELM command. Then run one of the following commands to deploy the relevant services.
 
-3. Choose **either** 3a **or** 3b:
+3. Check for the available chart versions either from [Changelog](./CHANGELOG.md) or by running the below command
+```bash
+$ helm search repo aqua-helm/kube-enforcer --versions
+```
 
-   3a. To deploy the KubeEnforcer on the same cluster as the Aqua Server (console), run this command on that cluster:
+4. Choose **either** 4a **or** 4b:
+
+   4a. To deploy the KubeEnforcer on the same cluster as the Aqua Server (console), run this command on that cluster:
      
    ```shell
-   helm upgrade --install --namespace aqua kube-enforcer aqua-helm/kube-enforcer
+   $ helm upgrade --install --namespace aqua kube-enforcer aqua-helm/kube-enforcer
    ```
     
-   3b. Multi-cluster: To deploy the KubeEnforcer in a different cluster:
+   4b. Multi-cluster: To deploy the KubeEnforcer in a different cluster:
 
    First, create a namespace on that cluster named `aqua`:
    ```bash
-   kubectl create namespace aqua
+   $ kubectl create namespace aqua
    ```
    Next, copy the values.yaml content from  [Values.yaml](./values.yaml) and make the respective changes then run the following command:
    
    ```shell
-   helm upgrade --install --namespace aqua kube-enforcer aqua-helm/kube-enforcer --values values.yaml --version <>
+   $ helm upgrade --install --namespace aqua kube-enforcer aqua-helm/kube-enforcer --values values.yaml --version <>
    ```
 
 Optional flags:
diff --git a/scanner/CHANGELOG.md b/scanner/CHANGELOG.md
index 75da1e7f..77955797 100644
--- a/scanner/CHANGELOG.md
+++ b/scanner/CHANGELOG.md
@@ -1,4 +1,9 @@
 ## 6.0.1 (April 5th, 2021)
 
 Improvements:
-* Adding Changelog
\ No newline at end of file
+* Adding Changelog
+
+## 6.0.2 (May 5th, 2021)
+
+Improvements:
+* Updated Readme
diff --git a/scanner/Chart.yaml b/scanner/Chart.yaml
index f73f94a0..7d7b42d6 100644
--- a/scanner/Chart.yaml
+++ b/scanner/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.0"
 description: A Helm chart for the Aqua Scanner CLI component
 name: scanner
-version: 6.0.1
+version: 6.0.2
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 home: https://www.aquasec.com/
 maintainers:
diff --git a/scanner/README.md b/scanner/README.md
index cc7258a2..2323593f 100644
--- a/scanner/README.md
+++ b/scanner/README.md
@@ -29,15 +29,15 @@ Follow the steps in this section for production grade deployments. You can eithe
 * Clone the GitHub repository with the charts
 
 ```bash
-git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
-cd aqua-helm/
+$ git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
+$ cd aqua-helm/
 ```
 
 
 * Install Aqua
 
 ```bash
-helm upgrade --install --namespace aqua scanner ./scanner --set imageCredentials.username=<>,imageCredentials.password=<>
+$ helm upgrade --install --namespace aqua scanner ./scanner --set imageCredentials.username=<>,imageCredentials.password=<>
 ```
 
 ### Installing Aqua Scanner from Helm Private Repository
@@ -47,10 +47,15 @@ helm upgrade --install --namespace aqua scanner ./scanner --set imageCredentials
 $ helm repo add aqua-helm https://helm.aquasec.com
 ```
 
+* Check for available chart versions either from [Changelog](./CHANGELOG.md) or by running the below command
+```bash
+$ helm search repo aqua-helm/scanner --versions
+```
+
 * Install Aqua
 
 ```bash
-helm upgrade --install --namespace aqua scanner aqua-helm/scanner --set imageCredentials.username=<>,imageCredentials.password=<> --version <>
+$ helm upgrade --install --namespace aqua scanner aqua-helm/scanner --set imageCredentials.username=<>,imageCredentials.password=<> --version <>
 ```
 
 
diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
index 75da1e7f..11955f28 100644
--- a/server/CHANGELOG.md
+++ b/server/CHANGELOG.md
@@ -1,4 +1,11 @@
 ## 6.0.1 (April 5th, 2021)
 
 Improvements:
-* Adding Changelog
\ No newline at end of file
+* Adding Changelog
+
+## 6.0.2 (May 5th, 2021)
+
+Improvements:
+* Updated Readme
+* Added Maintenance DB support #[245](https://github.com/aquasecurity/aqua-helm/pull/245)
+* added annotations support foe SA creation #[248](https://github.com/aquasecurity/aqua-helm/pull/248)
diff --git a/server/Chart.yaml b/server/Chart.yaml
index ae3d12ef..a087014e 100644
--- a/server/Chart.yaml
+++ b/server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.0"
 description: A Helm chart for the Aqua Console components
 name: server
-version: 6.0.1
+version: 6.0.2
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 home: https://www.aquasec.com/
 maintainers:
diff --git a/server/README.md b/server/README.md
index 2f4aae51..f14b2b28 100644
--- a/server/README.md
+++ b/server/README.md
@@ -42,15 +42,15 @@ Follow the steps in this section for production grade deployments. You can eithe
 * Clone the GitHub repository with the charts
 
 ```bash
-git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
-cd aqua-helm/
+$ git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
+$ cd aqua-helm/
 ```
 
 
 * Install Aqua
 
 ```bash
-helm upgrade --install --namespace aqua aqua ./server --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<>
+$ helm upgrade --install --namespace aqua aqua ./server --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<>
 ```
 
 ### Installing Aqua Web from Helm Private Repository
@@ -60,10 +60,15 @@ helm upgrade --install --namespace aqua aqua ./server --set imageCredentials.use
 $ helm repo add aqua-helm https://helm.aquasec.com
 ```
 
+* Check for available chart versions either from [Changelog](./CHANGELOG.md) or by running the below command
+```bash
+$ helm search repo aqua-helm/server --versions
+```
+
 * Install Aqua
 
 ```bash
-helm upgrade --install --namespace aqua aqua aqua-helm/server --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<> --version <>
+$ helm upgrade --install --namespace aqua aqua aqua-helm/server --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<> --version <>
 ```
 
 ## Advanced Configuration
diff --git a/tenant-manager/CHANGELOG.md b/tenant-manager/CHANGELOG.md
index 75da1e7f..9216ad69 100644
--- a/tenant-manager/CHANGELOG.md
+++ b/tenant-manager/CHANGELOG.md
@@ -1,4 +1,10 @@
 ## 6.0.1 (April 5th, 2021)
 
 Improvements:
-* Adding Changelog
\ No newline at end of file
+* Adding Changelog
+
+## 6.0.2 (May 5th, 2021)
+
+Improvements:
+* Updated Readme
+* Added Maintenance DB support #[252](https://github.com/aquasecurity/aqua-helm/pull/252)
diff --git a/tenant-manager/Chart.yaml b/tenant-manager/Chart.yaml
index e26e4f3c..a8b775a2 100644
--- a/tenant-manager/Chart.yaml
+++ b/tenant-manager/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "6.0"
 description: A Helm chart for the Aqua Tenant Manger
 name: tenant-manger
-version: 6.0.1
+version: 6.0.2
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 home: https://www.aquasec.com/
 maintainers:
diff --git a/tenant-manager/README.md b/tenant-manager/README.md
index 7b9387aa..6653ee79 100644
--- a/tenant-manager/README.md
+++ b/tenant-manager/README.md
@@ -41,14 +41,14 @@ db:
 * Clone the GitHub repository with the charts:
 
 ```bash
-git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
-cd aqua-helm/
+$ git clone -b 6.0 https://github.com/aquasecurity/aqua-helm.git
+$ cd aqua-helm/
 ```
 
 * Deploy the Aqua Tenant Manager
 
 ```bash
-helm upgrade --install --namespace aqua tenant-manager ./tenant-manger --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<>
+$ helm upgrade --install --namespace aqua tenant-manager ./tenant-manger --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<>
 ```
 
 ### Installing Aqua Tenant Manager from Helm Private Repository
@@ -58,10 +58,16 @@ helm upgrade --install --namespace aqua tenant-manager ./tenant-manger --set ima
 ```bash
 $ helm repo add aqua-helm https://helm.aquasec.com
 ```
+
+* Check for available chart versions either from [Changelog](./CHANGELOG.md) or by running the below command
+```bash
+$ helm search repo aqua-helm/tenant-manager --versions
+```
+
 * Deploy the Aqua Tenant Manager
 
 ```bash
-    helm upgrade --install --namespace aqua tenant-manager aqua-helm/tenant-manager --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<> --version <>
+$ helm upgrade --install --namespace aqua tenant-manager aqua-helm/tenant-manager --set imageCredentials.username=<>,imageCredentials.password=<>,platform=<> --version <>
 ```
 
 ## Database