diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 48da783..9d975dd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -51,10 +51,12 @@ jobs:
           npx @tailwindcss/cli -m --optimize -i styles/tailwind.css -o public/main.t.css
 
       - name: Setup Pages
+        if: github.ref == 'refs/heads/main'
         uses: actions/configure-pages@v4
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
+        if: github.ref == 'refs/heads/main'
         with:
           path: "./public"
 
diff --git a/config.toml b/config.toml
index e4879d8..9f9ccc6 100644
--- a/config.toml
+++ b/config.toml
@@ -32,8 +32,10 @@ twitter = "https://twitter.com/rustmunich"
 youtube = "https://www.youtube.com/@rustmunichmeetup4459/streams"
 discord = "https://discord.gg/SdB7yuEB"
 slides_github = "https://github.com/rust-munich/slides"
+github_org = "https://github.com/rust-munich/"
 website_github = "https://github.com/rust-munich/website"
 meetup = "https://www.meetup.com/de-DE/rust-munich/"
+linkedin = "https://www.linkedin.com/groups/9802799/"
 logo_svg = "img/rust-munich-logo.svg"
 # This boolean is used by templates to hide/show draft notices
 show_drafts = false
diff --git a/content/about/index.md b/content/about/index.md
index 18e6631..d0669f4 100644
--- a/content/about/index.md
+++ b/content/about/index.md
@@ -12,3 +12,26 @@ Rust Munich uses the [Berlin Code of Conduct](https://berlincodeofconduct.org).
 
 Our primary goal is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible.
 If you experience or witness a violation, contact the organizers in person at events or by email.
+
+## Link tree
+
+- {{ meetup_link(text="Meetup.com group") }}
+- {{ discord_link(text="Discord server") }}
+- {{ github_link(text="GitHub organization") }}
+- {{ twitter_link(text="Twitter") }}
+- {{ youtube_link(text="YouTube") }}
+- {{ linkedin_link(text="LinkedIn group") }}
+
+## The Team
+
+### Current Organizers
+
+**Ludwig** Rustacean since Rust 1.0 and experienced software engineer with a background in engineering physics and over two decades in software development across aerospace, automotive, and security domains.
+
+**Sven** is a passionate Rustacean and software engineer with a background in computer science and over two decades of experience in software development. He enjoys building open source tools and fostering community engagement.
+
+**Jonas** is a software engineer with professional experience in C++ and Rust. He has a passion for system-level software, including embedded devices, databases and distributed systems.
+
+### Alumni
+
+**Bernhard** was instrumental in getting Rust Munich off the ground. His passion for building inclusive tech communities and knack for organizing events that people actually want to attend helped shape what we are today. Though he's moved on to new adventures, his influence on our community spirit lives on.
diff --git a/templates/base.html b/templates/base.html
index 6707f3d..194ef7f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -140,7 +140,21 @@ <h3 class="font-sans font-bold mb-4">Connect</h3>
                             </a>
                             <a
                                 class="inline-flex items-center justify-center w-10 h-10 border border-gray-300 rounded-full hover:bg-gray-100 hover:border-rust-yellow hover:text-rust-yellow transition-all"
-                                href="{{ config.extra.slides_github }}"
+                                href="{{ config.extra.linkedin }}"
+                                title="Rust Munich on LinkedIn"
+                                aria-label="Rust Munich on LinkedIn"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                            >
+                                <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                                    <path
+                                        d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"
+                                    />
+                                </svg>
+                            </a>
+                            <a
+                                class="inline-flex items-center justify-center w-10 h-10 border border-gray-300 rounded-full hover:bg-gray-100 hover:border-rust-yellow hover:text-rust-yellow transition-all"
+                                href="{{ config.extra.github_org }}"
                                 title="Rust Munich on GitHub"
                                 aria-label="Rust Munich on GitHub"
                                 target="_blank"
diff --git a/templates/shortcodes/btn.html b/templates/shortcodes/btn.html
new file mode 100644
index 0000000..e6f59ed
--- /dev/null
+++ b/templates/shortcodes/btn.html
@@ -0,0 +1,24 @@
+{% set class = class | default(value="") %}
+{% set variant = variant | default(value="primary") %}
+{% set size = size | default(value="md") %}
+
+{% if variant == "primary" %}
+  {% set btn_classes = "bg-rust-red text-white hover:bg-rust-red/90" %}
+{% elif variant == "secondary" %}
+  {% set btn_classes = "border border-gray-300 hover:bg-yellow-50 hover:border-rust-yellow" %}
+{% else %}
+  {% set btn_classes = variant %}
+{% endif %}
+
+{% if size == "sm" %}
+  {% set size_classes = "px-4 py-2 text-sm" %}
+{% elif size == "lg" %}
+  {% set size_classes = "px-6 py-3" %}
+{% else %}
+  {% set size_classes = "px-4 py-2" %}
+{% endif %}
+
+<a href="{{ url }}"
+   class="btn inline-block {{ size_classes }} {{ btn_classes }} rounded font-sans font-medium transition-colors {{ class }}"
+   {% if target %}target="{{ target }}"{% endif %}
+   {% if rel %}rel="{{ rel }}"{% endif %}>{{ text }}</a>
\ No newline at end of file
diff --git a/templates/shortcodes/github_link.html b/templates/shortcodes/github_link.html
index 2df62d2..3990974 100644
--- a/templates/shortcodes/github_link.html
+++ b/templates/shortcodes/github_link.html
@@ -1,3 +1,3 @@
-<a href="{{ config.extra.website_github }}" target="_blank" rel="noopener noreferrer"
-    >{{ text | default(value="website @ github.com") }}</a
+<a href="{{ config.extra.github_org }}" target="_blank" rel="noopener noreferrer"
+    >{{ text | default(value="rust munich @ github") }}</a
 >
diff --git a/templates/shortcodes/icon.html b/templates/shortcodes/icon.html
new file mode 100644
index 0000000..82f2f63
--- /dev/null
+++ b/templates/shortcodes/icon.html
@@ -0,0 +1,17 @@
+{% if name == "location" %}
+<svg class="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
+    <path fill-rule="evenodd" d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z" clip-rule="evenodd"></path>
+</svg>
+{% elif name == "job-type" %}
+<svg class="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
+    <path fill-rule="evenodd" d="M6 6V5a3 3 0 013-3h2a3 3 0 013 3v1h2a2 2 0 012 2v3.57A22.952 22.952 0 0110 13a22.95 22.95 0 01-8-1.43V8a2 2 0 012-2h2zm2-1a1 1 0 011-1h2a1 1 0 011 1v1H8V5zm1 5a1 1 0 011-1h.01a1 1 0 110 2H10a1 1 0 01-1-1z" clip-rule="evenodd"></path>
+</svg>
+{% elif name == "remote" %}
+<svg class="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
+    <path d="M3 4a1 1 0 011-1h12a1 1 0 011 1v2a1 1 0 01-1 1H4a1 1 0 01-1-1V4zM3 10a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H4a1 1 0 01-1-1v-6zM14 9a1 1 0 00-1 1v6a1 1 0 001 1h2a1 1 0 001-1v-6a1 1 0 00-1-1h-2z"></path>
+</svg>
+{% elif name == "experience" %}
+<svg class="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
+    <path d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+</svg>
+{% endif %}
\ No newline at end of file
diff --git a/templates/shortcodes/linkedin_link.html b/templates/shortcodes/linkedin_link.html
new file mode 100644
index 0000000..f657478
--- /dev/null
+++ b/templates/shortcodes/linkedin_link.html
@@ -0,0 +1,3 @@
+<a href="{{ config.extra.linkedin }}" target="_blank" rel="noopener noreferrer"
+    >{{ text | default(value="rust munich @ linkedin") }}</a
+>
diff --git a/templates/shortcodes/twitter_link.html b/templates/shortcodes/twitter_link.html
new file mode 100644
index 0000000..2bb3999
--- /dev/null
+++ b/templates/shortcodes/twitter_link.html
@@ -0,0 +1,3 @@
+<a href="{{ config.extra.twitter }}" target="_blank" rel="noopener noreferrer"
+    >{{ text | default(value="rust munich @ twitter") }}</a
+>
diff --git a/templates/shortcodes/youtube_link.html b/templates/shortcodes/youtube_link.html
new file mode 100644
index 0000000..06808f7
--- /dev/null
+++ b/templates/shortcodes/youtube_link.html
@@ -0,0 +1,3 @@
+<a href="{{ config.extra.youtube }}" target="_blank" rel="noopener noreferrer"
+    >{{ text | default(value="rust munich @ youtube") }}</a
+>