diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 798e328f73fa..d1724e070d72 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -71,7 +71,7 @@ platform :android do
 
   desc "Generate a production HybridApp AAB"
     lane :build_hybrid do
-      ENV["ENVFILE"]="Mobile-Expensify/.env.production.hybridapp"
+      ENV["ENVFILE"]="Mobile-Expensify/.env.production.hybridapp.android"
       gradle(
         project_dir: 'Mobile-Expensify/Android',
         task: "bundleRelease",
@@ -88,7 +88,7 @@ platform :android do
 
   desc "Generate AdHoc HybridApp apk"
     lane :build_adhoc_hybrid do
-      ENV["ENVFILE"]="Mobile-Expensify/.env.adhoc.hybridapp"
+      ENV["ENVFILE"]="Mobile-Expensify/.env.adhoc.hybridapp.android"
       gradle(
         project_dir: 'Mobile-Expensify/Android',
         task: 'assembleAdhoc',
@@ -116,7 +116,7 @@ platform :android do
 
   desc "Generate a new local HybridApp APK"
     lane :build_local_hybrid do
-      ENV["ENVFILE"]=".env.production"
+      ENV["ENVFILE"]="Mobile-Expensify/.env.production.hybridapp.android"
       gradle(
         project_dir: 'Mobile-Expensify/Android',
         task: 'assemble',
@@ -372,7 +372,7 @@ platform :ios do
 
   desc "Build an iOS HybridApp production build"
     lane :build_hybrid do
-      ENV["ENVFILE"]="Mobile-Expensify/.env.production.hybridapp"
+      ENV["ENVFILE"]="Mobile-Expensify/.env.production.hybridapp.ios"
 
       setupIOSSigningCertificate()
 
@@ -408,7 +408,7 @@ platform :ios do
 
   desc "Build an iOS HybridApp Adhoc build"
     lane :build_adhoc_hybrid do
-      ENV["ENVFILE"]="Mobile-Expensify/.env.adhoc.hybridapp"
+      ENV["ENVFILE"]="Mobile-Expensify/.env.adhoc.hybridapp.ios"
 
       setupIOSSigningCertificate()
 
@@ -454,7 +454,7 @@ platform :ios do
 
   desc "Build an unsigned iOS HybridApp production build"
     lane :build_unsigned_hybrid do
-      ENV["ENVFILE"]="./Mobile-Expensify/.env.production.hybridapp"
+      ENV["ENVFILE"]="./Mobile-Expensify/.env.production.hybridapp.ios"
       build_app(
           workspace: "./Mobile-Expensify/iOS/Expensify.xcworkspace",
           scheme: "Expensify"