diff --git a/testsuite/podman_runner/00_setup_env.sh b/testsuite/podman_runner/00_setup_env.sh
index 2f45459518ea..102df2883bc8 100755
--- a/testsuite/podman_runner/00_setup_env.sh
+++ b/testsuite/podman_runner/00_setup_env.sh
@@ -12,7 +12,7 @@ if [ -z "${UYUNI_VERSION}" ];then
 fi
 
 echo "Killing old containers"
-containers="deblike_minion rhlike_minion sle_minion opensusessh server controller"
+containers="auth_registry buildhost deblike_minion rhlike_minion sle_minion opensusessh server controller"
 for i in ${containers};do
     sudo -i podman kill ${i}
 done
@@ -23,7 +23,7 @@ for i in ${containers};do
 done
 
 echo "Force remove containers"
-containers="deblike_minion rhlike_minion sle_minion opensusessh server controller"
+containers="auth_registry buildhost deblike_minion rhlike_minion sle_minion opensusessh server controller"
 for i in ${containers};do
     sudo -i podman rm ${i}
 done
diff --git a/testsuite/podman_runner/07_start_server.sh b/testsuite/podman_runner/07_start_server.sh
index 648ebcd410c9..bc0cce5e9a9d 100755
--- a/testsuite/podman_runner/07_start_server.sh
+++ b/testsuite/podman_runner/07_start_server.sh
@@ -2,6 +2,8 @@
 set -xe
 src_dir=$(cd $(dirname "$0")/../.. && pwd -P)
 
+setup_pm_path=`sudo -i podman run --rm -ti ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION sh -c 'rpm -ql spacewalk-setup | grep Setup.pm' | tr -d '\r'`
+
 sudo -i podman run --cap-add AUDIT_CONTROL --rm \
     --tmpfs /run \
     -v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade \
@@ -18,6 +20,9 @@ sudo -i podman run --cap-add AUDIT_CONTROL --rm \
     -v ${src_dir}/spacewalk/setup/share/tomcat_java_opts.conf:/etc/tomcat/conf.d/tomcat_java_opts.conf \
     -v ${src_dir}/spacewalk/setup/share/tomcat_java_opts_suse.conf:/etc/tomcat/conf.d/tomcat_java_opts_suse.conf \
     -v ${src_dir}/java/conf/default/rhn_taskomatic_daemon.conf:/usr/share/rhn/config-defaults/rhn_taskomatic_daemon.conf \
+    -v ${src_dir}/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb:/usr/bin/uyuni-setup-reportdb \
+    -v ${src_dir}/spacewalk/setup/bin/spacewalk-setup:/usr/bin/spacewalk-setup \
+    -v ${src_dir}/spacewalk/setup/lib/Spacewalk/Setup.pm:${setup_pm_path} \
     -v /sys/fs/cgroup:/sys/fs/cgroup:rw \
     -v /tmp/testing:/tmp \
     --cgroupns=host \