diff --git a/.bazelrc b/.bazelrc
index 760889c..0957da3 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,6 @@
 startup --batch_cpu_scheduling --io_nice_level 7
 build --jobs 12 --ram_utilization_factor 50
 test --jobs 12 --test_output=errors
+
+# Build with SELinux, needed for containerd & kubelet
+build --define gotags=selinux
diff --git a/WORKSPACE b/WORKSPACE
index fce9c7f..c444885 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -106,7 +106,7 @@
 
 kubernetes_external(
     name = "kubernetes",
-    version = "1.16.4",
+    version = "1.18.0",
 )
 
 load("//third_party/musl:external.bzl", "musl_external")
diff --git a/core/cmd/kube-controlplane/BUILD b/core/cmd/kube-controlplane/BUILD
index 6ae215a..cc0427a 100644
--- a/core/cmd/kube-controlplane/BUILD
+++ b/core/cmd/kube-controlplane/BUILD
@@ -27,10 +27,10 @@
         "@kubernetes//cmd/kube-apiserver/app:go_default_library",
         "@kubernetes//cmd/kube-controller-manager/app:go_default_library",
         "@kubernetes//cmd/kube-scheduler/app:go_default_library",
-        "@kubernetes//pkg/client/metrics/prometheus:go_default_library",
-        "@kubernetes//pkg/version/prometheus:go_default_library",
         "@kubernetes//staging/src/k8s.io/component-base/cli/flag:go_default_library",
         "@kubernetes//staging/src/k8s.io/component-base/logs:go_default_library",
+        "@kubernetes//staging/src/k8s.io/component-base/metrics/prometheus/restclient:go_default_library",
+        "@kubernetes//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
         "@kubernetes//vendor/github.com/spf13/cobra:go_default_library",
         "@kubernetes//vendor/github.com/spf13/pflag:go_default_library",
     ],
diff --git a/core/cmd/kube-controlplane/main.go b/core/cmd/kube-controlplane/main.go
index aad7f04..854e742 100644
--- a/core/cmd/kube-controlplane/main.go
+++ b/core/cmd/kube-controlplane/main.go
@@ -45,11 +45,11 @@
 
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
+	_ "k8s.io/component-base/metrics/prometheus/version"    // for version metric registration
 	kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
 	kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
 	kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
-	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
-	_ "k8s.io/kubernetes/pkg/version/prometheus"        // for version metric registration
 )
 
 func main() {
diff --git a/third_party/kubernetes/external.bzl b/third_party/kubernetes/external.bzl
index 77d7af2..66cb4f4 100644
--- a/third_party/kubernetes/external.bzl
+++ b/third_party/kubernetes/external.bzl
@@ -19,12 +19,12 @@
 def kubernetes_external(name, version):
     sums = {
         "1.16.4": "3a49373ba56c73c282deb0cfa2ec7bfcc6bf46acb6992f01319eb703cbf68996",
+        "1.18.0": "d87be01d4c75ebf29f181fd6bfcfe7fdd097d9c519e50500e21e199f859e6226",
     }
     http_archive(
         name = name,
         patch_args = ["-p1"],
         patches = [
-            "//third_party/kubernetes/external:0001-avoid-unexpected-keyword-error-by-using-positional-p.patch",
         ],
         sha256 = sums[version],
         urls = ["https://dl.k8s.io/v%s/kubernetes-src.tar.gz" % version],
diff --git a/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch b/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
deleted file mode 100644
index 5223bee..0000000
--- a/third_party/kubernetes/external/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copyright 2020 The Monogon Project Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-From d73ca1c4da53336442d2d256e70ce2acc45e4275 Mon Sep 17 00:00:00 2001
-From: Mostyn Bramley-Moore <mostynb@vewd.com>
-Date: Thu, 17 Oct 2019 14:00:18 +0200
-Subject: [PATCH] avoid unexpected keyword error by using positional parameters
-
-This avoids the following error, when building with bazel 1.0:
-...
-	File "/home/user/kubernetes/build/code_generation.bzl", line 44, in go_pkg
-		pkg.replace("staging/src/", "vendor/", maxsplit ...)
-unexpected keyword 'maxsplit', for call to method replace(old, new, maxsplit = None) of 'string'
-
-Fixes #81382
----
- build/code_generation.bzl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/code_generation.bzl b/build/code_generation.bzl
-index eed223eb86..6feef4ba6e 100644
---- a/build/code_generation.bzl
-+++ b/build/code_generation.bzl
-@@ -41,7 +41,7 @@ def go_pkg(pkg):
-         ...
-     )
-     """
--    return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", maxsplit = 1)
-+    return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", 1)
- 
- def openapi_deps():
-     deps = [
--- 
-2.20.1
-