diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 98848dd0..0c56311e 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -45,7 +45,10 @@ jobs:
         run: ./gradlew -Djava.awt.headless=true clean jpackage
       - name: Package headless tar distribution
         if: ${{ runner.os == 'Linux' }}
-        run: ./gradlew packageTarDistribution
+        run: ./gradlew -Djava.awt.headless=true packageTarDistribution
+      - name: Rename Headless Artifacts
+        if: ${{ runner.os == 'Linux' }}
+        run: rename 's/sparrow/sparrow-server/g' build/jpackage/*
       - name: Upload Headless Artifact
         if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@v2
diff --git a/build.gradle b/build.gradle
index f6c09bdc..71752404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,10 +20,6 @@ if(System.getProperty("os.arch") == "aarch64") {
     targetName = "-" + osArch
 }
 def headless = "true".equals(System.getProperty("java.awt.headless")) || GraphicsEnvironment.isHeadless()
-def sparrowBuild = ""
-if(headless) {
-    sparrowBuild = "Server"
-}
 
 group "com.sparrowwallet"
 version "${sparrowVersion}"
@@ -228,7 +224,7 @@ jlink {
     addExtraDependencies("javafx")
     jpackage {
         imageName = "Sparrow"
-        installerName = "Sparrow${sparrowBuild}"
+        installerName = "Sparrow"
         appVersion = "${sparrowVersion}"
         skipInstaller = os.macOsX || properties.skipInstallers
         imageOptions = []
@@ -255,7 +251,7 @@ task removeGroupWritePermission(type: Exec) {
 }
 
 task packageZipDistribution(type: Zip) {
-    archiveFileName = "Sparrow${sparrowBuild}-${sparrowVersion}.zip"
+    archiveFileName = "Sparrow-${sparrowVersion}.zip"
     destinationDirectory = file("$buildDir/jpackage")
     from("$buildDir/jpackage/") {
         include "Sparrow/**"
@@ -265,7 +261,7 @@ task packageZipDistribution(type: Zip) {
 
 task packageTarDistribution(type: Tar) {
     dependsOn removeGroupWritePermission
-    archiveFileName = "sparrow${sparrowBuild.toLowerCase()}-${sparrowVersion}.tar.gz"
+    archiveFileName = "sparrow-${sparrowVersion}.tar.gz"
     destinationDirectory = file("$buildDir/jpackage")
     compression = Compression.GZIP
     from("$buildDir/jpackage/") {