diff --git a/site/content/assets/404 b/site/content/assets/404
deleted file mode 100644
index c472b4ea0a781..0000000000000
--- a/site/content/assets/404
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: default
----
-
-<style type="text/css" media="screen">
-  .container {
-    margin: 10px auto;
-    max-width: 600px;
-    text-align: center;
-  }
-  h1 {
-    margin: 30px 0;
-    font-size: 4em;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-</style>
-
-<div class="container">
-  <h1>404</h1>
-
-  <p><strong>Page not found :(</strong></p>
-  <p>The requested page could not be found.</p>
-</div>
diff --git a/site/pelicanconf.py b/site/pelicanconf.py
index 029e81b7f8d54..a87176ffe1117 100644
--- a/site/pelicanconf.py
+++ b/site/pelicanconf.py
@@ -13,7 +13,7 @@
 EXTRA_PATH_METADATA = {
     "assets/robots.txt": {"path": "robots.txt"},
     "assets/favicon.ico": {"path": "favicon.ico"},
-    "assets/404": {"path": "404.html"},
+    # "assets/404": {"path": "404.html"},
     "assets/google7933de1bd04e097b": {"path": "google7933de1bd04e097b.html"},
     "assets/google95e577d28834e13d": {"path": "google95e577d28834e13d.html"},
 }
@@ -30,7 +30,8 @@
 TEMPLATE_PAGES = {
     "pages/community.html": "community.html",
     "pages/docs.html": "docs.html",
-    "pages/training.html": "training.html"}
+    "pages/training.html": "training.html",
+    "templates/404.html": "404.html"}
 THEME = "theme"
 TIMEZONE = "Europe/London"
 
diff --git a/site/theme/templates/404.html b/site/theme/templates/404.html
new file mode 100644
index 0000000000000..ec6b62a205f54
--- /dev/null
+++ b/site/theme/templates/404.html
@@ -0,0 +1,12 @@
+{% extends "default.html" %}
+
+{% block content %}
+<div class="container">
+  <h1>404</h1>
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+
+  <a href="{{ SITEURL }}/" class="button">Home</a>
+  <a href="{{ SITEURL }}/pages/docs.html" class="button">Docs</a>
+</div>
+{% endblock %}