diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index c0292c52..2a1a1da1 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -41,5 +41,5 @@ jobs:
           APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
           APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
         run: yarn app:build
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 246bba94..f676c80d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -9,11 +9,11 @@ VERSIONS = read_json( json_path: "./package.json" )[:versions]
 ENVIRONMENT = ENV["TOOOT_ENVIRONMENT"]
 VERSION = "#{VERSIONS[:major]}.#{VERSIONS[:minor]}"
 RELEASE_CHANNEL = "#{VERSIONS[:major]}-#{ENVIRONMENT}"
-BUILD_NUMBER = number_of_commits
+BUILD_NUMBER = ENV["GITHUB_RUN_NUMBER"]
 GITHUB_REPO = "tooot-app/app"
 case ENVIRONMENT
 when "staging"
-  GITHUB_RELEASE = "v#{VERSION} (#{BUILD_NUMBER})"
+  GITHUB_RELEASE = "v#{VERSION}(#{BUILD_NUMBER})"
 when "production"
   GITHUB_RELEASE = "v#{VERSION}"
 end
@@ -40,13 +40,17 @@ end
 
 desc "Create new GitHub release"
 private_lane :github_release do
+  case ENVIRONMENT
+  when "staging"
+    is_prerelease = true
+  when "production"
+    is_prerelease = false
+  end
   set_github_release(
     repository_name: GITHUB_REPO,
-    api_bearer: ENV["GITHUB_TOKEN"],
-    name: GITHUB_RELEASE,
     tag_name: GITHUB_RELEASE,
     commitish: git_branch,
-    is_prerelease: ENVIRONMENT == "staging"
+    is_prerelease: is_prerelease
   )
 end
 
@@ -90,7 +94,7 @@ lane :build do
     puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.")
   else
     puts("Release #{GITHUB_RELEASE} does not exist. Create new release as well as new native build.")
-    build_ios
+    # build_ios
     # build_android
     case ENVIRONMENT
     when "staging"