diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 1b00b84..8e2167c 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -14,6 +14,19 @@ jobs:
       - uses: actions/checkout@v4
       - run: sudo apt install libbluetooth-dev doxygen
       - run: mkdir build && pushd build && cmake -DCMAKE_BUILD_TYPE=Release -DGATTLIB_BUILD_DOCS=ON .. && make
+      - run: pushd build && cpack ..
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          PACKAGE_VERSION: '${{github.ref_name}}'
+      - name: Archive Distribution packages
+        uses: actions/upload-artifact@v4
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: distribution-packages
+          path: |
+            build/*.deb
+            build/*.rpm
+            build/*.zip
 
   build-release-force-dbus:
     runs-on: ubuntu-latest
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ff6dcc..973728b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,13 +128,13 @@ endif()
 # Packaging
 #
 set(CPACK_PACKAGE_INSTALL_DIRECTORY /usr CACHE STRING "Install directory (default: /usr).")
-if (ENV{TRAVIS_TAG} AND (NOT "ENV{TRAVIS_TAG}" STREQUAL "dev"))
-  message("Package Gattlib for tagged version $ENV{TRAVIS_TAG}")
+if (ENV{PACKAGE_VERSION} AND (NOT "ENV{PACKAGE_VERSION}" STREQUAL "dev"))
+  message("Package Gattlib for tagged version $ENV{PACKAGE_VERSION}")
 
   # Transform 'v0.3' into '0.3' and 'v0.3-rc1' into '0.3-rc1'
-  string(REGEX REPLACE "v([0-9]+).([0-9]+)(.*)" "\\1.\\2\\3" CPACK_PACKAGE_VERSION $ENV{TRAVIS_TAG})
+  string(REGEX REPLACE "v([0-9]+).([0-9]+)(.*)" "\\1.\\2\\3" CPACK_PACKAGE_VERSION $ENV{PACKAGE_VERSION})
 else()
-  set(CPACK_PACKAGE_VERSION 0.3-dev)
+  set(CPACK_PACKAGE_VERSION 0.4-dev)
   message("Package Gattlib for development version $ENV{CPACK_PACKAGE_VERSION}")
 endif()
 set(CPACK_PACKAGE_CONTACT "Olivier Martin <olivier@labapart.com>")