diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index 5e321105df..bf9704eee5 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -53,8 +53,8 @@ pipeline {
     }
     stage('Upload') {
       steps { script {
-        e2eUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.e2e.apk')[0].path)
-        apkUrl = cmn.uploadArtifact(findFiles(glob: "pkg/*.${cmn.getBuildType()}.apk")[0].path)
+        e2eUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*e2e.apk')[0].path)
+        apkUrl = cmn.uploadArtifact(findFiles(glob: "pkg/*${cmn.getBuildType()}.apk")[0].path)
         dmgUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.dmg')[0].path)
         appUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.AppImage')[0].path)
         /* special case for iOS Diawi links */
diff --git a/ci/common.groovy b/ci/common.groovy
index dbfb9b6900..2e98b083ea 100644
--- a/ci/common.groovy
+++ b/ci/common.groovy
@@ -115,7 +115,7 @@ def uploadArtifact(path) {
 
 def timestamp() {
   def now = new Date(currentBuild.timeInMillis)
-  return now.format('yyMMdd.HHmmss', TimeZone.getTimeZone('UTC'))
+  return now.format('yyMMdd-HHmmss', TimeZone.getTimeZone('UTC'))
 }
 
 def gitCommit() {
@@ -123,7 +123,7 @@ def gitCommit() {
 }
 
 def pkgFilename(type, ext) {
-  return "StatusIm.${timestamp()}.${gitCommit()}.${type}.${ext}"
+  return "StatusIm-${timestamp()}-${gitCommit()}-${type}.${ext}"
 }