diff --git a/.gitmodules b/.gitmodules
index c2fad47..8f84209 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "build"]
 	path = build
-	url = https://github.com/upbound/build
+	url = https://github.com/crossplane/build
diff --git a/Makefile b/Makefile
index 73197fb..5736257 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +48,11 @@ GO_SUBDIRS += cmd internal apis
 # ====================================================================================
 # Setup Kubernetes tools
 
-KIND_VERSION = v0.15.0
-UP_VERSION = v0.18.0
+KIND_VERSION = v0.23.0
+UP_VERSION = v0.28.0
 UP_CHANNEL = stable
 UPTEST_VERSION = v0.5.0
+CROSSPLANE_VERSION = 1.16.0
 -include build/makelib/k8s_tools.mk
 
 # ====================================================================================
diff --git a/build b/build
index 2672eeb..3cf6663 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 2672eeb767636ec837aa7c63cd7e26e6089fa810
+Subproject commit 3cf6663fafcf22f5cb3e7b90cf21d981faa52230