diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 9ec56ff44c63e..e934b01d8a4d9 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -4,3 +4,23 @@ steps:
     agents:
       queue: c2-16
     timeout_in_minutes: 60
+
+  - wait
+
+  - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for deb
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for rpm
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for docker
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
diff --git a/.buildkite/scripts/steps/artifacts/build.sh b/.buildkite/scripts/steps/artifacts/build.sh
index 2d7edf71c1ddb..9d40a713d4b0a 100644
--- a/.buildkite/scripts/steps/artifacts/build.sh
+++ b/.buildkite/scripts/steps/artifacts/build.sh
@@ -41,3 +41,7 @@ if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
     --skip-docker-ubuntu \
     --skip-docker-contexts
 fi
+
+cd target
+buildkite-agent artifact upload "*"
+cd -
\ No newline at end of file