diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3ab08b0c..2091bc1b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,15 +6,33 @@ workflows:
     jobs:
       - check-frontend
       - frontend-android-build:
+          name: frontend-android-build-bayern-floss
           buildConfig: "bayern-floss"
+          flutterFlavor: "BayernFloss"
           requires:
             - check-frontend
       - frontend-android-build:
+          name: frontend-android-build-bayern
           buildConfig: "bayern"
+          flutterFlavor: "Bayern"
           requires:
             - check-frontend
       - frontend-ios-build:
+          name: frontend-ios-build-bayern
           buildConfig: "bayern"
+          flutterFlavor: "Bayern"
+          requires:
+            - check-frontend
+      - frontend-android-build:
+          name: frontend-android-build-nuernberg
+          buildConfig: "nuernberg"
+          flutterFlavor: "Nuernberg"
+          requires:
+            - check-frontend
+      - frontend-ios-build:
+          name: frontend-ios-build-nuernberg
+          buildConfig: "nuernberg"
+          flutterFlavor: "Nuernberg"
           requires:
             - check-frontend
       - backend-build
@@ -175,8 +193,10 @@ jobs:
       buildConfig:
         description: "Name of the build config to use"
         type: string
+      flutterFlavor:
+        description: "Flutter Flavor to use"
+        type: string
     environment:
-      BUILD_CONFIG_NAME: << parameters.buildConfig >>
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m" -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2'
     resource_class: large
     working_directory: ~/project/frontend
@@ -202,11 +222,11 @@ jobs:
       - run:
           name: Build Runner
           command: |
-            fvm --verbose flutter pub run build_runner build --define "df_build_config=name=$BUILD_CONFIG_NAME"
+            fvm --verbose flutter pub run build_runner build --define "df_build_config=name=<< parameters.buildConfig >>"
       - run:
           name: Build
           command: |
-            fvm --verbose flutter build apk --dart-define=environment=production --release -t lib/main.dart
+            fvm --verbose flutter build apk --dart-define=environment=production --flavor << parameters.flutterFlavor >> --release -t lib/main.dart
       - store_artifacts:
           path: build/app/outputs/flutter-apk/
 
@@ -217,9 +237,10 @@ jobs:
       buildConfig:
         description: "Name of the build config to use"
         type: string
+      flutterFlavor:
+        description: "Flutter Flavor to use"
+        type: string
     working_directory: ~/project/frontend
-    environment:
-      BUILD_CONFIG_NAME: << parameters.buildConfig >>
     steps:
       - checkout:
           path: ~/project
@@ -248,12 +269,12 @@ jobs:
       - run:
           name: Build Runner
           command: |
-            fvm --verbose flutter pub run build_runner build --define "df_build_config=name=$BUILD_CONFIG_NAME"
+            fvm --verbose flutter pub run build_runner build --define "df_build_config=name=<< parameters.buildConfig >>"
       - run:
           name: Build
           command: |
-            app-toolbelt v0 build-config write-xcconfig "$BUILD_CONFIG_NAME" ios --directory ios/
-            fvm --verbose flutter build ios --dart-define=environment=production --no-codesign --release -t lib/main.dart
+            app-toolbelt v0 build-config write-xcconfig "<< parameters.buildConfig >>" ios --directory ios/
+            fvm --verbose flutter build ios --dart-define=environment=production --flavor << parameters.flutterFlavor >> --no-codesign --release -t lib/main.dart
 
   backend-build:
     environment:
