diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 4ac361c8..3a08522e 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -51,6 +51,16 @@ jobs:
         cd cli/Squidex.CLI/Squidex.CLI
         dotnet publish -r osx-x64 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true
 
+    - name: pack dotnet tool
+      run: |
+        cd cli/Squidex.CLI/Squidex.CLI
+        dotnet pack -p:PackDotnetTool=1 -c Release
+
+    - name: push dotnet tool to nuget.org
+      run: |
+        cd cli/Squidex.CLI/Squidex.CLI/bin/Release
+        dotnet nuget push *.nupkg --source 'https://api.nuget.org/v3/index.json' -k ${{ secrets.nuget }}
+
     - name: create dir
       run: |
         mkdir cli/Squidex.CLI/Squidex.CLI/bin/Release/out
diff --git a/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj b/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj
index e5ef36a1..9ceca586 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj
+++ b/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj
@@ -1,10 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <AssemblyName>sq</AssemblyName>
+    <AssemblyName Condition="'$(PackDotnetTool)'!='1'">sq</AssemblyName>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <Version>4.0</Version>
+    <PackAsTool>true</PackAsTool>
+    <ToolCommandName>sq</ToolCommandName>
+    <Authors>sebastianstehle</Authors>
+    <Company>Squidex UG (haftungsbeschränkt)</Company>
+    <Description>Command Line Interface for Squidex Headless CMS</Description>
+    <Copyright>MIT</Copyright>
+    <PackageTags>Squidex HeadlessCMS</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/Squidex/squidex/master/media/logo-squared.png</PackageIconUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/Squidex/squidex/</PackageProjectUrl>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ConsoleTables" Version="2.3.0" />