diff --git a/server/src/main.rs b/server/src/main.rs
index 72712eec88..ee1869707c 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -10,7 +10,6 @@ mod home;
 mod rpc;
 mod team;
 mod story;
-mod tech;
 mod updates;
 mod releases;
 mod community;
@@ -182,7 +181,6 @@ pub async fn run_server(
     releases::add_routes(&mut web);
     updates::add_routes(&mut web);
     community::add_routes(&mut web);
-    tech::add_routes(&mut web);
     admin::add_routes(&mut web);
     auth::add_routes(&mut web);
     assets::add_routes(&mut web);
diff --git a/server/src/tech.rs b/server/src/tech.rs
deleted file mode 100644
index e42bf257e0..0000000000
--- a/server/src/tech.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::{AppState, Request, RequestExt};
-use std::sync::Arc;
-use tide::http::mime;
-
-pub fn add_routes(tech: &mut tide::Server<Arc<AppState>>) {
-    tech.at("/tech").get(get_tech);
-}
-
-async fn get_tech(mut request: Request) -> tide::Result {
-    let data = request.layout_data().await?;
-    Ok(tide::Response::builder(200)
-        .body(request.state().render_template("tech.hbs", &data)?)
-        .content_type(mime::HTML)
-        .build())
-}
diff --git a/server/templates/community.hbs b/server/templates/community.hbs
index c5edc36bbb..f2a5bc54bd 100644
--- a/server/templates/community.hbs
+++ b/server/templates/community.hbs
@@ -1,7 +1,37 @@
 {{#> layout }}
 
-<div class="container mx-auto max-w-screen-md p-10 pt-20">
-    <h1 class="text-white text-4xl font-display font-extralight mb-10">Community</h1>
+<div class="max-w-screen-lg font-thin mx-auto p-20">
+    <h1 class="font-display font-extralight mb-10">We’re building a community of passionate developers &amp; advocates.</h1>
+    <p class="mt-5 leading-7">Be the first to join a community of builders that want to make the future.</p>
+    <form action="" class="mt-10">
+        <ul>
+            <li class="mt-5 text-lg flex flex-row">
+                <input class="w-8 mr-5" type="checkbox" id="form-releases" name="releases" checked>
+                <div class="flex-1">
+                    <label for="releases">I want to try Zed when it is available</label>
+                    <p class="text-sm text-gray-400 mt-1 leading-6">Get updates on beta releases, and when Zed launches.</p>
+                </div>
+            </li>
+            <li class="mt-5 text-lg flex flex-row">
+                <input class="w-8 mr-5" type="checkbox" id="form-follow" name="follow">
+                <div class="flex-1">
+                    <label for="follow">I’m interested in following Zed's development</label>
+                    <p class="text-sm text-gray-400 mt-1 leading-6">Receive occasional email updates on the development of Zed and it's tech</p>
+                </div>
+            </li>
+            <li class="mt-5 text-lg flex flex-row">
+                <input class="w-8 mr-5" type="checkbox" id="form-community" name="community">
+                <div class="flex-1">
+                   <label for="community">I want to join the Zed Universe community</label>
+                    <p class="text-sm text-gray-400 mt-1 leading-6">Join the waitlist for our alpha tester community to get early access to releases and contribute to Zed's development through testing &amp; feedback.</p>
+                </div>
+            </li>
+        </ul>
+        <input class="block border bg-transparent border-white mt-10 p-5 text-lg w-2/3" type="text" id="form-email" name="email" required minlength="4" placeholder="Your email">
+        <button href="/story" class="block underline mt-10 text-lg">Join the waitlist.</button>
+    </form>
+
+    <p class="text-sm text-gray-500 mt-20 leading-7">We'll never spam your email &mdash; You can expect an email every 1 to 3 months from us if you sign up for updates, and occasional emails about public testing releases.</p>
 </div>
 
 {{/layout}}
diff --git a/server/templates/tech.hbs b/server/templates/tech.hbs
deleted file mode 100644
index 73e59ff425..0000000000
--- a/server/templates/tech.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#> layout }}
-
-<div class="container mx-auto max-w-screen-md p-10 pt-20">
-    <h1 class="text-white text-4xl font-display font-extralight mb-10">The Tech ~remove me~</h1>
-
-    <h2 class="font-display mt-10">Rust – wip</h2>
-    <p>wip</p>
-
-    <h2 id="gpui" class="font-display mt-10">GPUI – <span class="italic">Laying the foundation for a generation of apps.</span></h2>
-    <p class="mt-5 leading-7">A GPU rendering library for rust apps, gpui is a brand new platform for creating lightning fast native apps that take full advantage of your local hardware.</p>
-    <p class="mt-5 leading-7">We’re building gpui and Zed in parallel, and expect to open gpui up for usage outside of it in the future.</p>
-
-    <h2 id="gpui" class="font-display mt-10">CRDT – The key to time travel.</h2>
-    <p class="mt-5 leading-7">One of the foundational elements of Zed is the ability...</p>
-</div>
-
-{{/layout}}