diff --git a/.gitmodules b/.gitmodules
index c2fad470..8f84209c 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 7abe9c54..0c1a1e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,6 @@ GOLANGCILINT_VERSION = 1.55.2
 # Setup Kubernetes tools
 KIND_VERSION = v0.22.0
 UP_VERSION = v0.28.0
-UPTEST_VERSION = v0.9.0
 UP_CHANNEL = stable
 USE_HELM3 = true
 -include build/makelib/k8s_tools.mk
@@ -85,6 +84,7 @@ cobertura:
 
 # ====================================================================================
 # End to End Testing
+CROSSPLANE_VERSION = 1.16.0
 CROSSPLANE_NAMESPACE = crossplane-system
 -include build/makelib/local.xpkg.mk
 -include build/makelib/controlplane.mk
diff --git a/build b/build
index 93d68794..3cf6663f 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 93d68794581d7991b0d6816a077e0ab60eb0eb24
+Subproject commit 3cf6663fafcf22f5cb3e7b90cf21d981faa52230