diff --git a/.idea/runConfigurations/Test_Backend.xml b/.idea/runConfigurations/Build_backend.xml
similarity index 84%
rename from .idea/runConfigurations/Test_Backend.xml
rename to .idea/runConfigurations/Build_backend.xml
index beec83579..e478541db 100644
--- a/.idea/runConfigurations/Test_Backend.xml
+++ b/.idea/runConfigurations/Build_backend.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Backend" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Build backend" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/backend" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="test" />
+          <option value="build" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.idea/runConfigurations/Create_Admin_Account.xml b/.idea/runConfigurations/Create_project_admin__env_local_buildConfig_bayern_.xml
similarity index 86%
rename from .idea/runConfigurations/Create_Admin_Account.xml
rename to .idea/runConfigurations/Create_project_admin__env_local_buildConfig_bayern_.xml
index f32b28f62..d99221a1a 100644
--- a/.idea/runConfigurations/Create_Admin_Account.xml
+++ b/.idea/runConfigurations/Create_project_admin__env_local_buildConfig_bayern_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Create Admin Account" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
+  <configuration default="false" name="Create project admin (env:local+buildConfig:bayern)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
diff --git a/.idea/runConfigurations/Run_Backend.xml b/.idea/runConfigurations/Create_region_manager__env_local_buildConfig_bayern_.xml
similarity index 74%
rename from .idea/runConfigurations/Run_Backend.xml
rename to .idea/runConfigurations/Create_region_manager__env_local_buildConfig_bayern_.xml
index f1fa326b1..e8a67b569 100644
--- a/.idea/runConfigurations/Run_Backend.xml
+++ b/.idea/runConfigurations/Create_region_manager__env_local_buildConfig_bayern_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Backend" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Create region manager (env:local+buildConfig:bayern)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
@@ -16,7 +16,7 @@
       <option name="taskNames">
         <list>
           <option value="run" />
-          <option value="--args=&quot;execute&quot;" />
+          <option value="--args=&quot;create-admin bayern.ehrenamtskarte.app REGION_MANAGER admin+bayernregion1@example.com Administrator! 1&quot;" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/GraphQL_Schema_Export.xml b/.idea/runConfigurations/Export_GraphQL.xml
similarity index 87%
rename from .idea/runConfigurations/GraphQL_Schema_Export.xml
rename to .idea/runConfigurations/Export_GraphQL.xml
index 9a2fe44cc..56247f983 100644
--- a/.idea/runConfigurations/GraphQL_Schema_Export.xml
+++ b/.idea/runConfigurations/Export_GraphQL.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GraphQL Schema Export" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
+  <configuration default="false" name="Export GraphQL" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
diff --git a/.idea/runConfigurations/Start_Administration__Local_.xml b/.idea/runConfigurations/Format_administration.xml
similarity index 69%
rename from .idea/runConfigurations/Start_Administration__Local_.xml
rename to .idea/runConfigurations/Format_administration.xml
index fd2eee003..a7b0eab27 100644
--- a/.idea/runConfigurations/Start_Administration__Local_.xml
+++ b/.idea/runConfigurations/Format_administration.xml
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start Administration (Local)" type="js.build_tools.npm">
+  <configuration default="false" name="Format administration" type="js.build_tools.npm">
     <package-json value="$PROJECT_DIR$/administration/package.json" />
     <command value="run" />
     <scripts>
-      <script value="start" />
+      <script value="format" />
     </scripts>
     <node-interpreter value="project" />
     <envs />
diff --git a/.idea/runConfigurations/Flutter_Format.xml b/.idea/runConfigurations/Format_frontend.xml
similarity index 87%
rename from .idea/runConfigurations/Flutter_Format.xml
rename to .idea/runConfigurations/Format_frontend.xml
index 1bf657fb7..edf0b2fcf 100644
--- a/.idea/runConfigurations/Flutter_Format.xml
+++ b/.idea/runConfigurations/Format_frontend.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Flutter Format" type="ShConfigurationType">
+  <configuration default="false" name="Format frontend" type="ShConfigurationType" folderName="Frontend">
     <option name="SCRIPT_TEXT" value="fvm flutter format -l 120 ." />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
