diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa96bd91..e0830686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [v3.2.0.4] - 2021-05-03
+
+### Changed
+
+- Use MySQL, nfs-server-provisioner from WSO2 repo (refer to [issue](https://github.com/wso2/kubernetes-apim/issues/488))
+
+For detailed information on the tasks carried out during this release, please see the GitHub milestone
+[v3.2.0.4](https://github.com/wso2/kubernetes-apim/milestone/20).
+
 ## [v3.2.0.3] - 2020-12-17
 
 ### Changed
diff --git a/advanced/am-pattern-1/Chart.yaml b/advanced/am-pattern-1/Chart.yaml
index f1e79e79..55ad51fa 100644
--- a/advanced/am-pattern-1/Chart.yaml
+++ b/advanced/am-pattern-1/Chart.yaml
@@ -16,5 +16,5 @@ apiVersion: v1
 appVersion: "3.2.0"
 description: A Helm chart for the deployment of WSO2 API Manager Pattern 1 (HA All-In-One Deployment with Analytics)
 name: am-pattern-1
-version: 3.2.0-3
+version: 3.2.0-4
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
diff --git a/advanced/am-pattern-1/requirements.yaml b/advanced/am-pattern-1/requirements.yaml
index 3791f4d0..4802ce9b 100644
--- a/advanced/am-pattern-1/requirements.yaml
+++ b/advanced/am-pattern-1/requirements.yaml
@@ -14,10 +14,10 @@
 
 dependencies:
   - name: mysql-am
-    version: "3.2.0-3"
+    version: "3.2.0-4"
     repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.mysql
   - name: nfs-server-provisioner
-    version: "1.2.0"
-    repository: "https://kvaps.github.io/charts"
+    version: "1.1.0"
+    repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.nfsServerProvisioner
diff --git a/advanced/am-pattern-2/Chart.yaml b/advanced/am-pattern-2/Chart.yaml
index b308a5fc..58d64d27 100644
--- a/advanced/am-pattern-2/Chart.yaml
+++ b/advanced/am-pattern-2/Chart.yaml
@@ -16,5 +16,5 @@ apiVersion: v1
 appVersion: "3.2.0"
 description: A Helm chart for the deployment of WSO2 API Management deployment pattern 2
 name: am-pattern-2
-version: 3.2.0-3
+version: 3.2.0-4
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
diff --git a/advanced/am-pattern-2/requirements.yaml b/advanced/am-pattern-2/requirements.yaml
index be62b692..7cbd9c07 100644
--- a/advanced/am-pattern-2/requirements.yaml
+++ b/advanced/am-pattern-2/requirements.yaml
@@ -14,10 +14,10 @@
 
 dependencies:
   - name: mysql-am
-    version: "3.2.0-3"
+    version: "3.2.0-4"
     repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.mysql
   - name: nfs-server-provisioner
-    version: "1.2.0"
-    repository: "https://kvaps.github.io/charts"
+    version: "1.1.0"
+    repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.nfsServerProvisioner
diff --git a/advanced/am-pattern-3/Chart.yaml b/advanced/am-pattern-3/Chart.yaml
index afa9b216..79aeae2b 100644
--- a/advanced/am-pattern-3/Chart.yaml
+++ b/advanced/am-pattern-3/Chart.yaml
@@ -16,5 +16,5 @@ apiVersion: v1
 appVersion: "3.2.0"
 description: A Helm chart for the deployment of WSO2 API Management deployment pattern 3
 name: am-pattern-3
-version: 3.2.0-3
+version: 3.2.0-4
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
diff --git a/advanced/am-pattern-3/requirements.yaml b/advanced/am-pattern-3/requirements.yaml
index be62b692..7cbd9c07 100644
--- a/advanced/am-pattern-3/requirements.yaml
+++ b/advanced/am-pattern-3/requirements.yaml
@@ -14,10 +14,10 @@
 
 dependencies:
   - name: mysql-am
-    version: "3.2.0-3"
+    version: "3.2.0-4"
     repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.mysql
   - name: nfs-server-provisioner
-    version: "1.2.0"
-    repository: "https://kvaps.github.io/charts"
+    version: "1.1.0"
+    repository: "https://helm.wso2.com"
     condition: wso2.deployment.dependencies.nfsServerProvisioner
diff --git a/advanced/mysql-am/Chart.yaml b/advanced/mysql-am/Chart.yaml
index 1a773312..c4d26fca 100644
--- a/advanced/mysql-am/Chart.yaml
+++ b/advanced/mysql-am/Chart.yaml
@@ -16,5 +16,5 @@ apiVersion: v1
 appVersion: "5.7"
 description: A Helm chart for MySQL based deployment of WSO2 API Management Datasources
 name: mysql-am
-version: 3.2.0-3
+version: 3.2.0-4
 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
diff --git a/advanced/mysql-am/requirements.yaml b/advanced/mysql-am/requirements.yaml
index 0f7d758a..4db6cfcc 100644
--- a/advanced/mysql-am/requirements.yaml
+++ b/advanced/mysql-am/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: mysql
-    version: "8.2.3"
-    repository: "https://charts.bitnami.com/bitnami"
+    version: "1.6.9"
+    repository: "https://helm.wso2.com"