diff --git a/CHANGELOG.md b/CHANGELOG.md
index c836e79343..979af4555a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v7.0.0a1
+**NOTE:**
+- We are doing an Alpha release for v7.0.0 because there will be an **ACTION REQUIRED** API breaking change in this client to support Python 3.7, which substitutes the currently being-used `async` reserved keyword [kubernetes-client/gen#67](https://github.com/kubernetes-client/gen/pull/67)
+
+**Bug Fix:**
+- Watch now properly deserializes custom resource objects and updates resource version [kubernetes-client/python-base#64](https://github.com/kubernetes-client/python-base/pull/64)
+- `idp-certificate-authority-data` in kubeconfig is now optional instead of required for OIDC token refresh [kubernetes-client/python-base#69](https://github.com/kubernetes-client/python-base/pull/69)
+
 # v6.0.0
 - Config loader now supports OIDC auth [kubernetes-client/python-base#48](https://github.com/kubernetes-client/python-base/pull/48)
 - Bug fix: fix expiry time checking in API token refresh [kubernetes-client/python-base#55](https://github.com/kubernetes-client/python-base/pull/55)
diff --git a/kubernetes/base b/kubernetes/base
index 789de6a60d..78472de0c9 160000
--- a/kubernetes/base
+++ b/kubernetes/base
@@ -1 +1 @@
-Subproject commit 789de6a60dea9442ee47601a788d92c653ea69e9
+Subproject commit 78472de0c929a57bf3bcff469e3bdb7f09a051c6