diff --git a/StreamDeckSimHub.Plugin/Bundle.ps1 b/StreamDeckSimHub.Plugin/Bundle.ps1
index 844d7da..c5023e5 100644
--- a/StreamDeckSimHub.Plugin/Bundle.ps1
+++ b/StreamDeckSimHub.Plugin/Bundle.ps1
@@ -18,13 +18,19 @@ try {
     Pushd ..\build
     Rename-Item -Path "publish" -NewName "net.planetrenner.simhub.sdPlugin" -ErrorAction Stop
 
+    # Prepare for Stream Deck with Stream Deck CLI
+    Copy-Item "net.planetrenner.simhub.sdPlugin\manifest-streamdeck.json" -Destination "net.planetrenner.simhub.sdPlugin\manifest.json"
+
     streamdeck bundle net.planetrenner.simhub.sdPlugin
-    #streamdeck bundle --ignore-validation net.planetrenner.simhub.sdPlugin
     if ($? -eq $False) {
-        Write-Host "`nBundling with streamdeck cli failed`n"
+        Write-Host "`nBundling with Stream Deck CLI failed`n"
         Exit 1
     }
 
+    # Prepare for Stream Dock
+    Copy-Item "net.planetrenner.simhub.sdPlugin\manifest-streamdock.json" -Destination "net.planetrenner.simhub.sdPlugin\manifest.json"
+    Compress-Archive -Path "net.planetrenner.simhub.sdPlugin\*" -DestinationPath "net.planetrenner.simhub-streamdock.zip" -Force
+
     Popd
 }
 catch {
diff --git a/StreamDeckSimHub.Plugin/StreamDeckSimHub.Plugin.csproj b/StreamDeckSimHub.Plugin/StreamDeckSimHub.Plugin.csproj
index 30e8ded..82b38ed 100644
--- a/StreamDeckSimHub.Plugin/StreamDeckSimHub.Plugin.csproj
+++ b/StreamDeckSimHub.Plugin/StreamDeckSimHub.Plugin.csproj
@@ -50,7 +50,8 @@
 
     <Target Name="SetManifestVersionAndBundle" AfterTargets="Publish">
         <!-- Replace version in manifest.json with the version from nbgv -->
-        <Exec Command="pwsh -ExecutionPolicy Bypass -File .\ReplaceVersion.ps1 $(PublishDir)manifest.json $(AssemblyFileVersion)" />
+        <Exec Command="pwsh -ExecutionPolicy Bypass -File .\ReplaceVersion.ps1 $(PublishDir)manifest-streamdeck.json $(AssemblyFileVersion)" />
+        <Exec Command="pwsh -ExecutionPolicy Bypass -File .\ReplaceVersion.ps1 $(PublishDir)manifest-streamdock.json $(AssemblyFileVersion)" />
         <!-- Bundle as Stream Deck plugin -->
         <Exec Command="pwsh -ExecutionPolicy Bypass -File .\Bundle.ps1 $(PublishDir)" />
     </Target>
@@ -59,7 +60,10 @@
       <None Update="appsettings.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
-      <None Update="manifest.json">
+      <None Update="manifest-streamdeck.json">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+      <None Update="manifest-streamdock.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
       <None Update="pi\js\common.js">
diff --git a/StreamDeckSimHub.Plugin/manifest.json b/StreamDeckSimHub.Plugin/manifest-streamdeck.json
similarity index 100%
rename from StreamDeckSimHub.Plugin/manifest.json
rename to StreamDeckSimHub.Plugin/manifest-streamdeck.json
diff --git a/StreamDeckSimHub.Plugin/manifest-streamdock.json b/StreamDeckSimHub.Plugin/manifest-streamdock.json
new file mode 100644
index 0000000..127c0c9
--- /dev/null
+++ b/StreamDeckSimHub.Plugin/manifest-streamdock.json
@@ -0,0 +1,134 @@
+{
+  "$schema": "https://schemas.elgato.com/streamdeck/plugins/manifest.json",
+  "Actions": [
+    {
+      "Icon": "images/actions/hotkey",
+      "Name": "Hotkey",
+      "PropertyInspectorPath": "pi/hotkey.html",
+      "States": [
+        {
+          "Image": "images/icons/off",
+          "Name": "off"
+        },
+        {
+          "Image": "images/icons/on",
+          "Name": "on"
+        }
+      ],
+      "Tooltip": "Hotkey with SimHub state",
+      "UUID": "net.planetrenner.simhub.hotkey"
+    },
+    {
+      "Icon": "images/actions/flag",
+      "Name": "Flags",
+      "PropertyInspectorPath": "pi/flags.html",
+      "States": [
+        {
+          "Image": "images/icons/flag-checkered",
+          "Name": "on"
+        }
+      ],
+      "Tooltip": "Flags",
+      "SupportedInMultiActions": false,
+      "UUID": "net.planetrenner.simhub.flags"
+    },
+    {
+      "Icon": "images/actions/generic-button",
+      "Name": "Generic Button",
+      "PropertyInspectorPath": "pi/genericButton.html",
+      "States": [
+        {
+          "Image": "images/icons/generic-button"
+        }
+      ],
+      "Controllers": [
+        "Encoder",
+        "Keypad",
+        "Information"
+      ],
+      "Encoder": {
+        "layout": "layout/dial-fullscreen.json"
+      },
+      "Tooltip": "Generic Button",
+      "SupportedInMultiActions": false,
+      "UUID": "net.planetrenner.simhub.generic-button"
+    },
+    {
+      "Icon": "images/actions/hotkey4",
+      "Name": "Hotkey 4-state",
+      "PropertyInspectorPath": "pi/hotkey4.html",
+      "States": [
+        {
+          "Image": "images/icons/0",
+          "Name": "0"
+        },
+        {
+          "Image": "images/icons/1",
+          "Name": "1"
+        },
+        {
+          "Image": "images/icons/2",
+          "Name": "2"
+        },
+        {
+          "Image": "images/icons/3",
+          "Name": "3"
+        }
+      ],
+      "Tooltip": "Hotkey with SimHub state (4 states)",
+      "UUID": "net.planetrenner.simhub.hotkey4"
+    },
+    {
+      "Icon": "images/actions/input",
+      "Name": "Input Trigger",
+      "PropertyInspectorPath": "pi/input.html",
+      "States": [
+        {
+          "Image": "images/icons/input",
+          "Name": "Input"
+        }
+      ],
+      "Tooltip": "Input control for SimHub",
+      "UUID": "net.planetrenner.simhub.input"
+    },
+    {
+      "Controllers": [
+        "Encoder"
+      ],
+      "Encoder": {
+        "layout": "layout/dial-layout.json"
+      },
+      "Icon": "images/actions/dial",
+      "Name": "Dial",
+      "PropertyInspectorPath": "pi/dial.html",
+      "States": [
+        {
+          "Image": "images/icons/dial",
+          "Name": "Dial"
+        }
+      ],
+      "Tooltip": "Dial with SimHub state",
+      "UUID": "net.planetrenner.simhub.dial"
+    }
+  ],
+  "Author": "Martin Renner",
+  "Category": "Stream Deck SimHub",
+  "CategoryIcon": "images/category/simhub",
+  "CodePath": "StreamDeckSimHub.exe",
+  "Description": "Keep you StreamDeck buttons in sync with SimHub (and your simulation)<p>NOTE: SimHub Property Server has to be installed! See https://github.com/pre-martin/SimHubPropertyServer",
+  "Icon": "images/store/plugin",
+  "Name": "Stream Deck SimHub",
+  "Version": "will be replaced",
+  "UUID": "net.planetrenner.simhub",
+  "URL": "https://github.com/pre-martin/StreamDeckSimHubPlugin",
+  "SDKVersion": 2,
+  "OS": [
+    {
+      "Platform": "windows",
+      "MinimumVersion": "10"
+    }
+  ],
+  "Software": {
+    "MinimumVersion": "6.5"
+  }
+}