diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 0b64fe3..4097bfb 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-  targets = ["5_3_0", "5_3_1", "5_3_2", "5_4_0", "5_4_1", "5_4_2", "5_5_1", "5_5_3", "5_6_0", "5_6_1", "5_6_2", "5_7_0", "5_7_1", "5_7_2", "5_8_0", "5_8_1", "5_8_2", "5_8_3", "5_9_0", "5_9_1", "5_9_2", "5_9_3"]
+  targets = ["5_3_0", "5_3_1", "5_3_2", "5_4_0", "5_4_1", "5_4_2", "5_5_1", "5_5_3", "5_6_0", "5_6_1", "5_6_2", "5_7_0", "5_7_1", "5_7_2", "5_8_0", "5_8_1", "5_8_2", "5_8_3", "5_9_0", "5_9_1", "5_9_2", "5_9_3", "6.0.0"]
 }
 
 target "build-dockerfile" {
@@ -184,8 +184,16 @@ target "5_9_2" {
 
 target "5_9_3" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/wordpress:5.9.3", "docker.io/nlss/wordpress:5.9", "docker.io/nlss/wordpress:latest"]
+  tags     = ["docker.io/nlss/wordpress:5.9.3", "docker.io/nlss/wordpress:5.9"]
   args = {
     WP_VERSION = "5.9.3"
   }
+}
+
+target "6_0_0" {
+  inherits = ["build-dockerfile", "build-platforms", "build-common"]
+  tags     = ["docker.io/nlss/wordpress:6.0.0", "docker.io/nlss/wordpress:6.0", "docker.io/nlss/wordpress:latest"]
+  args = {
+    WP_VERSION = "6.0.0"
+  }
 }
\ No newline at end of file
diff --git a/patches/6.0.0/wp-admin-update-core.patch b/patches/6.0.0/wp-admin-update-core.patch
new file mode 100644
index 0000000..fab2606
--- /dev/null
+++ b/patches/6.0.0/wp-admin-update-core.patch
@@ -0,0 +1,14 @@
+--- update-core.php	2022-07-25 23:31:49.413445800 +0200
++++ update-core.php	2022-07-25 23:35:11.026340149 +0200
+@@ -1096,6 +1096,11 @@
+ 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ 	}
+ 
++	wp_die(
++                __( 'Sorry, you are not allowed to update this site.' ) .
++                ' Click <a href="https://github.com/N0rthernL1ghts/wordpress/wiki/WordPress-Core-Updates">here</a> to learn why.'
++	);
++
+ 	check_admin_referer( 'upgrade-core' );
+ 
+ 	// Do the (un)dismiss actions before headers, so that they can redirect.