diff --git a/metadata/com.derdilla.bloodPressureApp.yml b/metadata/com.derdilla.bloodPressureApp.yml
index ff747be291..d871b7c1a8 100644
--- a/metadata/com.derdilla.bloodPressureApp.yml
+++ b/metadata/com.derdilla.bloodPressureApp.yml
@@ -667,8 +667,43 @@ Builds:
       - export PUB_CACHE=.pub-cache
       - $$flutter$$/bin/flutter build apk --flavor fdroid --release --obfuscate --split-debug-info=./build/debug-info
 
+  - versionName: 1.8.0-samsung-fix
+    versionCode: 41
+    commit: ca89b04f64b79266d432faa1d9daf4133d77e84e
+    output: app/build/app/outputs/flutter-apk/app-fdroid-release.apk
+    srclibs:
+      - flutter@beta
+    rm:
+      - app/ios
+      - app/linux
+      - app/macos
+      - app/web
+      - app/windows
+      - app/test
+      - health_data_store/test
+      - docs
+    prebuild:
+      - export flutterVersion=$(sed -n -E "s/.*f-droid-flutter:\s*(.*)/\1/p" app/pubspec.yaml)
+      - '[[ $flutterVersion ]] || exit 1'
+      - pushd $$flutter$$
+      - git checkout -f $flutterVersion
+      - popd
+      - pushd health_data_store
+      - $$flutter$$/bin/dart run build_runner build
+      - $$flutter$$/bin/dart pub get
+      - pushd ../app
+      - export PUB_CACHE=.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter packages pub get
+    scandelete:
+      - app/.pub-cache
+    build:
+      - pushd app
+      - export PUB_CACHE=.pub-cache
+      - $$flutter$$/bin/flutter build apk --flavor fdroid --release --obfuscate --split-debug-info=./build/debug-info
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 1.8.0
-CurrentVersionCode: 40
+CurrentVersion: 1.8.0-samsung-fix
+CurrentVersionCode: 41