diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 6809170..1cbd556 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -88,11 +88,11 @@ jobs:
         run: |
           set -eux
           curl -fsSO -u "${{ secrets.PACKAGECLOUD_TOKEN }}:" https://packagecloud.io/api/v1/distributions.json
+          ID=$(echo "${{ matrix.os }}" | cut -d- -f1)
+          VERSION_CODENAME=$(echo "${{ matrix.os }}" | cut -d- -f2)
+          DIST_ID=$(jq ".deb[] | select(.index_name == \"${ID}\").versions[] | select(.index_name == \"${VERSION_CODENAME}\").id" distributions.json)
           for PKG_FILE in $(find builds -name "*.deb")
           do
-            ID=$(echo $PKG_FILE | cut -d/ -f3)
-            VERSION_CODENAME=$(echo $PKG_FILE | cut -d/ -f4)
-            DIST_ID=$(jq ".deb[] | select(.index_name == \"${ID}\").versions[] | select(.index_name == \"${VERSION_CODENAME}\").id" distributions.json)
             curl -fsS -u "${{ secrets.PACKAGECLOUD_TOKEN }}:" -XPOST \
               -F "package[distro_version_id]=${DIST_ID}" \
               -F "package[package_file]=@${PKG_FILE}" \