diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index d65b5426c9..779320a113 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -5,8 +5,10 @@ set -xe
 ./jfrog rt config --interactive=false --url "$ARTIFACTORY_URL" --user "$ARTIFACTORY_LOGIN" --apikey "$ARTIFACTORY_API_KEY"
 ./jfrog rt u "ugs-classic/target/UniversalGcodeSender.zip" "/UGS/$1/" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
 ./jfrog rt u "ugs-platform/application/target/ugs-platform-app-*.zip" "/UGS/$1/ugs-platform-app.zip" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
-./jfrog rt u "ugs-platform/application/target/ugs-platform-app-*.tar.gz" "/UGS/$1/ugs-platform-app.tar.gz" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
-./jfrog rt u "ugs-platform/application/target/ugs-platform-app-*.dmg" "/UGS/$1/ugs-platform-app.dmg" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
+./jfrog rt u "ugs-platform/application/target/win-ugs-platform-app-*.zip" "/UGS/$1/ugs-platform-app-win.zip" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
+./jfrog rt u "ugs-platform/application/target/pi-ugs-platform-app*.tar.gz" "/UGS/$1/ugs-platform-app-pi.tar.gz" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
+./jfrog rt u "ugs-platform/application/target/linux-ugs-platform-app*.tar.gz" "/UGS/$1/ugs-platform-app-linux.tar.gz" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
+./jfrog rt u "ugs-platform/application/target/ios-ugs-platform-app-*.dmg" "/UGS/$1/ugs-platform-app-ios.dmg" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER -flat=true
 ./jfrog rt u "ugs-platform/application/target/site/netbeans_site/" "/UGS/$1/update-center/" --build-name=$ARTIFACTORY_NAME --build-number=$TRAVIS_BUILD_NUMBER
 ./jfrog rt bce $ARTIFACTORY_NAME $TRAVIS_BUILD_NUMBER
 ./jfrog rt bp $ARTIFACTORY_NAME $TRAVIS_BUILD_NUMBER
diff --git a/ugs-platform/application/pom.xml b/ugs-platform/application/pom.xml
index dfc2639c87..59aac4f6a3 100644
--- a/ugs-platform/application/pom.xml
+++ b/ugs-platform/application/pom.xml
@@ -295,7 +295,7 @@
                                         <!-- Create Archive -->
                                         <exec dir="${project.build.directory}" executable="zip" failonerror="true">
                                             <arg value="-r"/>
-                                            <arg value="${project.artifactId}-${project.version}-win.zip"/>
+                                            <arg value="win-${project.artifactId}-${project.version}.zip"/>
                                             <arg value="${brandingToken}-win"/>
                                         </exec>
 
@@ -419,7 +419,7 @@
                                   <arg value="${ugs.appbundle.name}"/>
                                   <arg value="-r"/>
                                   <arg value="-o"/>
-                                  <arg value="${project.artifactId}-${project.version}.dmg"/>
+                                  <arg value="ios-${project.artifactId}-${project.version}.dmg"/>
                                   <arg value="${project.build.directory}/${ugs.app.title}"/>
                               </exec>
                           </target>
@@ -493,7 +493,7 @@
                      <exec dir="${project.build.directory}" executable="tar" failonerror="true">
                        <env key="GZIP" value="-9"/>
                        <arg value="-czvf"/>
-                       <arg value="${project.artifactId}-${project.version}-pi.tar.gz"/>
+                       <arg value="pi-${project.artifactId}-${project.version}.tar.gz"/>
                        <arg value="-C"/>
                        <arg value="${project.build.directory}"/>
                        <arg value="${brandingToken}-pi"/>
@@ -569,7 +569,7 @@
                                         <exec dir="${project.build.directory}" executable="tar" failonerror="true">
                                             <env key="GZIP" value="-9"/>
                                             <arg value="-czvf"/>
-                                            <arg value="${project.artifactId}-${project.version}-linux.tar.gz"/>
+                                            <arg value="linux-${project.artifactId}-${project.version}.tar.gz"/>
                                             <arg value="-C"/>
                                             <arg value="${project.build.directory}"/>
                                             <arg value="${brandingToken}-linux"/>