diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index c601b07d60..b0cf6913ab 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -1,6 +1,7 @@
 AntiFeatures:
   - NonFreeAdd
   - Tracking
+  - UpstreamNonFree
 Categories:
   - Internet
 License: MPL-2.0
@@ -21,8 +22,8 @@ Description: |-
     some binaries left and the app (or some builds) might get removed or re-pushed
     anytime.
 
-RepoType: hg
-Repo: https://hg.mozilla.org/releases/mozilla-esr68/
+RepoType: git
+Repo: https://github.com/mozilla-mobile/fenix
 
 Builds:
   - versionName: '35.0'
@@ -10590,6 +10591,52 @@ Builds:
         'META-INF/*.*'
     ndk: r19c
 
+  - versionName: 81.1.1
+    versionCode: 811100
+    commit: v81.1.1
+    timeout: 10800
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ python-setuptools tcl gyp ninja-build libffi-dev libsqlite3-dev
+        llvm-6.0
+    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
+    srclibs:
+      - MozAndroidComponents@v57.0.6
+      - MozAndroidComponentsAS@v24.0.0
+      - MozAppServices@v61.0.13
+      - MozBuild@77066dd2f4224f88d976404f947141a9fb5b8e97
+      - MozFennec@FIREFOX_81_0_RELEASE
+      - MozGlean@v32.1.1
+      - MozGleanAS@v21.3.0
+      - pyenv@v1.2.20
+      - rustup@1.22.1
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
+  - versionName: 81.1.1
+    versionCode: 811120
+    commit: v81.1.1
+    timeout: 10800
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ python-setuptools tcl gyp ninja-build libffi-dev libsqlite3-dev
+        llvm-6.0
+    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
+    srclibs:
+      - MozAndroidComponents@v57.0.6
+      - MozAndroidComponentsAS@v24.0.0
+      - MozAppServices@v61.0.13
+      - MozBuild@77066dd2f4224f88d976404f947141a9fb5b8e97
+      - MozFennec@FIREFOX_81_0_RELEASE
+      - MozGlean@v32.1.1
+      - MozGleanAS@v21.3.0
+      - pyenv@v1.2.20
+      - rustup@1.22.1
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
 MaintainerNotes: |4-
 
     Updating/Versioning:
diff --git a/srclibs/MozAndroidComponents.yml b/srclibs/MozAndroidComponents.yml
index c517a92613..19ccbf095a 100644
--- a/srclibs/MozAndroidComponents.yml
+++ b/srclibs/MozAndroidComponents.yml
@@ -1,2 +1,4 @@
 RepoType: git
-Repo: https://github.com/mozilla-mobile/android-components.git
\ No newline at end of file
+Repo: https://github.com/mozilla-mobile/android-components.git
+Prepare: |
+  sed -i -e '/com.google.android.gms/d; /com.google.firebase/d' buildSrc/src/main/java/Dependencies.kt && rm -fR components/feature/p2p components/lib/{nearby,push-amazon,push-firebase}
diff --git a/srclibs/MozAndroidComponentsAS.yml b/srclibs/MozAndroidComponentsAS.yml
new file mode 120000
index 0000000000..18ce0d3194
--- /dev/null
+++ b/srclibs/MozAndroidComponentsAS.yml
@@ -0,0 +1 @@
+MozAndroidComponents.yml
\ No newline at end of file
diff --git a/srclibs/MozAppServices.yml b/srclibs/MozAppServices.yml
new file mode 100644
index 0000000000..5c67dfcda0
--- /dev/null
+++ b/srclibs/MozAppServices.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/mozilla/application-services.git
diff --git a/srclibs/MozBuild.yml b/srclibs/MozBuild.yml
new file mode 100644
index 0000000000..a55a7a4ad8
--- /dev/null
+++ b/srclibs/MozBuild.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://gitlab.com/relan/fennecbuild.git
diff --git a/srclibs/MozGleanAS.yml b/srclibs/MozGleanAS.yml
new file mode 120000
index 0000000000..bb8c5ccc91
--- /dev/null
+++ b/srclibs/MozGleanAS.yml
@@ -0,0 +1 @@
+MozGlean.yml
\ No newline at end of file