diff --git a/templates/zerver/developer-community.html b/templates/zerver/developer-community.html
index 046b7ae4e4..3ea1aee9a1 100644
--- a/templates/zerver/developer-community.html
+++ b/templates/zerver/developer-community.html
@@ -17,12 +17,26 @@
 {% include 'zerver/landing_nav.html' %}
 
 
-<div class="portico-landing why-page no-slide">
+<div class="portico-landing why-page no-slide solutions-page">
     <div class="hero bg-pycon">
         <div class="bg-dimmer"></div>
         <div class="content">
             <h1 class="center">{% trans %}The Zulip developer community{% endtrans %}</h1>
         </div>
+        <div class="hero-text">
+            Join today! The buttons below provide customized stream subscriptions.
+        </div>
+        <div class="hero-buttons center">
+            <a href="https://chat.zulip.org/join/t5crtoe62bpcxyisiyglmtvb/" class="button">
+                {{ _('Join as a user') }}
+            </a>
+            <a href="https://chat.zulip.org/join/wnhv3jzm6afa4raenedanfno/" class="button">
+                {{ _('Join as a self-hoster') }}
+            </a>
+            <a href="#https://chat.zulip.org/join/npzwak7vpmaknrhxthna3c7p/" class="button">
+                {{ _('Join as a contributor') }}
+            </a>
+        </div>
     </div>
     <div class="main">
         <div class="padded-content">
@@ -31,5 +45,24 @@
             </div>
         </div>
     </div>
+
+    <div class="feature-end">
+        <div class="bottom-register-buttons">
+            <h1>
+                Join today!
+            </h1>
+            <div class="hero-buttons center">
+                <a href="https://chat.zulip.org/join/t5crtoe62bpcxyisiyglmtvb/" class="button">
+                    {{ _('Join as a user') }}
+                </a>
+                <a href="https://chat.zulip.org/join/wnhv3jzm6afa4raenedanfno/" class="button">
+                    {{ _('Join as a self-hoster') }}
+                </a>
+                <a href="#https://chat.zulip.org/join/npzwak7vpmaknrhxthna3c7p/" class="button">
+                    {{ _('Join as a contributor') }}
+                </a>
+            </div>
+        </div>
+    </div>
 </div>
 {% endblock %}
diff --git a/templates/zerver/developer-community.md b/templates/zerver/developer-community.md
index 898cd6459b..bfa2cf21c7 100644
--- a/templates/zerver/developer-community.md
+++ b/templates/zerver/developer-community.md
@@ -1,5 +1,3 @@
-# Join the Zulip community
-
 The primary communication forum for the Zulip community is the Zulip
 server hosted at [chat.zulip.org](https://chat.zulip.org/):
 
@@ -25,6 +23,7 @@ developers during daylight hours in North America (roughly between
 15:00 UTC and 1:00 UTC), but the sun never sets on the Zulip
 community. Most questions get a reply within minutes to a few hours.
 
+<br/>
 # Community norms
 
 Zulip is a friendly and welcoming community, and we love meeting new
@@ -74,6 +73,7 @@ feedback.
   is generally no need to @-mention a core contributor unless you need
   their timely attention.
 
+<br/>
 # Where do I send my message?
 
 This section describes popular public streams on chat.zulip.org. Kick
@@ -203,6 +203,7 @@ topic to a different stream](/help/move-content-to-another-stream).
 You can always find the description for the stream you’re reading at
 the top of the Zulip app.
 
+<br/>
 # Anything else to keep in mind?
 
 ## Don’t try to read *everything*