diff --git a/.idea/runConfigurations/Import.xml b/.idea/runConfigurations/Import_data.xml
similarity index 88%
rename from .idea/runConfigurations/Import.xml
rename to .idea/runConfigurations/Import_data.xml
index 3561c368c..2ce07f1b1 100644
--- a/.idea/runConfigurations/Import.xml
+++ b/.idea/runConfigurations/Import_data.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Import" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
+  <configuration default="false" name="Import data" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
diff --git a/.idea/runConfigurations/Run_Flutter__local_.xml b/.idea/runConfigurations/Run_Flutter__local_.xml
deleted file mode 100644
index a219040b3..000000000
--- a/.idea/runConfigurations/Run_Flutter__local_.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Flutter (local)" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--dart-define=environment=local" />
-    <option name="attachArgs" value="--dart-define=environment=local" />
-    <option name="filePath" value="$PROJECT_DIR$/frontend/lib/main.dart" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run__env_local_buildConfig_bayern_.xml b/.idea/runConfigurations/Run__env_local_buildConfig_bayern_.xml
new file mode 100644
index 000000000..8ced966da
--- /dev/null
+++ b/.idea/runConfigurations/Run__env_local_buildConfig_bayern_.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run (env:local+buildConfig:bayern)" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="additionalArgs" value="--dart-define=environment=local --flavor Bayern" />
+    <option name="attachArgs" value="--dart-define=environment=local --flavor Bayern" />
+    <option name="filePath" value="$PROJECT_DIR$/frontend/lib/main.dart" />
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Select &quot;bayern&quot;" run_configuration_type="ShConfigurationType" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_Flutter__showcase_bayern_.xml b/.idea/runConfigurations/Run__env_showcase_buildConfig_bayern_.xml
similarity index 66%
rename from .idea/runConfigurations/Run_Flutter__showcase_bayern_.xml
rename to .idea/runConfigurations/Run__env_showcase_buildConfig_bayern_.xml
index 5b41c14f7..1d039aeeb 100644
--- a/.idea/runConfigurations/Run_Flutter__showcase_bayern_.xml
+++ b/.idea/runConfigurations/Run__env_showcase_buildConfig_bayern_.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Flutter (showcase+bayern)" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--dart-define=environment=showcase --flavor Bayern -PBUILD_CONFIG_NAME=bayern" />
-    <option name="attachArgs" value="--dart-define=environment=showcase --flavor Bayern -PBUILD_CONFIG_NAME=bayern" />
+  <configuration default="false" name="Run (env:showcase+buildConfig:bayern)" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="additionalArgs" value="--dart-define=environment=showcase --flavor Bayern" />
+    <option name="attachArgs" value="--dart-define=environment=showcase --flavor Bayern" />
     <option name="filePath" value="$PROJECT_DIR$/frontend/lib/main.dart" />
     <method v="2">
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Select &quot;bayern&quot;" run_configuration_type="ShConfigurationType" />
diff --git a/.idea/runConfigurations/Run__env_showcase_buildConfig_bayern_floss_.xml b/.idea/runConfigurations/Run__env_showcase_buildConfig_bayern_floss_.xml
new file mode 100644
index 000000000..50ccd36e5
--- /dev/null
+++ b/.idea/runConfigurations/Run__env_showcase_buildConfig_bayern_floss_.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run (env:showcase+buildConfig:bayern-floss)" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="additionalArgs" value="--dart-define=environment=showcase --flavor BayernFloss" />
+    <option name="attachArgs" value="--dart-define=environment=showcase --flavor BayernFloss" />
+    <option name="filePath" value="$PROJECT_DIR$/frontend/lib/main.dart" />
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Select &quot;bayern-floss&quot;" run_configuration_type="ShConfigurationType" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_Flutter__showcase_nuernberg_.xml b/.idea/runConfigurations/Run__env_showcase_buildConfig_nuernberg_.xml
similarity index 64%
rename from .idea/runConfigurations/Run_Flutter__showcase_nuernberg_.xml
rename to .idea/runConfigurations/Run__env_showcase_buildConfig_nuernberg_.xml
index 485854bab..c7c73d26b 100644
--- a/.idea/runConfigurations/Run_Flutter__showcase_nuernberg_.xml
+++ b/.idea/runConfigurations/Run__env_showcase_buildConfig_nuernberg_.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Flutter (showcase+nuernberg)" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--dart-define=environment=showcase --flavor Nuernberg -PBUILD_CONFIG_NAME=nuernberg" />
-    <option name="attachArgs" value="--dart-define=environment=showcase --flavor Nuernberg -PBUILD_CONFIG_NAME=nuernberg" />
+  <configuration default="false" name="Run (env:showcase+buildConfig:nuernberg)" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="additionalArgs" value="--dart-define=environment=showcase --flavor Nuernberg" />
+    <option name="attachArgs" value="--dart-define=environment=showcase --flavor Nuernberg" />
     <option name="filePath" value="$PROJECT_DIR$/frontend/lib/main.dart" />
     <method v="2">
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Select &quot;nuernberg&quot;" run_configuration_type="ShConfigurationType" />
diff --git a/.idea/runConfigurations/Build_Backend.xml b/.idea/runConfigurations/Run_backend__env_local_buildConfig_all_.xml
similarity index 70%
rename from .idea/runConfigurations/Build_Backend.xml
rename to .idea/runConfigurations/Run_backend__env_local_buildConfig_all_.xml
index 0e8c1fd21..ef02c43cf 100644
--- a/.idea/runConfigurations/Build_Backend.xml
+++ b/.idea/runConfigurations/Run_backend__env_local_buildConfig_all_.xml
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build Backend" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Run backend (env:local+buildConfig:all)" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="env">
         <map>
