diff --git a/.github/workflows/debugger-linux.yml b/.github/workflows/debugger-linux.yml
new file mode 100644
index 00000000..426e733d
--- /dev/null
+++ b/.github/workflows/debugger-linux.yml
@@ -0,0 +1,48 @@
+name: debugger-linux
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+concurrency:
+  group: "publish-linux"
+  cancel-in-progress: true
+
+jobs:
+  publish-windows:
+    runs-on: linux-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          check-latest: true
+          java-version: 21
+          cache: 'gradle'
+
+      - name: Validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Create local properties
+        env:
+          LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
+        run: echo "$LOCAL_PROPERTIES" > local.properties
+
+      - name: Create platform debugger distributable
+        run: ./gradlew debugger:app:packageDistributionForCurrentOS
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: Debugger_Linux
+          path: ./debugger/app/build/compose/binaries/main/deb/*
+          if-no-files-found: error
+          overwrite: false
diff --git a/.github/workflows/debugger-macos.yml b/.github/workflows/debugger-macos.yml
new file mode 100644
index 00000000..aaef9c67
--- /dev/null
+++ b/.github/workflows/debugger-macos.yml
@@ -0,0 +1,48 @@
+name: debugger-macos
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+concurrency:
+  group: "publish-macos"
+  cancel-in-progress: true
+
+jobs:
+  publish-windows:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          check-latest: true
+          java-version: 21
+          cache: 'gradle'
+
+      - name: Validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Create local properties
+        env:
+          LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
+        run: echo "$LOCAL_PROPERTIES" > local.properties
+
+      - name: Create platform debugger distributable
+        run: ./gradlew debugger:app:packageDistributionForCurrentOS
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: Debugger_Macos
+          path: ./debugger/app/build/compose/binaries/main/dmg/*
+          if-no-files-found: error
+          overwrite: false
diff --git a/.github/workflows/debugger-win.yml b/.github/workflows/debugger-win.yml
index cc009f14..e1455138 100644
--- a/.github/workflows/debugger-win.yml
+++ b/.github/workflows/debugger-win.yml
@@ -1,9 +1,10 @@
-name: publish
+name: debugger-windows
 
 on:
   push:
-    tags:
-      - '2.*'
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 concurrency:
   group: "publish-win"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 476bc307..a38d2bc8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,17 +39,6 @@ jobs:
           LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
         run: echo "$LOCAL_PROPERTIES" > local.properties
 
-      - name: Create macOS debugger distributable
-        run: ./gradlew debugger:app:packageDistributionForCurrentOS
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: Debugger_MacOS
-          path: ./debugger/app/build/compose/binaries/main/dmg/*
-          if-no-files-found: error
-          overwrite: true
-
       - name: Publish to sonatype
         # It's important to not upload in parallel or duplicate repos will be created
         run: ./gradlew publishAllPublicationsToSonatypeRepository -Dorg.gradle.parallel=false --stacktrace
diff --git a/debugger/app/build.gradle.kts b/debugger/app/build.gradle.kts
index a6503582..783fb9a9 100644
--- a/debugger/app/build.gradle.kts
+++ b/debugger/app/build.gradle.kts
@@ -75,6 +75,7 @@ compose.desktop {
             windows {
                 dirChooser = true
                 menu = false
+                shortcut = true
                 perUserInstall = true
                 upgradeUuid = Config.debuggerAppId
                 iconFile = iconDir.resolve("favicon.ico")