diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 8d1e88c1..39d00908 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -32,8 +32,16 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Build with Gradle
         run: ./gradlew jpackage
+      - name: Package zip distribution
+        if: ${{ runner.os == 'Windows' }}
+        run: ./gradlew packageZipDistribution
+      - name: Package tar distribution
+        if: ${{ runner.os == 'Linux' }}
+        run: ./gradlew packageTarDistribution
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Sparrow Build - ${{ runner.os }}
-          path: build/jpackage/*
\ No newline at end of file
+          path: |
+            build/jpackage/*
+            !build/jpackage/Sparrow/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9235a602..4e1bbe8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,3 +181,16 @@ jlink {
         }
     }
 }
+
+task packageZipDistribution(type: Zip) {
+    archiveFileName = "Sparrow-${sparrowVersion}.zip"
+    destinationDirectory = file("$buildDir/jpackage")
+    from "$buildDir/jpackage/Sparrow"
+}
+
+task packageTarDistribution(type: Tar) {
+    archiveFileName = "sparrow-${sparrowVersion}.tar.gz"
+    destinationDirectory = file("$buildDir/jpackage")
+    compression = Compression.GZIP
+    from "$buildDir/jpackage/Sparrow"
+}