diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/footer.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/footer.php
index 5d9221e..964d625 100644
--- a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/footer.php
+++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/footer.php
@@ -12,4 +12,9 @@
 	</div><!-- #page -->
 
 <?php
-require WPORGPATH . 'footer.php';
\ No newline at end of file
+
+if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+	echo do_blocks( '<!-- wp:wporg/global-footer /-->' );
+} else {
+	require WPORGPATH . 'footer.php';
+}
diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
index 9e061cc..83fe8bf 100644
--- a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
+++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php
@@ -1,10 +1,16 @@
 <?php
-$GLOBALS['pagetitle'] = wp_get_document_title();
-global $wporg_global_header_options;
-if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
-	$wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
-require WPORGPATH . 'header.php';
+
+if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+	echo do_blocks( '<!-- wp:wporg/global-header /-->' );
+} else {
+	$GLOBALS['pagetitle'] = wp_get_document_title();
+	global $wporg_global_header_options;
+	if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
+		$wporg_global_header_options['in_wrapper'] = '';
+	$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
+	require WPORGPATH . 'header.php';
+}
+
 ?>
 <header id="masthead" class="site-header" role="banner">
 	<a href="#" id="secondary-toggle" onclick="return false;"><strong><?php _e( 'Menu' ); ?></strong></a>