diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index dc6f00a77..1b5445c3c 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -1500,8 +1500,8 @@ class Build {
                                         includes: "${base_path}/hotspot/variant-server/**/*," +
                                             "${base_path}/support/modules_cmds/**/*," +
                                             "${base_path}/support/modules_libs/**/*," +
-                                            // JDK 16 + jpackage needs to be signed as well
-                                            "${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/jpackageapplauncher"
+                                            // JDK 16 + jpackage needs to be signed as well stash the resources folder containing the executables
+                                            "${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/*"
 
                                     context.node('eclipse-codesign') {
                                         context.sh "rm -rf ${base_path}/* || true"
@@ -1589,9 +1589,9 @@ class Build {
                                     context.sh "rm -rf ${base_path}/hotspot/variant-server || true"
                                     context.sh "rm -rf ${base_path}/support/modules_cmds || true"
                                     context.sh "rm -rf ${base_path}/support/modules_libs || true"
-                                    // JDK 16 + jpackage needs to be signed as well
+                                    // JDK 16 + jpackage executables need to be signed as well
                                     if (buildConfig.JAVA_TO_BUILD != 'jdk11u') {
-                                        context.sh "rm -rf ${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/jpackageapplauncher || true"
+                                        context.sh "rm -rf ${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/* || true"
                                     }
 
                                     // Restore signed JMODs