diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml
index e8651c07..fa736f27 100644
--- a/.github/workflows/spotube-release-binary.yml
+++ b/.github/workflows/spotube-release-binary.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             platform: linux
             arch: x86
             files: |
@@ -44,7 +44,7 @@ jobs:
             files: |
               dist/Spotube-linux-aarch64.deb
               dist/spotube-linux-*-aarch64.tar.xz
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             platform: android
             arch: all
             files: |
@@ -127,7 +127,7 @@ jobs:
           limit-access-to-actor: true
 
   upload:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
       - build_platform
     steps:
diff --git a/cli/commands/build/linux.dart b/cli/commands/build/linux.dart
index f61ffbce..3fd8a0b9 100644
--- a/cli/commands/build/linux.dart
+++ b/cli/commands/build/linux.dart
@@ -47,7 +47,7 @@ class LinuxBuildCommand extends Command with BuildCommandCommonSteps {
     }
 
     final tempDir = join(Directory.systemTemp.path, "spotube-tar");
-
+    final bundleArchName = architecture == "x86" ? "x86_64" : "aarch64";
     final bundleDirPath = join(
       cwd.path,
       "build",
@@ -62,7 +62,7 @@ class LinuxBuildCommand extends Command with BuildCommandCommonSteps {
       "dist",
       "spotube-linux-"
           "${CliEnv.channel == BuildChannel.nightly ? "nightly" : versionWithoutBuildNumber}"
-          "-${architecture == "x86" ? "x86_64" : "aarch64"}.tar.xz",
+          "-$bundleArchName.tar.xz",
     ));
 
     await copyPath(bundleDirPath, tempDir);
@@ -91,7 +91,11 @@ class LinuxBuildCommand extends Command with BuildCommandCommonSteps {
       ),
     );
     await ogDeb.copy(
-      join(cwd.path, "dist", "Spotube-linux-x86_64.deb"),
+      join(
+        cwd.path,
+        "dist",
+        "Spotube-linux-$bundleArchName.deb",
+      ),
     );
     await ogDeb.delete();
 
@@ -106,7 +110,7 @@ class LinuxBuildCommand extends Command with BuildCommandCommonSteps {
       );
 
       await ogRpm.copy(
-        join(cwd.path, "dist", "Spotube-linux-x86_64.rpm"),
+        join(cwd.path, "dist", "Spotube-linux-$bundleArchName.rpm"),
       );
 
       await ogRpm.delete();