diff --git a/.github/workflows/native-build.yml b/.github/workflows/native-build.yml
index f2290a39..2a7fbc0e 100644
--- a/.github/workflows/native-build.yml
+++ b/.github/workflows/native-build.yml
@@ -1,4 +1,4 @@
-name: Native build test
+name: Native build
 
 on:
   workflow_dispatch:
@@ -43,18 +43,16 @@ jobs:
 
       - name: 'Build Native Image'
         run: |
-          pushd server
-          mvn -ntp -B --file pom.xml -Pnative package -DskipTests
-          popd
+          mvn -ntp -B --file pom.xml -Pnative package -DskipTests -pl server,cli
 
       - name: 'Create distribution'
         run: |
-          pushd server
-          mvn -ntp -B --file pom.xml -Pdist package -DskipTests
-          popd
+          mvn -ntp -B --file pom.xml -Pdist package -DskipTests -pl server,cli
 
       - name: 'Upload build artifact'
         uses: actions/upload-artifact@v5
         with:
           name: power-server-${{ runner.os }}-${{ runner.arch }}
-          path: server/target/distributions/*.tar.gz
+          path: |
+            server/target/distributions/*.tar.gz
+            cli/target/distributions/*.tar.gz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f7b29da9..26c0ff77 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -109,7 +109,7 @@ jobs:
       - name: 'Set up Java'
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: maven
 
@@ -117,7 +117,7 @@ jobs:
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mvn -ntp -B --file server/pom.xml -Prelease -DartifactsDir=artifacts jreleaser:full-release
+          mvn -ntp -B --file pom.xml -Prelease -DartifactsDir=artifacts jreleaser:full-release -pl server,cli
 
       - name: 'JReleaser output'
         if: always()
diff --git a/cli/pom.xml b/cli/pom.xml
index e339d881..b5e5f87e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -10,6 +10,10 @@
   <artifactId>power-server-cli</artifactId>
   <name>power-server : cli</name>
   <description>A CLI command to measure power consumption of the specified process</description>
+  <properties>
+    <distribution.directory>${project.build.directory}/distributions</distribution.directory>
+    <executable-suffix/>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>net.laprun.sustainability</groupId>
@@ -33,6 +37,13 @@
   </dependencies>
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>kr.motd.maven</groupId>
+        <artifactId>os-maven-plugin</artifactId>
+        <version>${os-maven-plugin.version}</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <groupId>net.revelc.code.formatter</groupId>
@@ -43,5 +54,47 @@
       </plugin>
     </plugins>
   </build>
-
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>${maven-assembly-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>make-distribution</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <attach>false</attach>
+              <appendAssemblyId>false</appendAssemblyId>
+              <finalName>${project.artifactId}-${project.version}-${os.detected.classifier}</finalName>
+              <outputDirectory>${distribution.directory}</outputDirectory>
+              <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+              <descriptors>
+                <descriptor>src/main/assembly/assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>dist-windows</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <executable-suffix>.exe</executable-suffix>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/cli/src/main/assembly/assembly.xml b/cli/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..e02aad18
--- /dev/null
+++ b/cli/src/main/assembly/assembly.xml
@@ -0,0 +1,17 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>dist</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <files>
+        <file>
+            <source>${project.build.directory}/${project.artifactId}-${project.version}-runner${executable-suffix}
+            </source>
+            <outputDirectory>./bin</outputDirectory>
+            <destName>${project.artifactId}${executable-suffix}</destName>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file
diff --git a/cli/src/main/java/net/laprun/sustainability/cli/Power.java b/cli/src/main/java/net/laprun/sustainability/cli/Power.java
index 37024eba..3f0e7777 100644
--- a/cli/src/main/java/net/laprun/sustainability/cli/Power.java
+++ b/cli/src/main/java/net/laprun/sustainability/cli/Power.java
@@ -1,6 +1,5 @@
 package net.laprun.sustainability.cli;
 
-import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
diff --git a/pom.xml b/pom.xml
index 52b66adc..a2cf8b4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,6 +340,48 @@
                                             </artifact>
                                         </artifacts>
                                     </power-server>
+                                    <power-server-cli>
+                                        <name>power-server-cli</name>
+                                        <stereotype>CLI</stereotype>
+                                        <executable>
+                                            <name>power</name>
+                                        </executable>
+                                        <type>BINARY</type>
+                                        <brew>
+                                            <active>RELEASE</active>
+                                            <multiPlatform>true</multiPlatform>
+                                        </brew>
+                                        <sdkman>
+                                            <active>RELEASE</active>
+                                        </sdkman>
+                                        <artifacts>
+                                            <artifact>
+                                                <path>{{artifactsDir}}/{{distributionName}}-{{projectVersion}}-linux-x86_64.tar.gz</path>
+                                                <transform>artifacts/{{distributionName}}-{{projectEffectiveVersion}}-linux-x86_64.tar.gz</transform>
+                                                <platform>linux-x86_64</platform>
+                                            </artifact>
+                                            <!--<artifact>
+                                                <path>
+                                                    {{artifactsDir}}/{{distributionName}}-{{projectVersion}}-windows-x86_64.zip
+                                                </path>
+                                                <transform>
+                                                    artifacts/{{distributionName}}-{{projectEffectiveVersion}}-windows-x86_64.zip
+                                                </transform>
+                                                <platform>windows-x86_64</platform>
+                                            </artifact>-->
+                                            <artifact>
+                                                <path>{{artifactsDir}}/{{distributionName}}-{{projectVersion}}-osx-x86_64.tar.gz</path>
+                                                <transform>artifacts/{{distributionName}}-{{projectEffectiveVersion}}-osx-x86_64.tar.gz</transform>
+                                                <platform>osx-x86_64</platform>
+                                            </artifact>
+                                            <artifact>
+                                                <path>{{artifactsDir}}/{{distributionName}}-{{projectVersion}}-osx-aarch_64.tar.gz</path>
+                                                <transform>
+                                                    {{artifactsDir}}/{{distributionName}}-{{projectEffectiveVersion}}-osx-aarch_64.tar.gz</transform>
+                                                <platform>osx-aarch_64</platform>
+                                            </artifact>
+                                        </artifacts>
+                                    </power-server-cli>
                                 </distributions>
                             </jreleaser>
                         </configuration>