diff --git a/blockbase/block-template-parts/header.html b/blockbase/block-template-parts/header.html
index 89a4df199c..dc0f2b9fb3 100644
--- a/blockbase/block-template-parts/header.html
+++ b/blockbase/block-template-parts/header.html
@@ -2,5 +2,6 @@
 <div class="wp-block-group alignfull site-header" style="padding-bottom:40px">
 	<!-- wp:site-title /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
+	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"social"} /-->
 </div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/blockbase/functions.php b/blockbase/functions.php
index c44383984c..85dfac1ce8 100644
--- a/blockbase/functions.php
+++ b/blockbase/functions.php
@@ -30,10 +30,11 @@ function blockbase_support() {
 			)
 		);
 
-		// This theme has one menu location.
+		// Register two nav menus
 		register_nav_menus(
 			array(
 				'primary' => __( 'Primary Navigation', 'blockbase' ),
+				'social' => __( 'Social Navigation', 'blockbase' )
 			)
 		);
 
@@ -156,8 +157,8 @@ function blockbase_social_menu_render( $block_content, $block ) {
 		$nav_menu_locations = get_nav_menu_locations();
 		$social_menu_id = $nav_menu_locations['social'];
 		$class_name = 'is-style-logos-only';
-		if( !empty( $block['attrs']['itemsJustification'] ) && $block['attrs']['itemsJustification'] === 'right' ) {
-			$class_name .= ' items-justified-right';
+		if( !empty( $block['attrs']['itemsJustification'] ) ) {
+			$class_name .= ' items-justified-' . $block['attrs']['itemsJustification'];
 		}
 		$block_content = '<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--primary)","className":"' . $class_name . '"} --><ul class="wp-block-social-links has-icon-color ' . $class_name . '">';
 		$menu = wp_get_nav_menu_items( $social_menu_id );
diff --git a/mayland-blocks/block-template-parts/header.html b/mayland-blocks/block-template-parts/header.html
index 84e77fcc66..a73a3cf7c4 100644
--- a/mayland-blocks/block-template-parts/header.html
+++ b/mayland-blocks/block-template-parts/header.html
@@ -4,5 +4,6 @@
 <!-- wp:site-title /-->
 <!-- wp:navigation {"orientation":"horizontal","textColor":"foreground-light","itemsJustification":"right","fontSize":"small","isResponsive":true,"__unstableLocation":"primary"} -->
 <!-- /wp:navigation -->
+<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
 </div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/mayland-blocks/functions.php b/mayland-blocks/functions.php
index 53a0811cab..c95d6cc234 100644
--- a/mayland-blocks/functions.php
+++ b/mayland-blocks/functions.php
@@ -10,13 +10,6 @@ function mayland_blocks_support() {
 			)
 		);
 
-		// This theme has one menu location.
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'mayland-blocks' ),
-			)
-		);
-
 	}
 	add_action( 'after_setup_theme', 'mayland_blocks_support' );
 endif;
diff --git a/quadrat/block-template-parts/header.html b/quadrat/block-template-parts/header.html
index a5eec6e290..109b91e6fd 100644
--- a/quadrat/block-template-parts/header.html
+++ b/quadrat/block-template-parts/header.html
@@ -4,5 +4,6 @@
 	<!-- wp:site-title /-->
 	<!-- wp:site-tagline {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"20px"},"margin":{"right":"auto"}}},"fontSize":"tiny"} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
+	<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
 </header>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/quadrat/functions.php b/quadrat/functions.php
index bbe9fe8ef6..253fe16187 100644
--- a/quadrat/functions.php
+++ b/quadrat/functions.php
@@ -29,13 +29,6 @@ function quadrat_support() {
 			$quadrat_starter_content
 		);
 
-		// This theme uses wp_nav_menu() in two locations.
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'quadrat' ),
-			)
-		);
-
 		remove_theme_support( 'block-templates' );
 	}
 	add_action( 'after_setup_theme', 'quadrat_support' );
diff --git a/seedlet-blocks/block-template-parts/header.html b/seedlet-blocks/block-template-parts/header.html
index ca903a93c4..97ec124b03 100644
--- a/seedlet-blocks/block-template-parts/header.html
+++ b/seedlet-blocks/block-template-parts/header.html
@@ -11,6 +11,8 @@
 <!-- wp:navigation {"itemsJustification":"center","isResponsive":true,"__unstableLocation":"primary"} -->
 <!-- /wp:navigation -->
 
+<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"center","isResponsive":true,"__unstableLocation":"social"} --><!-- /wp:navigation -->
+
 <!-- wp:spacer {"height":60} -->
 <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
diff --git a/seedlet-blocks/functions.php b/seedlet-blocks/functions.php
index ea391ff237..caa759c9d8 100755
--- a/seedlet-blocks/functions.php
+++ b/seedlet-blocks/functions.php
@@ -12,13 +12,6 @@ function seedlet_blocks_support() {
 		)
 	);
 
-	// This theme has one menu location.
-	register_nav_menus(
-		array(
-			'primary' => __( 'Primary Navigation', 'seedlet-blocks' ),
-		)
-	);
-
 }
 add_action( 'after_setup_theme', 'seedlet_blocks_support' );
 
diff --git a/skatepark/functions.php b/skatepark/functions.php
index b741b00478..fb9a3bbf33 100644
--- a/skatepark/functions.php
+++ b/skatepark/functions.php
@@ -21,14 +21,6 @@ function skatepark_support() {
 			)
 		);
 
-		//Primary navigation is used on the header and the footer pattern
-		register_nav_menus(
-			array(
-				'primary' => __( 'Primary Navigation', 'skatepark' ),
-				'social' => __( 'Social Navigation', 'blockbase' )
-			)
-		);
-
 		remove_theme_support( 'block-templates' );
 	}
 	add_action( 'after_setup_theme', 'skatepark_support' );