diff --git a/dist/base.gradle b/dist/base.gradle
index 23a3c3da5..e1d133c28 100644
--- a/dist/base.gradle
+++ b/dist/base.gradle
@@ -15,6 +15,8 @@ task licenses(type: DefaultTask) {
     }
 }
 
+def debugArguments = file("$projectDir/debug/debug_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(Collectors.joining(' '))
+
 if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
     task baseDist(type: DefaultTask) {
         doLast {
@@ -35,24 +37,13 @@ if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
                 into "$distDir/base/app/lang"
             }
 
-            def debugArguments = file("$projectDir/debug/debug_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(Collectors.joining(
-                    ' '))
-            def debugAttachArguments = file("$projectDir/debug/windows/debug_attach_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(
-                    Collectors.joining(' '))
             file("$distDir/base/app/scripts").mkdirs()
-
             def debug = file("$distDir/base/app/scripts/xpiped_debug.bat")
             debug.text = file("$projectDir/debug/windows/xpiped_debug.bat").text.replace(
                     'JVM-ARGS',
                     debugArguments)
             debug.setExecutable(true)
 
-            def debugAttach = file("$distDir/base/app/scripts/xpiped_debug_attach.bat")
-            debugAttach.text = file("$projectDir/debug/windows/xpiped_debug.bat").text.replace(
-                    'JVM-ARGS',
-                    debugAttachArguments + ' ' + debugArguments)
-            debugAttach.setExecutable(true)
-
             copy {
                 from "$distDir/licenses"
                 into "$distDir/base/licenses"
@@ -85,25 +76,13 @@ if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
                 into "$distDir/base/app"
             }
 
-            def debugArguments = file("$projectDir/debug/debug_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(Collectors.joining(
-                    ' '))
-            def debugAttachArguments = file("$projectDir/debug/linux/debug_attach_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(
-                    Collectors.joining(' '))
             file("$distDir/base/app/scripts").mkdirs()
-
-
             def debug = file("$distDir/base/app/scripts/xpiped_debug.sh")
             debug.text = file("$projectDir/debug/linux/xpiped_debug.sh").text.replace(
                     'JVM-ARGS',
                     debugArguments)
             debug.setExecutable(true, false)
 
-            def debugAttach = file("$distDir/base/app/scripts/xpiped_debug_attach.sh")
-            debugAttach.text = file("$projectDir/debug/linux/xpiped_debug.sh").text.replace(
-                    'JVM-ARGS',
-                    debugAttachArguments + ' ' + debugArguments)
-            debugAttach.setExecutable(true, false)
-
             copy {
                 from "$distDir/licenses"
                 into "$distDir/base/licenses"
@@ -135,23 +114,12 @@ if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
                 into "$distDir/$app/Contents/Resources/lang"
             }
 
-            def debugArguments = file("$projectDir/debug/debug_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(Collectors.joining(
-                    ' '))
-            def debugAttachArguments = file("$projectDir/debug/mac/debug_attach_arguments.txt").text.lines().map(s -> '"' + s + '"').collect(
-                    Collectors.joining(' '))
             file("$distDir/$app/Contents/Resources/scripts").mkdirs()
-
             def debug = file("$distDir/$app/Contents/Resources/scripts/xpiped_debug.sh")
             debug.text = file("$projectDir/debug/mac/xpiped_debug.sh").text.replace(
                     'JVM-ARGS',
                     debugArguments)
             debug.setExecutable(true, false)
-
-            def debugAttach = file("$distDir/$app/Contents/Resources/scripts/xpiped_debug_attach.sh")
-            debugAttach.text = file("$projectDir/debug/mac/xpiped_debug.sh").text.replace(
-                    'JVM-ARGS',
-                    debugAttachArguments + ' ' + debugArguments)
-            debugAttach.setExecutable(true, false)
         }
     }
 }
diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle
index 993e15018..54265aa0a 100644
--- a/dist/jpackage.gradle
+++ b/dist/jpackage.gradle
@@ -20,6 +20,10 @@ if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
     releaseArguments += '-Xdock:name=XPipe'
 }
 
+if (isFullRelease || isStage) {
+    releaseArguments.add("-XX:+DisableAttachMechanism")
+}
+
 // To remove warnings, the plugin probably does not expect the JPackage tasks to be in a separate project
 application {
     mainModule = 'io.xpipe.app'