diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle
index 9700ab2c4..1eb1289c6 100644
--- a/dist/jpackage.gradle
+++ b/dist/jpackage.gradle
@@ -63,7 +63,8 @@ jlink {
         addOptions("--add-modules", groupName + ".ext.${extProject.name}")
     }
 
-    if (!ci || (!isStage && !isFullRelease)) {
+    def excludeJdwp = ci || isFullRelease
+    if (!excludeJdwp) {
         addOptions("--add-modules", "jdk.jdwp.agent")
     }