diff --git a/mobile/com.sap.sailing.android.tracking.app/pom.xml b/mobile/com.sap.sailing.android.tracking.app/pom.xml
index e1fdb1db80c..017d5f5a05e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/pom.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/pom.xml
@@ -119,5 +119,21 @@
           </plugins>
         </build>
       </profile>
+      
+      <profile>
+        <id>leandi-sign</id>
+        <build>
+          <plugins>
+            <plugin>
+                <groupId>com.sap.prd.codesign</groupId>
+                <artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
     </profiles>
 </project>
diff --git a/mobile/com.sap.sailing.buoy.positioning/pom.xml b/mobile/com.sap.sailing.buoy.positioning/pom.xml
index dc30af8f134..3492eae52dc 100644
--- a/mobile/com.sap.sailing.buoy.positioning/pom.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/pom.xml
@@ -112,5 +112,21 @@
           </plugins>
         </build>
       </profile>
+      
+      <profile>
+        <id>leandi-sign</id>
+        <build>
+          <plugins>
+            <plugin>
+                <groupId>com.sap.prd.codesign</groupId>
+                <artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
     </profiles>
 </project>
diff --git a/mobile/com.sap.sailing.racecommittee.app/pom.xml b/mobile/com.sap.sailing.racecommittee.app/pom.xml
index 498392948d1..8936ecdc0a9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/pom.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/pom.xml
@@ -135,5 +135,21 @@
           </plugins>
         </build>
       </profile>
+      
+      <profile>
+        <id>leandi-sign</id>
+        <build>
+          <plugins>
+            <plugin>
+                <groupId>com.sap.prd.codesign</groupId>
+                <artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
     </profiles>
 </project>
diff --git a/mobile/pom.xml b/mobile/pom.xml
index 3ef64db4da1..9da5171eee4 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -165,7 +165,7 @@
           <executions>
             <execution>
               <id>alignApk</id>
-              <phase>package</phase>
+              <phase>pre-integration-test</phase>
               <goals>
                 <goal>zipalign</goal>
               </goals>
@@ -240,6 +240,12 @@
           </nonFilteredFileExtensions>
         </configuration>
       </plugin>
+        
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+              </plugin>
         </plugins>
       </pluginManagement>
     </build>
@@ -320,7 +326,6 @@
               <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.3</version>
                 <executions>
                   <execution>
                     <id>generate-version</id>
@@ -382,6 +387,10 @@
                 <artifactId>android-maven-plugin</artifactId>
                 <configuration>
                   <release>true</release>
+                    <sdk>
+                        <path>${basedir}/android-sdk-windows</path>
+                        <platform>${platform.version}</platform>
+                    </sdk>
                 </configuration>
               </plugin>
             </plugins>
@@ -475,18 +484,19 @@
         <profile>
             <id>leandi-sign</id>
             <activation>
-                <property>
-                    <name>codesign.sap.realcodesigning</name>
+                <!-- TODO: activate on release build branch -->
+                <!-- <property>
+                    <name>app-project</name>
                     <value>true</value>
-                </property>
+                </property> -->
             </activation>
             <build>
+              <pluginManagement>
                 <plugins>
                     
                     <plugin>
                         <groupId>com.sap.prd.codesign</groupId>
-                        <artifactId>com.sap.prd.codesign.maven-jarsigner-plugin
-                        </artifactId>
+                        <artifactId>com.sap.prd.codesign.maven-jarsigner-plugin</artifactId>
                         <version>1.2</version>
                         
                         <configuration>
@@ -514,38 +524,6 @@
                         
                     </plugin>
                     
-                    <plugin>
-                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                        <artifactId>android-maven-plugin</artifactId>
-                        <version>3.6.0</version>
-                        
-                        <configuration>
-                            <sign>
-                                <debug>false</debug>
-                            </sign>
-                            <zipalign>
-                                <skip>false</skip>
-                                <verbose>true</verbose>
-                                <inputApk>${project.build.directory}/${project.artifactId}-1.apk
-                                </inputApk>
-                                <outputApk>${project.build.directory}/${project.build.finalName}.apk
-                                </outputApk>
-                            </zipalign>
-                        </configuration>
-                        
-                        <executions>
-                            <execution>
-                                <id>alignApk</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>zipalign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        
-                    </plugin>
-                    
-                    
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
@@ -558,9 +536,9 @@
                                 <configuration>
                                     <tasks>
                                         <zip
-                                            file="${project.build.directory}/${project.artifactId}-signed-aligned.zip">
+                                            file="${project.build.directory}/${project.build.finalName}.zip">
                                             <fileset dir="${project.build.directory}"
-                                            includes="${project.artifactId}-signed-aligned.apk" />
+                                            includes="${project.artifactId}.apk" />
                                         </zip>
                                     </tasks>
                                 </configuration>
@@ -587,18 +565,19 @@
                                     <artifacts>
                                         
                                         <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-signed-aligned.zip
+                                            <file>${project.build.directory}/${project.artifactId}.zip
                                             </file>
                                             <type>zip </type>
                                             <classifier>smp</classifier>
                                         </artifact>
                                         
-                                        <artifact>
+                                        <!-- TODO implement -->
+                                        <!-- <artifact>
                                             <file>${project.build.directory}/AndroidMarketMetadata.zip
                                             </file>
                                             <type>zip </type>
                                             <classifier>AndroidMetadata</classifier>
-                                        </artifact>
+                                        </artifact> -->
                                         
                                     </artifacts>
                                 </configuration>
@@ -607,8 +586,8 @@
                             
                         </executions>
                     </plugin>
-                    
                 </plugins>
+              </pluginManagement>
             </build>
         </profile>
     </profiles>