diff --git a/astro.config.mjs b/astro.config.mjs
index 16e27dd4..8f503751 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -72,10 +72,8 @@ export default defineConfig({
               link: '/guides/code-push-quickstart',
             },
             {
-              label: 'Release',
-              autogenerate: {
-                directory: 'guides/release',
-              },
+              label: 'Crash Reporting',
+              link: '/guides/crash-reporting',
             },
             {
               label: 'Staging Patches',
@@ -92,14 +90,16 @@ export default defineConfig({
               },
             },
             {
-              label: 'Hybrid Apps',
+              label: 'Submitting to Stores',
               autogenerate: {
-                directory: 'guides/hybrid-apps',
+                directory: 'guides/submitting',
               },
             },
             {
-              label: 'Crash Reporting',
-              link: '/guides/crash-reporting',
+              label: 'Hybrid Apps',
+              autogenerate: {
+                directory: 'guides/hybrid-apps',
+              },
             },
           ],
         },
@@ -182,5 +182,7 @@ export default defineConfig({
     'guides/hybrid-app': 'guides/hybrid-apps/android',
     'guides/hybrid-app/android': 'guides/hybrid-apps/android',
     'guides/hybrid-app/ios': 'guides/hybrid-apps/ios',
+    'guides/release/android': 'guides/submitting/play-store',
+    'guides/release/ios': 'guides/submitting/app-store',
   },
 });
diff --git a/src/content/docs/guides/flavors/android.mdx b/src/content/docs/guides/flavors/android.mdx
index dbde0d18..2a7ab834 100644
--- a/src/content/docs/guides/flavors/android.mdx
+++ b/src/content/docs/guides/flavors/android.mdx
@@ -112,7 +112,11 @@ shorebird preview --app-id 904bd3d5-3526-4c1c-a832-7ac23c95302d --release-versio
 
 This will download the releases and run them on your device.
 
-In addition to previewing the releases locally, you should also [submit the generated app bundles to the Play Store](/guides/release/android#upload-to-the-play-store). In this case, both apps can be part of the internal test flavor and only the stable variant should be promoted to production.
+In addition to previewing the releases locally, you should also [submit the
+generated app bundles to the Play
+Store](/guides/submitting/play-store#upload-to-the-play-store). In this case, both
+apps can be part of the internal test flavor and only the stable variant should
+be promoted to production.
 
 :::note
 
diff --git a/src/content/docs/guides/flavors/ios.mdx b/src/content/docs/guides/flavors/ios.mdx
index 1fb59ddb..61b80cb1 100644
--- a/src/content/docs/guides/flavors/ios.mdx
+++ b/src/content/docs/guides/flavors/ios.mdx
@@ -81,7 +81,11 @@ shorebird preview --app-id 904bd3d5-3526-4c1c-a832-7ac23c95302d --release-versio
 
 This will download the releases and run them on your device.
 
-In addition to previewing the releases locally, you should also [submit the generated app bundles to the App Store](/guides/release/ios#upload-to-the-app-store). In this case, both apps can be part of the internal test flavor and only the stable variant should be promoted to production.
+In addition to previewing the releases locally, you should also [submit the
+generated app bundles to the App
+Store](/guides/submitting/app-store#upload-to-the-app-store). In this case, both apps can
+be part of the internal test flavor and only the stable variant should be
+promoted to production.
 
 :::note
 
diff --git a/src/content/docs/guides/staging-patches.mdx b/src/content/docs/guides/staging-patches.mdx
index 44624694..d47d9c92 100644
--- a/src/content/docs/guides/staging-patches.mdx
+++ b/src/content/docs/guides/staging-patches.mdx
@@ -54,7 +54,9 @@ shorebird release ios
 
 We can verify the releases were created successfully by visiting [Shorebird console](https://console.shorebird.dev).
 
-You should also [submit the generated app bundles to the Play Store](/guides/release/android#upload-to-the-play-store) and [submit the generated ipa to the App Store](/guides/release/ios#upload-to-the-app-store).
+You should also [submit the generated app bundles to the Play
+Store](/guides/submitting/play-store#upload-to-the-play-store) and [submit the
+generated ipa to the App Store](/guides/submitting/app-store#upload-to-the-app-store).
 
 ## Creating a patch
 
diff --git a/src/content/docs/guides/release/ios.mdx b/src/content/docs/guides/submitting/app-store.mdx
similarity index 99%
rename from src/content/docs/guides/release/ios.mdx
rename to src/content/docs/guides/submitting/app-store.mdx
index 48567cc5..16e11e3b 100644
--- a/src/content/docs/guides/release/ios.mdx
+++ b/src/content/docs/guides/submitting/app-store.mdx
@@ -2,7 +2,7 @@
 title: Releasing to the Apple App Store
 description: Release a Code Push App to the Apple App Store
 sidebar:
-  label: iOS
+  label: App Store
   order: 2
 ---
 
diff --git a/src/content/docs/guides/release/android.mdx b/src/content/docs/guides/submitting/play-store.mdx
similarity index 99%
rename from src/content/docs/guides/release/android.mdx
rename to src/content/docs/guides/submitting/play-store.mdx
index b32778dc..2cbb7414 100644
--- a/src/content/docs/guides/release/android.mdx
+++ b/src/content/docs/guides/submitting/play-store.mdx
@@ -2,7 +2,7 @@
 title: Releasing to the Google Play Store
 description: Release a Code Push App to the Google Play Store
 sidebar:
-  label: Android
+  label: Play Store
   order: 1
 ---
 
diff --git a/src/content/docs/troubleshooting.mdx b/src/content/docs/troubleshooting.mdx
index 262748fc..aa4107db 100644
--- a/src/content/docs/troubleshooting.mdx
+++ b/src/content/docs/troubleshooting.mdx
@@ -19,11 +19,11 @@ Patches are only compatible with the release version they were created for. If
 you create a patch for version `1.0.0+1`, it will not work on version `1.0.0+2`.
 
 :::note
-This can happen unexpectedly on iOS due to Xcode's automatic incrementing of
-build numbers. If you are seeing this issue on iOS, ensure that the build number
-of the release and the patch match. See [our iOS releasing
-guide](/guides/release/ios/#upload-to-the-app-store) for instructions on how to
-disable automatic build number incrementing.
+This can happen unexpectedly on iOS due to Xcode's automatic
+incrementing of build numbers. If you are seeing this issue on iOS, ensure that
+the build number of the release and the patch match. See [our iOS releasing
+guide](/guides/submitting/app-store/#upload-to-the-app-store) for instructions
+on how to disable automatic build number incrementing.
 :::
 
 #### How to tell if this is the problem