diff --git a/.github/workflows/flutter_android_build.yml b/.github/workflows/flutter_android_build.yml
index 5f6928ff..7e55a72f 100644
--- a/.github/workflows/flutter_android_build.yml
+++ b/.github/workflows/flutter_android_build.yml
@@ -11,7 +11,11 @@ name: Flutter Android Build
 defaults:
   run:
     working-directory: das_client
-    
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 on:
   push:
     paths:
diff --git a/.github/workflows/flutter_browserstack_android.yml b/.github/workflows/flutter_browserstack_android.yml
index 8323c1b4..16475da0 100644
--- a/.github/workflows/flutter_browserstack_android.yml
+++ b/.github/workflows/flutter_browserstack_android.yml
@@ -11,7 +11,11 @@ name: Flutter Browserstack Android Build
 defaults:
   run:
     working-directory: das_client
-    
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 on:
   push:
     paths:
diff --git a/.github/workflows/flutter_browserstack_ios.yml b/.github/workflows/flutter_browserstack_ios.yml
index 47d9760f..788eda7a 100644
--- a/.github/workflows/flutter_browserstack_ios.yml
+++ b/.github/workflows/flutter_browserstack_ios.yml
@@ -11,7 +11,11 @@ name: Flutter Browserstack iOS Build
 defaults:
   run:
     working-directory: das_client
-    
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 on:
   push:
     paths:
diff --git a/.github/workflows/flutter_ios_build.yml b/.github/workflows/flutter_ios_build.yml
index 09c5d7fa..3aefa71b 100644
--- a/.github/workflows/flutter_ios_build.yml
+++ b/.github/workflows/flutter_ios_build.yml
@@ -11,7 +11,11 @@ name: Flutter iOS Build
 defaults:
   run:
     working-directory: das_client
-    
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 on:
   push:
     paths:
diff --git a/das_client/android/app/build.gradle b/das_client/android/app/build.gradle
index faea64db..5ca8249f 100644
--- a/das_client/android/app/build.gradle
+++ b/das_client/android/app/build.gradle
@@ -64,6 +64,7 @@ android {
         }
         inte {
             dimension 'env'
+            applicationIdSuffix '.inte'
             manifestPlaceholders += [
                     'appAuthRedirectScheme': 'ch.sbb.das'
             ]