diff --git a/.github/actions/prepare-ios-build/action.yaml b/.github/actions/prepare-ios-build/action.yaml
index 946d4b907..e1cb57287 100644
--- a/.github/actions/prepare-ios-build/action.yaml
+++ b/.github/actions/prepare-ios-build/action.yaml
@@ -52,7 +52,7 @@ runs:
     - name: ci/install-pods-dependencies
       shell: bash
       env:
-        INTUNE_ENABLED: ${{ inputs.intune-enabled == 'true' && '1' || '0' }}
+        INTUNE_ENABLED: ${{ inputs.intune-enabled }}
       run: |
         echo "::group::install-pods-dependencies"
         echo "INTUNE_ENABLED=$INTUNE_ENABLED"
diff --git a/.github/workflows/build-ios-beta.yml b/.github/workflows/build-ios-beta.yml
index fce52cc9b..c3153d52e 100644
--- a/.github/workflows/build-ios-beta.yml
+++ b/.github/workflows/build-ios-beta.yml
@@ -11,7 +11,7 @@ on:
 env:
   NODE_VERSION: 22.14.0
   TERM: xterm
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   test:
@@ -34,7 +34,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-ios-simulator
@@ -70,7 +70,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-and-deploy-ios-beta
diff --git a/.github/workflows/build-ios-release.yml b/.github/workflows/build-ios-release.yml
index f34c4eb30..a8e6e8a44 100644
--- a/.github/workflows/build-ios-release.yml
+++ b/.github/workflows/build-ios-release.yml
@@ -11,7 +11,7 @@ on:
 env:
   NODE_VERSION: 22.14.0
   TERM: xterm
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   test:
@@ -39,7 +39,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-and-deploy-ios-release
@@ -82,7 +82,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-ios-simulator
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index b9ac0adbc..e789db0f7 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -8,7 +8,7 @@ on:
 env:
   NODE_VERSION: 22.14.0
   TERM: xterm
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   test:
@@ -41,7 +41,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-ios-pr
diff --git a/.github/workflows/e2e-detox-pr.yml b/.github/workflows/e2e-detox-pr.yml
index d1fde2f52..23a643d0a 100644
--- a/.github/workflows/e2e-detox-pr.yml
+++ b/.github/workflows/e2e-detox-pr.yml
@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   update-initial-status-ios:
@@ -59,7 +59,7 @@ jobs:
       - name: Prepare iOS Build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: Build iOS Simulator
diff --git a/.github/workflows/e2e-detox-release.yml b/.github/workflows/e2e-detox-release.yml
index 81f366422..60f87b39c 100644
--- a/.github/workflows/e2e-detox-release.yml
+++ b/.github/workflows/e2e-detox-release.yml
@@ -6,7 +6,7 @@ on:
       - release-*
 
 env:
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   update-initial-status-ios:
@@ -46,7 +46,7 @@ jobs:
       - name: Prepare iOS Build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: Build iOS Simulator
diff --git a/.github/workflows/e2e-detox-scheduled.yml b/.github/workflows/e2e-detox-scheduled.yml
index 3bb0a4e51..e90172a5b 100644
--- a/.github/workflows/e2e-detox-scheduled.yml
+++ b/.github/workflows/e2e-detox-scheduled.yml
@@ -5,7 +5,7 @@ on:
     - cron: "0 0 * * 4,5" # Wednesday and Thursday midnight
 
 env:
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   update-initial-status-ios:
@@ -45,7 +45,7 @@ jobs:
       - name: Prepare iOS Build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: Build iOS Simulator
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index ff855065a..190f0fe1c 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -15,7 +15,7 @@ env:
   RELEASE_TAG: ${{ inputs.tag || github.ref_name }}
   SNYK_VERSION: "1.1297.2"
   CYCLONEDX_VERSION: "v0.27.2"
-  INTUNE_ENABLED: 1
+  INTUNE_ENABLED: 'true'
 
 jobs:
   test:
@@ -42,7 +42,7 @@ jobs:
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
         with:
-          intune-enabled: 'true'
+          intune-enabled: ${{ env.INTUNE_ENABLED }}
           intune-ssh-private-key: ${{ secrets.MM_MOBILE_INTUNE_DEPLOY_KEY }}
 
       - name: ci/build-ios-unsigned
diff --git a/ios/Podfile b/ios/Podfile
index 85c34a400..b87010ed1 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -26,7 +26,7 @@ setup_permissions([
 ])
 
 # Conditional Intune MAM support
-intune_enabled = ENV['INTUNE_ENABLED'] == '1'
+intune_enabled = ENV['INTUNE_ENABLED'] == 'true' || ENV['INTUNE_ENABLED'] == '1'
 
 if intune_enabled
   puts "🔐 Intune MAM features enabled"