diff --git a/.gitea/workflows/beta.yml b/.gitea/workflows/beta.yml
index 82a4deb..d406ee9 100644
--- a/.gitea/workflows/beta.yml
+++ b/.gitea/workflows/beta.yml
@@ -20,6 +20,7 @@ jobs:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }}
       DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
+      BUILD_NUMBER: ${{ gitea.run_number }}
 
     steps:
       - name: Checkout
@@ -32,11 +33,6 @@ jobs:
           git -c credential.helper= -c http.lowSpeedLimit=1000 -c http.lowSpeedTime=30 clone "$AUTH_URL" .
           git checkout "${{ gitea.sha }}"
 
-      - name: Set build number
-        run: |
-          cd Darwin
-          agvtool new-version -all ${{ gitea.run_number }}
-
       - name: Write App Store Connect API key
         run: |
           cat > Darwin/fastlane/apikey.json <<EOF
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 4517deb..6277d81 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -20,6 +20,7 @@ jobs:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }}
       DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
+      BUILD_NUMBER: ${{ gitea.run_number }}
 
     steps:
       - name: Checkout
@@ -39,11 +40,6 @@ jobs:
             exit 1
           fi
 
-      - name: Set build number
-        run: |
-          cd Darwin
-          agvtool new-version -all ${{ gitea.run_number }}
-
       - name: Write App Store Connect API key
         run: |
           cat > Darwin/fastlane/apikey.json <<EOF
diff --git a/Darwin/fastlane/Fastfile b/Darwin/fastlane/Fastfile
index 17b1135..8a8b099 100644
--- a/Darwin/fastlane/Fastfile
+++ b/Darwin/fastlane/Fastfile
@@ -17,12 +17,17 @@ lane :assemble do |options|
   # scope a global override to just one target, and update_code_signing_settings
   # itself can't parse this project's newer .pbxproj format anyway (gem
   # limitation, not fixable by updating the gem).
+  # agvtool needs VERSIONING_SYSTEM = apple-generic, which this project doesn't
+  # set, so it silently no-ops - pass CURRENT_PROJECT_VERSION directly instead.
+  xcargs = "-skipPackagePluginValidation -skipMacroValidation"
+  xcargs += " CURRENT_PROJECT_VERSION=#{ENV['BUILD_NUMBER']}" if ENV["BUILD_NUMBER"]
+
   build_app(
     scheme: "PediFoods App",
     sdk: "iphoneos",
     export_method: ENV["BITRISE_DISTRIBUTION_METHOD"] || "app-store",
     xcconfig: "fastlane/AppStore.xcconfig",
-    xcargs: "-skipPackagePluginValidation -skipMacroValidation",
+    xcargs: xcargs,
     derived_data_path: "../.build/Darwin/DerivedData",
     output_directory: "../.build/fastlane/Darwin",
     skip_archive: ENV["FASTLANE_SKIP_ARCHIVE"] == "YES",