diff --git a/metadata/org.mozilla.klar.txt b/metadata/org.mozilla.klar.txt
index 3c98774512..0d3c3a2341 100644
--- a/metadata/org.mozilla.klar.txt
+++ b/metadata/org.mozilla.klar.txt
@@ -47,14 +47,38 @@ Build:2.0,11
     rm=app/libs/*
     prebuild=sed -i -e '/focusCompile/d' -e '/geckoCompile/d' -e '/Dynamically set versionCode/,/^}/d' build.gradle
 
+Build:2.1,12
+    commit=v2.1
+    subdir=app
+    gradle=klar,webview
+    rm=app/libs/*
+    prebuild=echo 'ext { generatedVersionCode = $$VERCODE$$ }' > ../tools/gradle/versionCode.gradle && \
+        sed -i -e '/focusCompile/d; /geckoCompile/d' build.gradle
+
+Build:2.2,13
+    commit=v2.2
+    subdir=app
+    gradle=klar,webview
+    rm=app/libs/*
+    prebuild=echo 'ext { generatedVersionCode = $$VERCODE$$ }' > ../tools/gradle/versionCode.gradle && \
+        sed -i -e '/focusCompile/d; /geckoCompile/d' build.gradle
+
+Build:2.3,14
+    commit=v2.3
+    subdir=app
+    gradle=klar,webview
+    rm=app/libs/*
+    prebuild=echo 'ext { generatedVersionCode = $$VERCODE$$ }' > ../tools/gradle/versionCode.gradle && \
+        sed -i -e '/focusCompile/d; /geckoCompile/d' build.gradle
+
 Maintainer Notes:
-Release builds calculate version code dynamically. This is unsuitable for us
-because it depends on date and time. Use default version code (supposed to be
-used in debug builds): it's a well-formed static constant bumped every release.
+Cannot use AUM/UCM because version code is not updated, see
+https://github.com/mozilla-mobile/focus-android/issues/1528.
+
+Increment version code by 1 on each release.
 .
 
-Auto Update Mode:Version v%v
-Update Check Mode:Tags ^v[0-9.]+$
-Update Check Name:org.mozilla
-Current Version:2.0
-Current Version Code:11
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:2.3
+Current Version Code:14