diff --git a/metadata/org.mozilla.mozstumbler.txt b/metadata/org.mozilla.mozstumbler.txt
index 56a15109bf..6fe6d81e88 100644
--- a/metadata/org.mozilla.mozstumbler.txt
+++ b/metadata/org.mozilla.mozstumbler.txt
@@ -14,8 +14,7 @@ no GPS is available, similar to OpenWLANMap.
 .
 
 Repo Type:git
-#Repo:https://github.com/mozilla/MozStumbler.git
-Repo:https://github.com/crankycoder/MozStumbler.git
+Repo:https://github.com/mozilla/MozStumbler.git
 
 Build:0.8.2,20
     commit=32d4102
@@ -102,30 +101,18 @@ Build:0.30.0,43
     gradle=yes
 
 Build:1.2.1,1020100
-    subdir=android
     commit=6ac3faeccfcccf79952b82e0b3c8abf9911c138b
-    gradle=fdroid
-
-
-Build:1.2.0.1,1020001
-    disable=simmplekml-todo
-    commit=v1.2.0.1-fdroid
     subdir=android
-    gradle=yes
-    srclibs=SimpleKML@ebe735b103e55dad60ad5a41468cbb79360f2f6a
-    prebuild=sed -i -e '/mozilla-services.github.io/,+1d' -e '/sonatype/d' -e '/mavenCentral/amavenLocal()' build.gradle ../build.gradle && \
-        sed -i -e '/ivy/d' build.gradle && \
-        pushd $$SimpleKML$$ && $$MVN3$$ install && popd
+    gradle=fdroid
+    prebuild=sed -i -e '/sonatype/d' build.gradle ../build.gradle
 
 Maintainer Notes:
-Either 
-  - build simplekml and install to localmaven
-  - include it intro gradle
+Reset UCM and AUM after the next release.
 .
 
 Auto Update Mode:None
-#Auto Update Mode:Version v%v-fdroid
-Update Check Mode:Tags
-Current Version:0.102.1.0
+#Auto Update Mode:Version v%v
+#Update Check Mode:Tags
+Update Check Mode:Static
+Current Version:1.2.1
 Current Version Code:1020100
-