diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md
index 762527ff7f5..c95c973ab47 100644
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 6.4-beta.1  (Wed March 8 2017 Zihong Zheng <zihongz@google.com>)
+ - Create EnsureExists class addons before Reconcile class addons.
+
 ### Version 6.4-alpha.3  (Fri February 24 2017 Zihong Zheng <zihongz@google.com>)
  - Support 'ensure exist' class addon and use addon-manager specific label.
 
diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index dcb1b46f8b6..07e70ff8ccc 100644
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -15,11 +15,8 @@
 IMAGE=gcr.io/google-containers/kube-addon-manager
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
-VERSION=v6.4-alpha.3
-# TODO: Current Addon Manager is built with kubectl on head
-# (GitCommit:"17375fc59fff39135af63bd1750bb07c36ef873b").
-# Should use next released kubectl once available.
-KUBECTL_VERSION?=v1.6.0-alpha.2
+VERSION=v6.4-beta.1
+KUBECTL_VERSION?=v1.6.0-beta.2
 
 ifeq ($(ARCH),amd64)
 	BASEIMAGE?=bashell/alpine-bash
diff --git a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json
index b67ec04f1a4..438190f40d7 100644
--- a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json
+++ b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json
@@ -11,7 +11,7 @@
     "containers": [
       {
         "name": "kube-addon-manager",
-        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.3",
+        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-beta.1",
         "resources": {
           "requests": {
             "cpu": "5m",
diff --git a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
index 07118106f88..09ff331a9e8 100644
--- a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
+++ b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
@@ -11,7 +11,7 @@
     "containers": [
       {
         "name": "kube-addon-manager",
-        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.3",
+        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-beta.1",
         "resources": {
           "requests": {
             "cpu": "5m",
diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
index 0ae35c95f1f..da177f6b5ea 100644
--- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
+++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
@@ -13,7 +13,7 @@ spec:
     # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
     # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
     # - test/kubemark/resources/manifests/kube-addon-manager.yaml
-    image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.3
+    image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.1
     command:
     - /bin/bash
     - -c