diff --git a/.github/workflows/cross-plaform-build.yml b/.github/workflows/cross-plaform-build.yml
index 4ca7d72f..22be9ae8 100644
--- a/.github/workflows/cross-plaform-build.yml
+++ b/.github/workflows/cross-plaform-build.yml
@@ -23,17 +23,15 @@ jobs:
         submodules: recursive
     - name: Configure
       run: |
-        cmake -DCMAKE_BUILD_TYPE=Debug .
+        cmake -B build -DCMAKE_BUILD_TYPE=Debug -DCONFIG_OSDP_LIB_ONLY=on .
     - name: Build
-      run: cmake --build . --parallel 8
+      run: cmake --build build --parallel 8
     - name: Pack built binaries
       run: |
-        cmake --build . -t package
-        cmake --build . -t package_source
-        rm -rf ./packages/_CPack_Packages/
-        rm -f ./packages/*.tar.bz2
+        cmake --build build -t package
+        cmake --build build -t package_source
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
         name: libosdp-${{ matrix.os }}-binaries.zip
-        path: ./packages/
\ No newline at end of file
+        path: build/artifacts/
diff --git a/cmake/CreatePackages.cmake b/cmake/CreatePackages.cmake
index ca806a59..1af166eb 100644
--- a/cmake/CreatePackages.cmake
+++ b/cmake/CreatePackages.cmake
@@ -12,6 +12,7 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_DESCRIPTION_FILE ${CPACK_RESOURCE_FILE_README})
 set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
+SET(CPACK_OUTPUT_FILE_PREFIX "artifacts")
 
 # Version
 set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
@@ -22,8 +23,8 @@ set(PACKAGE_NAME ${PROJECT_NAME}-${PROJECT_VERSION})
 set(SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR})
 
 # Source tarballs
-set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME})
-set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}.src")
+set(CPACK_SOURCE_GENERATOR "TGZ")
 set(CPACK_SOURCE_IGNORE_FILES
 	/.git/
 	/.github/
@@ -32,8 +33,8 @@ set(CPACK_SOURCE_IGNORE_FILES
 )
 
 # Binaries
-set(CPACK_GENERATOR "TGZ;TBZ2")
-set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${SYSTEM_NAME})
+set(CPACK_GENERATOR "TGZ")
+set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${SYSTEM_NAME}")
 include(CPackComponent)
 cpack_add_component(distributables
 	DISPLAY_NAME  ${PROJECT_NAME}