diff --git a/.github/workflows/add_identifiers.yml b/.github/workflows/add_identifiers.yml
index 6661ba30c9..a252ec5d5e 100644
--- a/.github/workflows/add_identifiers.yml
+++ b/.github/workflows/add_identifiers.yml
@@ -42,6 +42,7 @@ jobs:
         run: bundle exec fastlane identifiers
         env:
           TEAMID: ${{ secrets.TEAMID }}
+          TEAMID_SUFFIX: ${{ vars.TEAMID_SUFFIX }}
           GH_PAT: ${{ secrets.GH_PAT }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }}
diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml
index db33b8991b..fbae702817 100644
--- a/.github/workflows/build_loop.yml
+++ b/.github/workflows/build_loop.yml
@@ -235,6 +235,7 @@ jobs:
         run: bundle exec fastlane build_loop
         env:
           TEAMID: ${{ secrets.TEAMID }}
+          TEAMID_SUFFIX: ${{ vars.TEAMID_SUFFIX }}
           GH_PAT: ${{ secrets.GH_PAT }}
           FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }}
           FASTLANE_ISSUER_ID: ${{ secrets.FASTLANE_ISSUER_ID }}
@@ -246,6 +247,7 @@ jobs:
         run: bundle exec fastlane release
         env:
           TEAMID: ${{ secrets.TEAMID }}
+          TEAMID_SUFFIX: ${{ vars.TEAMID_SUFFIX }}
           GH_PAT: ${{ secrets.GH_PAT }}
           FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }}
           FASTLANE_ISSUER_ID: ${{ secrets.FASTLANE_ISSUER_ID }}
diff --git a/.github/workflows/create_certs.yml b/.github/workflows/create_certs.yml
index d20001b2ca..2bca6648a1 100644
--- a/.github/workflows/create_certs.yml
+++ b/.github/workflows/create_certs.yml
@@ -5,6 +5,7 @@ on: [workflow_call, workflow_dispatch]
 
 env:
   TEAMID: ${{ secrets.TEAMID }}
+  TEAMID_SUFFIX: ${{ vars.TEAMID_SUFFIX }}
   GH_PAT: ${{ secrets.GH_PAT }}
   GH_TOKEN: ${{ secrets.GH_PAT }}
   MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
diff --git a/.github/workflows/validate_secrets.yml b/.github/workflows/validate_secrets.yml
index f8d97c4f48..50d1c6f3d4 100644
--- a/.github/workflows/validate_secrets.yml
+++ b/.github/workflows/validate_secrets.yml
@@ -114,6 +114,7 @@ jobs:
       FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }}
       MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
       TEAMID: ${{ secrets.TEAMID }}
+      TEAMID_SUFFIX: ${{ vars.TEAMID_SUFFIX }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -141,6 +142,17 @@ jobs:
             echo "::error::The TEAMID secret is set but invalid. Verify that it is set correctly (only uppercase letters and numbers) and try again."
           fi
 
+          # Validate TEAMID_SUFFIX
+          if [ -z "$TEAMID_SUFFIX" ]; then
+            echo "::notice::No TEAMID_SUFFIX variable is set."
+          elif [ ${#TEAMID_SUFFIX} -gt 5 ]; then
+            failed=true
+            echo "::error::The TEAMID_SUFFIX variable is set but is too long. Verify that it the length is between 1 and 5 characters and try again."
+          elif ! [[ $TEAMID_SUFFIX =~ ^[A-Z0-9]+$ ]]; then
+            failed=true
+            echo "::error::The TEAMID_SUFFIX variable is set but invalid. Verify that it is set correctly (only uppercase letters and numbers) and try again."
+          fi
+
           # Validate MATCH_PASSWORD
           if [ -z "$MATCH_PASSWORD" ]; then
             failed=true
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3e16b5bd9e..992f9fbbe9 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -12,7 +12,7 @@
 
 default_platform(:ios)
 
-TEAMID = ENV["TEAMID"]
+TEAMID = ENV["TEAMID_SUFFIX"].to_s.empty? ? "#{ENV["TEAMID"]}" : "#{ENV["TEAMID"]}-#{ENV["TEAMID_SUFFIX"]}"
 GH_PAT = ENV["GH_PAT"]
 GITHUB_WORKSPACE = ENV["GITHUB_WORKSPACE"]
 GITHUB_REPOSITORY_OWNER = ENV["GITHUB_REPOSITORY_OWNER"]
@@ -123,6 +123,7 @@ platform :ios do
       configuration: "Release",
       destination: 'generic/platform=iOS',
       buildlog_path: 'buildlog'
+      xcargs: "MAIN_APP_BUNDLE_IDENTIFIER=com.#{TEAMID}.loopkit.Loop"
     )
 
     copy_artifacts(