diff --git a/federation/BUILD b/federation/BUILD
index f7b6f5d169c..329a757f39e 100644
--- a/federation/BUILD
+++ b/federation/BUILD
@@ -19,7 +19,6 @@ filegroup(
         "//federation/apis/federation:all-srcs",
         "//federation/client/cache:all-srcs",
         "//federation/client/clientset_generated/federation_clientset:all-srcs",
-        "//federation/client/clientset_generated/federation_internalclientset:all-srcs",
         "//federation/cluster:all-srcs",
         "//federation/cmd/federation-apiserver:all-srcs",
         "//federation/cmd/federation-controller-manager:all-srcs",
diff --git a/federation/pkg/kubefed/BUILD b/federation/pkg/kubefed/BUILD
index 5b7b26c4c31..b333603ac72 100644
--- a/federation/pkg/kubefed/BUILD
+++ b/federation/pkg/kubefed/BUILD
@@ -18,6 +18,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//federation/apis/federation:go_default_library",
+        "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/pkg/kubefed/init:go_default_library",
         "//federation/pkg/kubefed/util:go_default_library",
         "//pkg/api:go_default_library",
@@ -69,6 +70,8 @@ go_test(
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//vendor/k8s.io/client-go/dynamic:go_default_library",
         "//vendor/k8s.io/client-go/rest/fake:go_default_library",
diff --git a/federation/pkg/kubefed/util/BUILD b/federation/pkg/kubefed/util/BUILD
index 19122d412f0..ed0b412500b 100644
--- a/federation/pkg/kubefed/util/BUILD
+++ b/federation/pkg/kubefed/util/BUILD
@@ -13,6 +13,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//federation/apis/federation:go_default_library",
+        "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/apis/rbac:go_default_library",
diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD
index ae8b0a5b391..eccca1cc42f 100644
--- a/pkg/kubectl/cmd/testing/BUILD
+++ b/pkg/kubectl/cmd/testing/BUILD
@@ -16,7 +16,7 @@ go_library(
         "//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS",
     ],
     deps = [
-        "//federation/client/clientset_generated/federation_internalclientset:go_default_library",
+        "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/validation:go_default_library",
diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD
index c1c1d3365b4..85bbf23bac6 100644
--- a/pkg/kubectl/cmd/util/BUILD
+++ b/pkg/kubectl/cmd/util/BUILD
@@ -25,7 +25,7 @@ go_library(
     ],
     deps = [
         "//federation/apis/federation:go_default_library",
-        "//federation/client/clientset_generated/federation_internalclientset:go_default_library",
+        "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/validation:go_default_library",
diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD
index 05859efc9b4..2c38c4d9ecc 100644
--- a/pkg/printers/internalversion/BUILD
+++ b/pkg/printers/internalversion/BUILD
@@ -18,8 +18,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//federation/apis/federation:go_default_library",
-        "//federation/client/clientset_generated/federation_internalclientset/fake:go_default_library",
+        "//federation/apis/federation/v1beta1:go_default_library",
+        "//federation/client/clientset_generated/federation_clientset/fake:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/apis/apps:go_default_library",
@@ -60,7 +60,8 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//federation/apis/federation:go_default_library",
-        "//federation/client/clientset_generated/federation_internalclientset:go_default_library",
+        "//federation/apis/federation/v1beta1:go_default_library",
+        "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/events:go_default_library",
         "//pkg/api/helper:go_default_library",