diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml
index 307dca6..ce8a2d6 100644
--- a/.github/workflows/publish-on-release.yml
+++ b/.github/workflows/publish-on-release.yml
@@ -22,16 +22,10 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: build-and-package
-        run: mvn -Pnative-jpackage clean package jpackage:jpackage
+        run: mvn -Pnative-jpackage clean verify
 
-      - name: get-cpu-architecture
-        shell: bash
-        run: |
-          ARCH=$(uname -m)
-          echo "CPU_ARCHITECTURE=$ARCH" >> $GITHUB_ENV
-
-      - name: build-and-package
-        uses: actions/upload-artifact@v4
+      - name: upload-to-release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          name: log-gazer-${{ env.CPU_ARCHITECTURE }}
-          path: target/dist/*
\ No newline at end of file
+          files: dist/*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d78058e..ae72afc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,24 +105,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>native-jpackage</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>${jpackage.maven.plugin.version}</version>
-                        <configuration>
-                            <destination>${project.build.directory}/dist</destination>
-                            <input>${project.build.directory}</input>
-                            <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
-                            <mainClass>${mainClass}</mainClass>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>win</id>
             <activation>
@@ -187,6 +169,63 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>native-jpackage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.panteleyev</groupId>
+                        <artifactId>jpackage-maven-plugin</artifactId>
+                        <version>${jpackage.maven.plugin.version}</version>
+                        <configuration>
+                            <destination>${project.build.directory}/dist</destination>
+                            <input>${project.build.directory}</input>
+                            <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
+                            <mainClass>${mainClass}</mainClass>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jpackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>3.1.0</version>
+                        <executions>
+                            <execution>
+                                <id>rename-artifact</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Define Properties for OS and Architecture -->
+                                        <property name="os.classifier" value="${os.detected.classifier}"/>
+
+                                        <!-- Rename all files in /target/dist -->
+                                        <fileset dir="${project.build.directory}/dist">
+                                            <!-- Include all files in the directory -->
+                                            <include name="*.*"/>
+                                        </fileset>
+
+                                        <move todir="${project.build.directory}/dist">
+                                            <fileset dir="${project.build.directory}/dist"/>
+                                            <mapper type="regexp" from="^(.*)\.(.*)$" to="\1-${os.classifier}.\2" />
+                                        </move>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>