diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml
index 78a862043..e3f118f30 100644
--- a/.github/workflows/cacert-publish.yml
+++ b/.github/workflows/cacert-publish.yml
@@ -59,4 +59,4 @@ jobs:
             distroList+="deb.distribution=${debVersion};"
           done
           FILE=$(ls ca-certificates/debian/build/ospackage/*.deb)
-          jf rt u "$FILE" "deb/pool/main/a/adoptium-ca-certificates/$(basename ${FILE});deb.architecture=all;deb.component=main;${distroList}"
+          jf rt u "$FILE" "deb/pool/main/a/adoptium-ca-certificates/$(basename ${FILE});deb.architecture=all;deb.component=main;${distroList}" --flat=true
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
index 0d0fde2e6..41538b258 100644
--- a/linux/Jenkinsfile
+++ b/linux/Jenkinsfile
@@ -279,8 +279,8 @@ def uploadArtifacts(String DISTRO, String buildArch) {
 
 def uploadAlpineArtifacts(String buildArch) {
     // currently only support x64 as buildArch
-    jf rt u "**/build/ospackage/temurin-*j*.apk" "apk/alpine/main/${buildArch}/"
-    jf rt u "**/build/ospackage/temurin-*src*.apk" "apk/alpine/main/${buildArch}/"
+    jf "rt u '**/build/ospackage/temurin-*j*.apk' 'apk/alpine/main/${buildArch}/' --flat=true"
+    jf "rt u '**/build/ospackage/temurin-*src*.apk' 'apk/alpine/main/${buildArch}/' --flat=true"
 }
 
 def uploadDebArtifacts(String buildArch) {
@@ -329,7 +329,7 @@ def uploadDebArtifacts(String buildArch) {
             */
             sleep 2
         } else {
-            jf rt u "**/build/ospackage/temurin-*${debArchList[buildArch]}.deb" "deb/pool/main/t/temurin-${VERSION}/" --props="${distro_list}deb.component=main;deb.architecture=${debArchList[buildArch]}"
+            jf "rt u '**/build/ospackage/temurin-*${debArchList[buildArch]}.deb' 'deb/pool/main/t/temurin-${VERSION}/' --props='${distro_list}deb.component=main;deb.architecture=${debArchList[buildArch]}' --flat=true"
             break
         }
     }
@@ -396,7 +396,7 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
                     */
                     sleep 2
                 } else {
-                    jf rt u "**/build/ospackage/*.${entry.value}.rpm" "${packageDir}/${entry.key}/Packages/"
+                    jf "rt u '**/build/ospackage/*.${entry.value}.rpm' '${packageDir}/${entry.key}/Packages/' --flat=true"
                     break
                 }
             }