-          <entry key="JWT_SECRET" value="&quot;Hello world!&quot;" />
+          <entry key="JWT_SECRET" value="HelloWorld" />
         </map>
       </option>
       <option name="executionName" />
@@ -15,10 +15,12 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="build" />
+          <option value="run" />
+          <option value="--args" />
+          <option value="&quot;execute&quot;" />
         </list>
       </option>
-      <option name="vmOptions" value="" />
+      <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
diff --git a/.idea/runConfigurations/Select__bayern_.xml b/.idea/runConfigurations/Set_build_config_bayern.xml
similarity index 86%
rename from .idea/runConfigurations/Select__bayern_.xml
rename to .idea/runConfigurations/Set_build_config_bayern.xml
index d38a43341..85211e877 100644
--- a/.idea/runConfigurations/Select__bayern_.xml
+++ b/.idea/runConfigurations/Set_build_config_bayern.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Select &quot;bayern&quot;" type="ShConfigurationType">
+  <configuration default="false" name="Set build config bayern" type="ShConfigurationType" folderName="Frontend">
     <option name="SCRIPT_TEXT" value="fvm flutter pub run build_runner build --define &quot;df_build_config=name=bayern&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
@@ -14,4 +14,4 @@
     <envs />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Select__bayern_floss_.xml b/.idea/runConfigurations/Set_build_config_bayern_floss.xml
similarity index 87%
rename from .idea/runConfigurations/Select__bayern_floss_.xml
rename to .idea/runConfigurations/Set_build_config_bayern_floss.xml
index 3f4d0e7db..0c3282df5 100644
--- a/.idea/runConfigurations/Select__bayern_floss_.xml
+++ b/.idea/runConfigurations/Set_build_config_bayern_floss.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Select &quot;bayern-floss&quot;" type="ShConfigurationType">
+  <configuration default="false" name="Set build config bayern-floss" type="ShConfigurationType" folderName="Frontend">
     <option name="SCRIPT_TEXT" value="fvm flutter pub run build_runner build --define &quot;df_build_config=name=bayern-floss&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
diff --git a/.idea/runConfigurations/Select__nuernberg_.xml b/.idea/runConfigurations/Set_build_config_nuernberg.xml
similarity index 86%
rename from .idea/runConfigurations/Select__nuernberg_.xml
rename to .idea/runConfigurations/Set_build_config_nuernberg.xml
index 902d55f21..f634d51a9 100644
--- a/.idea/runConfigurations/Select__nuernberg_.xml
+++ b/.idea/runConfigurations/Set_build_config_nuernberg.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Select &quot;nuernberg&quot;" type="ShConfigurationType">
+  <configuration default="false" name="Set build config nuernberg" type="ShConfigurationType" folderName="Frontend">
     <option name="SCRIPT_TEXT" value="fvm flutter pub run build_runner build --define &quot;df_build_config=name=nuernberg&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
