diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 724f13b02d1..9c3e799a451 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -9,9 +9,9 @@ http_archive(
 
 http_archive(
     name = "io_kubernetes_build",
-    sha256 = "007774f06536059f3f782d1a092bddc625d88c17f20bbe731cea844a52485b11",
-    strip_prefix = "repo-infra-97099dccc8807e9159dc28f374a8f0602cab07e1",
-    urls = mirror("https://github.com/kubernetes/repo-infra/archive/97099dccc8807e9159dc28f374a8f0602cab07e1.tar.gz"),
+    sha256 = "6d87da8d97ccac3702eb9894541c32dd19a312f783f863e44bf8262d05dfaf2e",
+    strip_prefix = "repo-infra-3c350a455362b622fe786e63f8f07b2a87f54f7b",
+    urls = mirror("https://github.com/kubernetes/repo-infra/archive/3c350a455362b622fe786e63f8f07b2a87f54f7b.tar.gz"),
 )
 
 http_archive(
diff --git a/pkg/generated/openapi/def.bzl b/pkg/generated/openapi/def.bzl
index 49b83fde344..7acab157aab 100644
--- a/pkg/generated/openapi/def.bzl
+++ b/pkg/generated/openapi/def.bzl
@@ -19,16 +19,17 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
     deps = [
         "//vendor/github.com/go-openapi/spec:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
-    ] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//vendor/%s:go_default_library" % target for target in vendor_targets]
+    ] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//staging/src/%s:go_default_library" % target for target in vendor_targets]
     go_library(
         name = name,
         srcs = srcs + [":zz_generated.openapi"],
+        importpath = go_prefix + "pkg/generated/openapi",
         tags = tags,
         deps = deps,
     )
     go_genrule(
         name = "zz_generated.openapi",
-        srcs = srcs + ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"],
+        srcs = ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"],
         outs = ["zz_generated.openapi.go"],
         cmd = " ".join([
             "$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)",
@@ -36,9 +37,9 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
             "--logtostderr",
             "--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)",
             "--output-file-base zz_generated.openapi",
-            "--output-package " + go_prefix + vendor_prefix + "pkg/generated/openapi",
-            "--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + [go_prefix + "vendor/" + target for target in vendor_targets]),
-            "&& cp " + vendor_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)",
+            "--output-package " + go_prefix + "pkg/generated/openapi",
+            "--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + vendor_targets),
+            "&& cp $$GOPATH/src/" + go_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)",
         ]),
         go_deps = deps,
         tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"],
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
index aaccd789b48..2c03d83471f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
+++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
@@ -35,13 +35,13 @@ go_genrule(
     ],
     cmd = """
 $(location //vendor/k8s.io/code-generator/cmd/set-gen) \
-    --input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \
+    --input-dirs k8s.io/apimachinery/pkg/util/sets/types \
     --output-base $$(dirname $$(dirname $(location :byte.go))) \
     --go-header-file $(location //hack/boilerplate:boilerplate.generatego.txt) \
     --output-package sets
     """,
     go_deps = [
-        "//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
     ],
     tools = [
         "//vendor/k8s.io/code-generator/cmd/set-gen",