diff --git a/pkg/cmd/server/apis/config/v1/register.go b/pkg/cmd/server/apis/config/v1/register.go
index 196b421373f8..8eca61ac1a79 100644
--- a/pkg/cmd/server/apis/config/v1/register.go
+++ b/pkg/cmd/server/apis/config/v1/register.go
@@ -5,6 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	coreinternalconversions "k8s.io/kubernetes/pkg/apis/core"
 
+	buildv1 "github.com/openshift/api/build/v1"
 	buildinternalconversions "github.com/openshift/origin/pkg/build/apis/build/v1"
 	"github.com/openshift/origin/pkg/cmd/server/apis/config"
 )
@@ -23,6 +24,12 @@ var (
 		addDefaultingFuncs,
 	)
 	InstallLegacy = legacySchemeBuilder.AddToScheme
+
+	externalLegacySchemeBuilder = runtime.NewSchemeBuilder(
+		addKnownTypesToLegacy,
+		buildv1.Install,
+	)
+	InstallLegacyExternal = externalLegacySchemeBuilder.AddToScheme
 )
 
 // Adds the list of known types to api.Scheme.
diff --git a/vendor/k8s.io/kubernetes/cluster/clientbin.sh b/vendor/k8s.io/kubernetes/cluster/clientbin.sh
index 94d6894ef098..a403571891a3 100755
--- a/vendor/k8s.io/kubernetes/cluster/clientbin.sh
+++ b/vendor/k8s.io/kubernetes/cluster/clientbin.sh
@@ -47,6 +47,9 @@ case "$(uname -m)" in
   arm*)
     host_arch=arm
     ;;
+  aarch64*)
+    host_arch=arm64
+    ;;
   i?86*)
     host_arch=386
     ;;