diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts
index 8c343b61d..49566f268 100644
--- a/src/lib/stores/marketplace.ts
+++ b/src/lib/stores/marketplace.ts
@@ -9,7 +9,8 @@ const TemplateRuntimes = {
     RUBY: { name: 'ruby', versions: ['3.3', '3.2', '3.1', '3.0'] },
     PYTHON: { name: 'python', versions: ['3.12', '3.11', '3.10', '3.9', '3.8'] },
     DART: { name: 'dart', versions: ['3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16', '2.16'] },
-    BUN: { name: 'bun', versions: ['1.0'] }
+    BUN: { name: 'bun', versions: ['1.0'] },
+    GO: { name: 'go', versions: ['1.22'] }
 };
 
 const getRuntimes = (
@@ -45,13 +46,6 @@ export const marketplace: MarketplaceTemplate[] = [
         usecases: ['Starter'],
         runtimes: [
             ...getRuntimes(TemplateRuntimes.NODE, 'npm install', 'src/main.js', 'node/starter'),
-            ...getRuntimes(
-                TemplateRuntimes.PHP,
-                'composer install',
-                'src/index.php',
-                'php/starter'
-            ),
-            ...getRuntimes(TemplateRuntimes.RUBY, 'bundle install', 'lib/main.rb', 'ruby/starter'),
             ...getRuntimes(
                 TemplateRuntimes.PYTHON,
                 'pip install -r requirements.txt',
@@ -59,7 +53,15 @@ export const marketplace: MarketplaceTemplate[] = [
                 'python/starter'
             ),
             ...getRuntimes(TemplateRuntimes.DART, 'dart pub get', 'lib/main.dart', 'dart/starter'),
-            ...getRuntimes(TemplateRuntimes.BUN, 'bun install', 'src/main.ts', 'bun/starter')
+            ...getRuntimes(
+                TemplateRuntimes.PHP,
+                'composer install',
+                'src/index.php',
+                'php/starter'
+            ),
+            ...getRuntimes(TemplateRuntimes.BUN, 'bun install', 'src/main.ts', 'bun/starter'),
+            ...getRuntimes(TemplateRuntimes.GO, '', 'main.go', 'go/starter'),
+            ...getRuntimes(TemplateRuntimes.RUBY, 'bundle install', 'lib/main.rb', 'ruby/starter')
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.`,
         vcsProvider: 'github',
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 08746d2e9..27409c2c8 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -210,6 +210,13 @@
                             {/await}
                         </ul>
                     </section>
+
+                    <Button
+                        text
+                        class="u-margin-block-start-24 u-margin-inline-start-auto"
+                        href={`${base}/project-${$page.params.project}/functions/templates?useCase=Starter`}>
+                        All starter templates <span class="icon-cheveron-right" />
+                    </Button>
                     <div class="u-sep-block-start common-section" />
                     <section class="common-section">
                         <Heading size="6" tag="h6">Templates</Heading>