@@ -14,4 +14,4 @@
     <envs />
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_administration__env_local_buildConfig_all_.xml b/.idea/runConfigurations/Start_administration__env_local_buildConfig_all_.xml
new file mode 100644
index 000000000..f44478d52
--- /dev/null
+++ b/.idea/runConfigurations/Start_administration__env_local_buildConfig_all_.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Start administration (env:local+buildConfig:all)" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/administration/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Generate Administration GraphQL" run_configuration_type="js.build_tools.npm" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Generate Administration Protobuf" run_configuration_type="js.build_tools.npm" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_administration.xml b/.idea/runConfigurations/Test_administration.xml
new file mode 100644
index 000000000..5c9011bb8
--- /dev/null
+++ b/.idea/runConfigurations/Test_administration.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test administration" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/administration/package.json" />
+    <command value="test" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/frontend/android/.idea/kotlinc.xml b/frontend/android/.idea/kotlinc.xml
new file mode 100644
index 000000000..b1077fbd0
--- /dev/null
+++ b/frontend/android/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/frontend/android/.idea/misc.xml b/frontend/android/.idea/misc.xml
index 4bc4fc6e7..95e51a2dc 100644
--- a/frontend/android/.idea/misc.xml
+++ b/frontend/android/.idea/misc.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$USER_HOME$/.pub-cache/git/flutter-maplibre-gl-a133625e088220d7e1f29f3f33f022b8bdad03f4/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.3.6+1/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-6.0.0/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/geolocator_android-4.1.0/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_info_plus-1.4.3+1/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path_provider_android-2.0.20/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/qr_code_scanner-1.0.1/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shared_preferences_android-2.0.12/android" />
+    <file type="web" url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/url_launcher_android-6.0.17/android" />
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/frontend/android/.idea/runConfigurations.xml b/frontend/android/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea53..000000000
--- a/frontend/android/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/frontend/android/app/build.gradle b/frontend/android/app/build.gradle
index 05577e97e..f2f818646 100644
--- a/frontend/android/app/build.gradle
+++ b/frontend/android/app/build.gradle
@@ -1,3 +1,6 @@
+import kotlin.Pair
+import com.android.build.api.dsl.ApplicationProductFlavor
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -25,6 +28,40 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply from: "buildConfigs.gradle"
+apply plugin: 'idea'
+
+idea {
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+ext.setupApplication = { ApplicationProductFlavor flavor, buildConfigName ->
+    var buildConfig = createBuildConfig(buildConfigName)
+    flavor.applicationId buildConfig.applicationId
+    flavor.manifestPlaceholders = [*:determineIcon(buildConfig)]
+
+    setupResourceValues(buildConfigName, {
+        String type, String name, String value -> flavor.resValue(type, name, value)
+    })
+}
+
+ext.setupVariant = { variant, buildConfigName ->
+    var buildConfig = createBuildConfig(buildConfigName)
+    if (buildConfig.featureFlags.excludeX86) {
+        // Verify this using:
+        // unzip -l frontend/build/app/outputs/apk/Bayern/debug/app-Bayern-debug.apk | grep x86
+        // unzip -l frontend/build/app/outputs/apk/Nuernberg/debug/app-Nuernberg-debug.apk | grep x86
+        variant.packaging.jniLibs.excludes.add('**/lib/x86**')
+    }
+    if (buildConfig.excludeLocationPlayServices) {
+        // Verify this by opening the APKs in Android Studio/IntelliJ. Then select all the .dex files.
+        // Then see if there are files located at com.android.gms (Cursive files are not present, only referenced)
+        variant.compileConfiguration.exclude group: 'com.google.android.gms', module: 'play-services-location'
+        variant.runtimeConfiguration.exclude group: 'com.google.android.gms', module: 'play-services-location'
+    }
+}
 
 android {
     compileSdkVersion 33
@@ -33,28 +70,26 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    flavorDimensions "dummy"
+    productFlavors {
+        Automatic { flavor ->
+            flavor.getIsDefault().set(true)
+            // Automatically decides which build config to use based on project properties, dart defines or environment variables.
+        }
+        Bayern { flavor ->
+            // Forces the bayern build config
+            setupApplication(flavor, "bayern")
+        }
+        Nuernberg { flavor ->
+            setupApplication(flavor, "nuernberg")
+        }
+        BayernFloss { flavor ->
+            setupApplication(flavor, "bayern-floss")
+        }
     }
 
-    def buildConfigName = determineBuildConfigName()
-    def buildConfig = createBuildConfig(buildConfigName)
-
-    defaultConfig {
-
-        setupResourceValues(buildConfigName, {
-            String type, String name, String value -> resValue(type, name, value)
-        })
-
-        applicationId buildConfig.applicationId
-
-        manifestPlaceholders = [*:determineIcon(buildConfig)]
-
-        minSdkVersion 20
-        targetSdkVersion 30
-        multiDexEnabled true
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+    lintOptions {
+        disable 'InvalidPackage'
     }
 
     signingConfigs {
@@ -76,7 +111,7 @@ android {
                 signingConfig signingConfigs.debug
             }
 
-            
+
             // We need to configure proguard here because of some bug which occurred when adding flutter dependencies,
             // probably involving image-picker.
             // The workaround is from https://github.com/flutter/flutter/issues/58479.
@@ -87,26 +122,30 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
-        // If we create a FLOSS build, then we want to exclude GMS
-        if (buildConfig.excludeLocationPlayServices) {
-            variant.getCompileConfiguration().exclude group: 'com.google.android.gms', module: 'play-services-location'
-            variant.getRuntimeConfiguration().exclude group: 'com.google.android.gms', module: 'play-services-location'
-        }
+    defaultConfig {
+        minSdkVersion 20
+        targetSdkVersion 33
+        multiDexEnabled true
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
     }
-    
-    packagingOptions {
-        
-        // Exclude x86 because the app size in F-Droid is limited to 30MB
-        if (buildConfig.featureFlags.excludeX86) {
-            exclude 'lib/x86**'
-        }
+
+    androidComponents {
+        onVariants(selector().withFlavor(new Pair("dummy", "Bayern")), { variant ->
+            setupVariant(variant, "bayern")
+        })
+        onVariants(selector().withFlavor(new Pair("dummy", "Nuernberg")), { variant ->
+            setupVariant(variant, "nuernberg")
+        })
+        onVariants(selector().withFlavor(new Pair("dummy", "BayernFloss")), { variant ->
+            setupVariant(variant, "bayern-floss")
+        })
     }
 }
 
 flutter {
     source '../..'
-    target 'lib/main_prod.dart'
+    target 'lib/main.dart'
 }
 
 dependencies {
diff --git a/frontend/android/app/buildConfigs.gradle b/frontend/android/app/buildConfigs.gradle
index df9160831..6a3e92caa 100644
--- a/frontend/android/app/buildConfigs.gradle
+++ b/frontend/android/app/buildConfigs.gradle
@@ -7,9 +7,15 @@ static def isWindows() {
     System.properties['os.name'].toLowerCase().contains('windows')
 }
 
+ext.commandCache = new HashMap<>();
+
 def execCommand(command) {
     def cmdLine = isWindows() ? ["cmd", "/c", command] : command
-    logger.quiet("Build Config Command: $command")
+    
+    if (command in ext.commandCache) {
+        logger.quiet("Using cached command output")
+        return ext.commandCache[command]
+    }
 
     def process = cmdLine.execute(null, project.rootDir)
     def (out, err) = new StringWriter().with {
@@ -19,13 +25,12 @@ def execCommand(command) {
         }
     }
 
-    logger.quiet("Build Config exitValue: ${process.exitValue()}")
-
     if (process.exitValue() != 0) {
-        logger.error("Failed to get build config for $command: $err")
+        logger.error("Failed to get build config for $command (${process.exitValue()}): $err")
         return
     }
-    logger.quiet(out)
+
+    ext.commandCache[command] = out;
 
     return out
 }
@@ -49,14 +54,11 @@ def determineBuildConfigName() {
     } else if (System.getenv()["BUILD_CONFIG_NAME"]) {
         return System.getenv()['BUILD_CONFIG_NAME']
     } else {
-        logger.warn("WARNING: No build config specified. Using the build config 'bayern'!")
         return 'bayern'
     }
 }
 
 def createBuildConfig(buildConfigName) {
-    logger.quiet("Using build config $buildConfigName")
-
     def proc = execCommand("app-toolbelt v0 build-config to-json $buildConfigName android")
     def buildConfig = new JsonSlurper().parseText(proc)
     return buildConfig
@@ -83,8 +85,6 @@ def createBuildConfig(buildConfigName) {
 // }
 
 def setupResourceValues(buildConfigName, resValue) {
-    logger.quiet("Using build config $buildConfigName")
-    
     def proc = execCommand("app-toolbelt v0 build-config to-properties $buildConfigName android")
     def buildConfigProperties = new Properties()
     buildConfigProperties.load(new StringReader(proc))
diff --git a/frontend/android/app/src/main/AndroidManifest.xml b/frontend/android/app/src/main/AndroidManifest.xml
index 5a426113f..7bae8cf54 100644
--- a/frontend/android/app/src/main/AndroidManifest.xml
+++ b/frontend/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:label="@string/BUILD_CONFIG_APP_NAME"
         android:icon="@mipmap/${icon}"
         android:roundIcon="@mipmap/${icon}_round">
-        <activity
+        <activity android:exported="true"
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/frontend/android/build.gradle b/frontend/android/build.gradle
index ef1c58cfb..92e0ca394 100644
--- a/frontend/android/build.gradle
+++ b/frontend/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/frontend/android/gradle/wrapper/gradle-wrapper.jar b/frontend/android/gradle/wrapper/gradle-wrapper.jar
index 13372aef5..e708b1c02 100644
Binary files a/frontend/android/gradle/wrapper/gradle-wrapper.jar and b/frontend/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/frontend/android/gradle/wrapper/gradle-wrapper.properties b/frontend/android/gradle/wrapper/gradle-wrapper.properties
index da9702f9e..ae04661ee 100644
--- a/frontend/android/gradle/wrapper/gradle-wrapper.properties
+++ b/frontend/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/frontend/android/gradlew b/frontend/android/gradlew
index 9d82f7891..4f906e0c8 100755
--- a/frontend/android/gradlew
+++ b/frontend/android/gradlew
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,20 +22,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,28 +75,14 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -85,7 +106,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -134,27 +156,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/frontend/android/gradlew.bat b/frontend/android/gradlew.bat
index 8a0b282aa..107acd32c 100644
--- a/frontend/android/gradlew.bat
+++ b/frontend/android/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/frontend/ios/Podfile.lock b/frontend/ios/Podfile.lock
index 4bd92669e..ea4b1fe14 100644
--- a/frontend/ios/Podfile.lock
+++ b/frontend/ios/Podfile.lock
@@ -14,8 +14,6 @@ PODS:
     - MapLibreAnnotationExtension (~> 0.0.1-beta.2)
   - MapLibreAnnotationExtension (0.0.1-beta.2):
     - MapLibre (~> 5.12.0)
-  - maps_launcher (0.0.1):
-    - Flutter
   - MTBBarcodeScanner (5.0.11)
   - package_info_plus (0.4.5):
     - Flutter
@@ -38,7 +36,6 @@ DEPENDENCIES:
   - MapLibre
   - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
   - MapLibreAnnotationExtension
-  - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
@@ -64,8 +61,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/geolocator_apple/ios"
   maplibre_gl:
     :path: ".symlinks/plugins/maplibre_gl/ios"
-  maps_launcher:
-    :path: ".symlinks/plugins/maps_launcher/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_ios:
@@ -85,7 +80,6 @@ SPEC CHECKSUMS:
   MapLibre: 5aa820115d91293a4d09e681e7470f88bd34b672
   maplibre_gl: 2a0ce99f40b3a133b0e8b40b5ef37e0562165399
   MapLibreAnnotationExtension: bc7f1041206218d7d24ba0908e3145cd54b86664
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
diff --git a/frontend/lib/store_widgets/detail/detail_content.dart b/frontend/lib/store_widgets/detail/detail_content.dart
index c8c5680be..3cbaff77d 100644
--- a/frontend/lib/store_widgets/detail/detail_content.dart
+++ b/frontend/lib/store_widgets/detail/detail_content.dart
@@ -1,3 +1,5 @@
+import 'dart:io' show Platform;
+
 import 'package:ehrenamtskarte/graphql/graphql_api.graphql.dart';
 import 'package:ehrenamtskarte/home/home_page.dart';
 import 'package:ehrenamtskarte/map/map_page.dart';
@@ -6,7 +8,7 @@ import 'package:ehrenamtskarte/util/color_utils.dart';
 import 'package:ehrenamtskarte/util/sanitize_contact_details.dart';
 import 'package:flutter/material.dart';
 import 'package:maplibre_gl/mapbox_gl.dart';
-import 'package:maps_launcher/maps_launcher.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class DetailContent extends StatelessWidget {
@@ -58,7 +60,7 @@ class DetailContent extends StatelessWidget {
                   Icons.location_on,
                   addressString,
                   "Adresse",
-                  onTap: () => MapsLauncher.launchQuery(mapQueryString),
+                  onTap: () => _launchMap(mapQueryString),
                   iconColor: readableOnAccentColor,
                   iconFillColor: accentColor,
                 ),
@@ -115,6 +117,16 @@ class DetailContent extends StatelessWidget {
     );
   }
 
+  Future<void> _launchMap(String query) async {
+    if (Platform.isAndroid) {
+      await launchUrl(Uri(scheme: 'geo', host: '0,0', queryParameters: {'q': query}));
+    } else if (Platform.isIOS) {
+      await launchUrl(Uri.https('maps.apple.com', '/', {'q': query}));
+    } else {
+      await launchUrl(Uri.https('www.google.com', '/maps/search/', {'api': '1', 'query': query}));
+    }
+  }
+
   void _showOnMap(BuildContext context) {
     // Hint: The promise here is unused
     HomePageData.of(context)?.navigateToMapTab(
diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock
index bab0bdbf3..e2b16224c 100644
--- a/frontend/pubspec.lock
+++ b/frontend/pubspec.lock
@@ -645,13 +645,6 @@ packages:
       url: "https://github.com/m0nac0/flutter-maplibre-gl.git"
     source: git
     version: "0.16.0"
-  maps_launcher:
-    dependency: "direct main"
-    description:
-      name: maps_launcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
   matcher:
     dependency: transitive
     description:
@@ -1174,7 +1167,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
   url_launcher_android:
     dependency: transitive
     description:
diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml
index f7d9e4db3..16a0c626d 100644
--- a/frontend/pubspec.yaml
+++ b/frontend/pubspec.yaml
@@ -33,8 +33,7 @@ dependencies:
       ref: 0.16.0
   provider: ^6.0.3
   graphql_flutter: ^5.1.0
-  url_launcher: ^6.1.5
-  maps_launcher: ^2.0.1
+  url_launcher: ^6.1.6
   flutter_svg: ^1.1.4
   package_info_plus: ^1.4.3+1 # for about dialog
   qr_code_scanner: ^1.0.1