diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index af0c112f1..d37657e6d 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -8,6 +8,6 @@ then
   if [[ ${CONTAINERS} != "" ]];
   then
     echo "--- :docker: Clean environment"
-    docker rm -f "${CONTAINERS}"
+    docker rm -f ${CONTAINERS}
   fi
 fi
\ No newline at end of file
diff --git a/.buildkite/hooks/pre-artifact b/.buildkite/hooks/pre-artifact
index ac5c86b20..f14eaf59d 100755
--- a/.buildkite/hooks/pre-artifact
+++ b/.buildkite/hooks/pre-artifact
@@ -7,8 +7,8 @@ DOCKER_IMAGE=authelia/authelia
 if [[ $BUILDKITE_COMMAND == "authelia-scripts --log-level debug ci" ]];
 then
   echo "--- :go::node: Saving artifacts for :chrome::selenium: Integration tests"
-  tar --zstd -cf dist.tar.zst dist
-  tar --zstd -cf web.tar.zst web
+  tar -I 'zstdmt -T0 -12' -cf dist.tar.zst dist
+  tar -I 'zstdmt -T0 -12' -cf web.tar.zst web
 fi
 
 if [[ $BUILDKITE_LABEL =~ ":docker: Build Image" ]];
@@ -19,8 +19,8 @@ then
   docker cp authelia-binary:/usr/app/authelia ./authelia-linux-"${ARCH}"
   docker cp authelia-binary:/usr/app/public_html ./
   docker rm -f authelia-binary
-  tar --zstd -cf authelia-linux-"${ARCH}".tar.zst authelia-linux-"${ARCH}" public_html
+  tar -I 'zstdmt -T0 -12' -cf authelia-linux-"${ARCH}".tar.zst authelia-linux-"${ARCH}" public_html
   sha256sum authelia-linux-"${ARCH}".tar.zst > authelia-linux-"${ARCH}".tar.zst.sha256
   # Saving image for push to DockerHub
-  docker save $DOCKER_IMAGE | zstd > authelia-image-"${ARCH}".tar.zst
+  docker save $DOCKER_IMAGE | zstdmt -T0 -12 > authelia-image-"${ARCH}".tar.zst
 fi
\ No newline at end of file
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e2f6b94b9..56a252f53 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,8 +1,6 @@
 steps:
   - label: ":hammer_and_wrench: Build & Test"
     command: "authelia-scripts --log-level debug ci"
-    agents:
-      upload: "fast"
     artifact_paths:
       - "dist.tar.zst"
       - "web.tar.zst"
diff --git a/.travis.yml b/.travis.yml
index c9de6694a..3e917845a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ jobs:
         - docker create --name authelia-binary authelia/authelia:${TRAVIS_TAG:1}-$ARCH
         - docker cp authelia-binary:/usr/app/authelia ./authelia-linux-$ARCH
         - docker cp authelia-binary:/usr/app/public_html ./
-        - tar --zstd -cf authelia-linux-$ARCH.tar.zst authelia-linux-$ARCH public_html
+        - tar -I 'zstdmt -T0 -12' -cf authelia-linux-$ARCH.tar.zst authelia-linux-$ARCH public_html
         - sha256sum authelia-linux-$ARCH.tar.zst > authelia-linux-$ARCH.tar.zst.sha256
       deploy:
         provider: releases