diff --git a/java/com.sap.sailing.domain.common/AndroidManifest.xml b/java/com.sap.sailing.domain.common/AndroidManifest.xml
index 0e90833060d..ca4fa380b88 100644
--- a/java/com.sap.sailing.domain.common/AndroidManifest.xml
+++ b/java/com.sap.sailing.domain.common/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sailing.domain.common">
-
+
diff --git a/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml b/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml
index 0e90833060d..3a24a51cd27 100644
--- a/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml
+++ b/java/com.sap.sailing.domain.shared.android/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sailing.domain.shared.android">
-
+
diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml b/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml
index 0e90833060d..05ae7bfd5de 100644
--- a/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml
+++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sailing.server.gateway.serialization.shared.android">
-
+
diff --git a/java/com.sap.sse.common/AndroidManifest.xml b/java/com.sap.sse.common/AndroidManifest.xml
index 0e90833060d..257ebc9ab6d 100644
--- a/java/com.sap.sse.common/AndroidManifest.xml
+++ b/java/com.sap.sse.common/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sse.common">
-
+
diff --git a/java/com.sap.sse.datamining.annotations/AndroidManifest.xml b/java/com.sap.sse.datamining.annotations/AndroidManifest.xml
index df3874bb31e..241a9f76ebf 100644
--- a/java/com.sap.sse.datamining.annotations/AndroidManifest.xml
+++ b/java/com.sap.sse.datamining.annotations/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sse.datamining.annotations">
-
+
diff --git a/java/com.sap.sse.security.common/AndroidManifest.xml b/java/com.sap.sse.security.common/AndroidManifest.xml
index ece9aa1dac5..632ceb7f9d2 100644
--- a/java/com.sap.sse.security.common/AndroidManifest.xml
+++ b/java/com.sap.sse.security.common/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sse.security.common">
-
+
diff --git a/java/com.sap.sse.shared.android/AndroidManifest.xml b/java/com.sap.sse.shared.android/AndroidManifest.xml
index 6a4f36a7663..619ade09342 100644
--- a/java/com.sap.sse.shared.android/AndroidManifest.xml
+++ b/java/com.sap.sse.shared.android/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="com.sap.sse.shared.android">
-
+
diff --git a/java/org.json.simple/AndroidManifest.xml b/java/org.json.simple/AndroidManifest.xml
index 0e90833060d..28ed2b1433f 100644
--- a/java/org.json.simple/AndroidManifest.xml
+++ b/java/org.json.simple/AndroidManifest.xml
@@ -1,8 +1,6 @@
+ package="org.json.simple">
-
+
diff --git a/mobile/com.sap.sailing.android.shared/AndroidManifest.xml b/mobile/com.sap.sailing.android.shared/AndroidManifest.xml
index 1c69318461d..e7a4c55f7fb 100644
--- a/mobile/com.sap.sailing.android.shared/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.android.shared/AndroidManifest.xml
@@ -1,11 +1,7 @@
+ package="com.sap.sailing.android.shared">
-
+
diff --git a/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml b/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
index 8d92daee5b3..6a1e5146fa5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
@@ -4,9 +4,7 @@
android:versionCode="13"
android:versionName="1.11">
-
+
-
-
+
diff --git a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
index 0ab09d05df2..bb1f0eca4df 100644
--- a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
@@ -1,12 +1,10 @@
+ package="com.sap.sailing.racecommittee.app"
+ android:versionCode="19"
+ android:versionName="1.11">
-
+