diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index caab7e03a3..b6356a2ad6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
     - name: Read .nvmrc
       run: echo "::set-output name=NVMRC::$(cat ./.nvmrc)"
       id: nvm
diff --git a/ui/pages/Menu.tsx b/ui/pages/Menu.tsx
index 962b2b6c95..ebf10e8945 100644
--- a/ui/pages/Menu.tsx
+++ b/ui/pages/Menu.tsx
@@ -87,7 +87,6 @@ export default function Menu(): ReactElement {
           ))}
         </ul>
         <div className="community_cta_wrap">
-          <div className="illustration_discord" />
           <h2 className="serif_header">Community release!</h2>
           <p>Join our discord to give us feedback!</p>
           <SharedButton
@@ -104,19 +103,24 @@ export default function Menu(): ReactElement {
           </SharedButton>
           <div className="version">
             Version: {process.env.VERSION ?? `<unknown>`} (
-            {process.env.GIT_COMMIT_DATE?.slice(0, "YYYY-MM-DD".length)})
+            {new Date(
+              process.env.GIT_COMMIT_DATE ?? "invalid date"
+            ).toLocaleDateString(undefined, { dateStyle: "medium" })}
+            )
           </div>
         </div>
       </section>
       <style jsx>
         {`
           section {
+            display: flex;
+            flex-flow: column;
+            height: 544px;
             background-color: var(--hunter-green);
           }
           .community_cta_wrap {
             width: 100vw;
-            height: 370px;
-            margin-top: 19px;
+            margin-top: auto;
             margin-left: -21px;
             background-color: var(--green-95);
             text-align: center;
@@ -159,15 +163,8 @@ export default function Menu(): ReactElement {
           .mega_discord_chat_bubble_button:hover {
             opacity: 0.8;
           }
-          .illustration_discord {
-            background: url("./images/illustration_menu_tab_discord@2x.png");
-            background-size: cover;
-            width: 252px;
-            height: 162px;
-            margin: 5px 0px 20px -19px;
-          }
           .version {
-            margin: 4px 0;
+            margin: 16px 0;
             color: var(--green-60);
             font-size: 12px;
           }
diff --git a/ui/public/images/illustration_menu_tab_discord@2x.png b/ui/public/images/illustration_menu_tab_discord@2x.png
deleted file mode 100644
index b1144c9b28..0000000000
Binary files a/ui/public/images/illustration_menu_tab_discord@2x.png and /dev/null differ
diff --git a/webpack.config.ts b/webpack.config.ts
index 193482700d..2798abc228 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import path from "path"
 import webpack, {
   Configuration,
@@ -17,7 +18,23 @@ import WebExtensionArchivePlugin from "./build-utils/web-extension-archive-webpa
 
 const supportedBrowsers = ["brave", "chrome", "edge", "firefox", "opera"]
 
-const gitRevisionPlugin = new GitRevisionPlugin()
+const gitRevisionPlugin = new GitRevisionPlugin({
+  /* `--tags` option allows for un-annotated tags, currently present in the repo */
+  versionCommand: `describe --tags`,
+})
+
+const gitVersion = gitRevisionPlugin.version()
+if (gitVersion === null || !gitVersion.startsWith("v")) {
+  throw new Error(`cannot get current version from git: missing or invalid`)
+}
+
+const [manifestVersion, versionQualifier] = gitVersion
+  .substring(1)
+  .split("-", 2)
+
+if (typeof versionQualifier !== "undefined") {
+  console.log(`Building NON-OFFICIAL version ${gitVersion}. Do not release.`)
+}
 
 // Replicated and adjusted for each target browser and the current build mode.
 const baseConfig: Configuration = {
@@ -218,6 +235,12 @@ export default (
                     .map((assetData) => JSON.parse(assetData))
                 )
 
+                if (combinedManifest.version !== manifestVersion) {
+                  throw new Error(
+                    `manifest version '${combinedManifest.version}' does not match git version '${manifestVersion}'`
+                  )
+                }
+
                 return JSON.stringify(combinedManifest, null, 2)
               },
             } as unknown as ObjectPattern, // ObjectPattern doesn't include transformAll in current types