diff --git a/.circleci/config.yml b/.circleci/config.yml
index e55dcd94b..453bd2cb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,11 +13,10 @@ jobs:
       - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON
       - run: cmake --build build -j 2
       - run: cmake --build build -j 2 --target package
-      - run: mv ./build/devilutionx*.7z ./build/devilutionx.7z && mv ./build/devilutionx*.deb ./build/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/devilutionx.rpm
       - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64}
-      - store_artifacts: {path: ./build/devilutionx.7z, destination: devilutionx_linux_x86_64.7z}
-      - store_artifacts: {path: ./build/devilutionx.deb, destination: devilutionx_linux_x86_64.deb}
-      - store_artifacts: {path: ./build/devilutionx.rpm, destination: devilutionx_linux_x86_64.rpm}
+      - run: mkdir ./build/package && find build/_CPack_Packages/Linux/7Z/ -name 'devilutionx' -exec cp "{}" ./build/package/devilutionx \; && cp ./Packaging/resources/devilutionx.mpq ./build/package/devilutionx.mpq && mv ./build/devilutionx*.deb ./build/package/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/package/devilutionx.rpm && mv ./build/CharisSILB.ttf ./build/package/CharisSILB.ttf && cp ./Packaging/nix/README.txt ./build/package/README.txt && cp ./Packaging/resources/LICENSE.CharisSILB.txt ./build/package/LICENSE.CharisSILB.txt
+      - run: cd ./build/package/ && tar -cavf ../../devilutionx.tar.xz * && cd ../../
+      - store_artifacts: {path: ./devilutionx.tar.xz, destination: devilutionx_linux_x86_64.tar.xz}
   linux_x86_64_test:
     docker:
       - image: debian:stable
@@ -43,11 +42,10 @@ jobs:
       - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DUSE_SDL1=ON
       - run: cmake --build build -j 2
       - run: cmake --build build -j 2 --target package
-      - run: mv ./build/devilutionx*.7z ./build/devilutionx.7z && mv ./build/devilutionx*.deb ./build/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/devilutionx.rpm
       - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64_sdl1}
-      - store_artifacts: {path: ./build/devilutionx.7z, destination: devilutionx_linux_x86_64_sdl1.7z}
-      - store_artifacts: {path: ./build/devilutionx.deb, destination: devilutionx_linux_x86_64_sdl1.deb}
-      - store_artifacts: {path: ./build/devilutionx.rpm, destination: devilutionx_linux_x86_64_sdl1.rpm}
+      - run: mkdir ./build/package && find build/_CPack_Packages/Linux/7Z/ -name 'devilutionx' -exec cp "{}" ./build/package/devilutionx \; && cp ./Packaging/resources/devilutionx.mpq ./build/package/devilutionx.mpq && mv ./build/devilutionx*.deb ./build/package/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/package/devilutionx.rpm && mv ./build/CharisSILB.ttf ./build/package/CharisSILB.ttf && cp ./Packaging/nix/README.txt ./build/package/README.txt && cp ./Packaging/resources/LICENSE.CharisSILB.txt ./build/package/LICENSE.CharisSILB.txt
+      - run: cd ./build/package/ && tar -cavf ../../devilutionx.tar.xz * && cd ../../
+      - store_artifacts: {path: ./devilutionx.tar.xz, destination: devilutionx_linux_x86_64_sdl1.tar.xz}
   linux_x86:
     docker:
       - image: debian:stretch-backports
@@ -62,11 +60,10 @@ jobs:
       - run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake
       - run: cmake --build build -j 2
       - run: cmake --build build -j 2 --target package
-      - run: mv ./build/devilutionx*.7z ./build/devilutionx.7z && mv ./build/devilutionx*.deb ./build/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/devilutionx.rpm
       - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86}
-      - store_artifacts: {path: ./build/devilutionx.7z, destination: devilutionx_linux_x86.7z}
-      - store_artifacts: {path: ./build/devilutionx.deb, destination: devilutionx_linux_x86.deb}
-      - store_artifacts: {path: ./build/devilutionx.rpm, destination: devilutionx_linux_x86.rpm}
+      - run: mkdir ./build/package && find build/_CPack_Packages/Linux/7Z/ -name 'devilutionx' -exec cp "{}" ./build/package/devilutionx \; && cp ./Packaging/resources/devilutionx.mpq ./build/package/devilutionx.mpq && mv ./build/devilutionx*.deb ./build/package/devilutionx.deb && mv ./build/devilutionx*.rpm ./build/package/devilutionx.rpm && mv ./build/CharisSILB.ttf ./build/package/CharisSILB.ttf && cp ./Packaging/nix/README.txt ./build/package/README.txt && cp ./Packaging/resources/LICENSE.CharisSILB.txt ./build/package/LICENSE.CharisSILB.txt
+      - run: cd ./build/package/ && tar -cavf ../../devilutionx.tar.xz * && cd ../../
+      - store_artifacts: {path: ./devilutionx.tar.xz, destination: devilutionx_linux_x86.tar.xz}
   windows_x86:
     docker:
       - image: debian:stable