diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index a1a27a7c48..98f697bfb9 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -1268,8 +1268,8 @@ Build:39.0,390000
         echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
         echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
         popd && \
-        sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
-        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\n' >> mobile/android/confvars.sh && \
+        sed -i -e '/MOZ_SERVICES_HEALTHREPORTER/d' -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\nMOZ_SERVICES_HEALTHREPORTER=\n' >> mobile/android/confvars.sh && \
         sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build && \
@@ -1391,8 +1391,8 @@ Build:39.0,390010
         echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
         echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
         popd && \
-        sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
-        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\n' >> mobile/android/confvars.sh && \
+        sed -i -e '/MOZ_SERVICES_HEALTHREPORTER/d' -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\nMOZ_SERVICES_HEALTHREPORTER=\n' >> mobile/android/confvars.sh && \
         sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build && \