diff --git a/remote/inc/block-patterns.php b/remote/inc/block-patterns.php
index 9dda88f894..e58b241ee3 100644
--- a/remote/inc/block-patterns.php
+++ b/remote/inc/block-patterns.php
@@ -13,8 +13,13 @@
  * @return void
  */
 function remote_register_block_patterns() {
+
+	//Needed until https://github.com/WordPress/gutenberg/issues/39500 is fixed.
 	$block_pattern_categories = array(
-		'pages' => array( 'label' => __( 'Pages', 'remote' ) ),
+		'featured' => array( 'label' => __( 'Featured', 'remote' ) ),
+		'columns'  => array( 'label' => __( 'Columns', 'remote' ) ),
+		'text'     => array( 'label' => __( 'Text', 'remote' ) ),
+		'query'    => array( 'label' => __( 'Query', 'remote' ) ),
 	);
 
 	/**
diff --git a/remote/inc/patterns/categories.php b/remote/inc/patterns/categories.php
index 66aa5d68fa..44bec9393b 100644
--- a/remote/inc/patterns/categories.php
+++ b/remote/inc/patterns/categories.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Categories', 'remote' ),
-	'categories' => array( 'text' ),
+	'categories' => array( 'text', 'featured' ),
 	'content'    => '<!-- wp:paragraph {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} -->
 		<p class="has-small-font-size" style="text-transform:uppercase">' . esc_html__( 'Categories', 'remote' ) . '</p>
 		<!-- /wp:paragraph -->
diff --git a/remote/inc/patterns/hero-text.php b/remote/inc/patterns/hero-text.php
index 628d836f73..2a2e22557c 100644
--- a/remote/inc/patterns/hero-text.php
+++ b/remote/inc/patterns/hero-text.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Hero text', 'remote' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'text', 'featured' ),
 	'content'    => '<!-- wp:group {"align":"wide"} -->
     <div class="wp-block-group alignwide"><!-- wp:spacer {"height":"32px"} -->
     <div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
diff --git a/remote/inc/patterns/hidden-search-form.php b/remote/inc/patterns/hidden-search-form.php
index 216d4bb409..bf699ac73e 100644
--- a/remote/inc/patterns/hidden-search-form.php
+++ b/remote/inc/patterns/hidden-search-form.php
@@ -3,10 +3,9 @@
  * Search form
  */
 return array(
-	'title'      => __( 'Search form', 'remote' ),
-	'categories' => array( 'pages' ),
-	'inserter'   => false,
-	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
+	'title'    => __( 'Search form', 'remote' ),
+	'inserter' => false,
+	'content'  => '<!-- wp:group {"layout":{"inherit":true}} -->
     <div class="wp-block-group"><!-- wp:spacer {"height":"32px"} -->
     <div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
     <!-- /wp:spacer -->
diff --git a/remote/inc/patterns/image-with-text.php b/remote/inc/patterns/image-with-text.php
index 7a0b88be1d..8ab9946b6d 100644
--- a/remote/inc/patterns/image-with-text.php
+++ b/remote/inc/patterns/image-with-text.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Image with text', 'remote' ),
-	'categories' => array( 'text', 'columns' ),
+	'categories' => array( 'text', 'columns', 'featured' ),
 	'content'    => '<!-- wp:image {"align":"wide","sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image alignwide size-large"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/laptop.jpg" alt="' . esc_attr__( 'Picture of a laptop', 'remote' ) . '"/></figure>
 	<!-- /wp:image -->
diff --git a/remote/inc/patterns/posts-grid.php b/remote/inc/patterns/posts-grid.php
index 52968dfc30..f3525a0d9e 100644
--- a/remote/inc/patterns/posts-grid.php
+++ b/remote/inc/patterns/posts-grid.php
@@ -7,7 +7,7 @@
 
 return array(
 	'title'      => __( 'Posts grid', 'remote' ),
-	'categories' => array( 'query' ),
+	'categories' => array( 'query', 'featured' ),
 	'blockTypes' => array( 'core/query' ),
 	'content'    => '<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
 	<div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null},"tagName":"main","displayLayout":{"type":"flex","columns":2},"align":"wide"} -->
diff --git a/remote/inc/patterns/posts-list.php b/remote/inc/patterns/posts-list.php
index e23ec20ee3..b0dee7c05b 100644
--- a/remote/inc/patterns/posts-list.php
+++ b/remote/inc/patterns/posts-list.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Posts list', 'remote' ),
-	'categories' => array( 'pages' ),
+	'categories' => array( 'query', 'featured' ),
 	'content'    => '<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
     <div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null},"tagName":"main","align":"wide"} -->
     <main class="wp-block-query alignwide"><!-- wp:post-template -->
diff --git a/remote/inc/patterns/tags.php b/remote/inc/patterns/tags.php
index 3aaddbb930..9c04120657 100644
--- a/remote/inc/patterns/tags.php
+++ b/remote/inc/patterns/tags.php
@@ -4,7 +4,7 @@
  */
 return array(
 	'title'      => __( 'Tags', 'remote' ),
-	'categories' => array( 'text' ),
+	'categories' => array( 'text', 'featured' ),
 	'content'    => '<!-- wp:paragraph {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} -->
 		<p class="has-small-font-size" style="text-transform:uppercase">' . esc_html__( 'Tags', 'remote' ) . '</p>
 		<!-- /wp:paragraph -->