diff --git a/utils/run-tests.sh b/infra/image/run-tests.sh
similarity index 54%
rename from utils/run-tests.sh
rename to infra/image/run-tests.sh
index 140998be5..50c642b74 100755
--- a/utils/run-tests.sh
+++ b/infra/image/run-tests.sh
@@ -1,20 +1,56 @@
 #!/bin/bash -eu
 
 SCRIPTDIR="$(readlink -f "$(dirname "$0")")"
-TOPDIR="$(readlink -f "${SCRIPTDIR}/..")"
+TOPDIR="$(readlink -f "${SCRIPTDIR}/../..")"
+UTILSDIR="${SCRIPTDIR}"
 
-# shellcheck source=utils/shfun
-. "${SCRIPTDIR}/shfun"
-# shellcheck source=utils/shcontainer
-. "${SCRIPTDIR}/shcontainer"
-# shellcheck source=utils/shansible
-. "${SCRIPTDIR}/shansible"
+# shellcheck source=infra/image/shfun
+. "${UTILSDIR}/shfun"
+# shellcheck source=infra/image/shcontainer
+. "${UTILSDIR}/shcontainer"
+
+set -o errexit -o errtrace
+
+trap interrupt_exception SIGINT
+
+interrupt_exception() {
+    trap - ERR SIGINT
+    log warn "User interrupted test execution."
+    # shellcheck disable=SC2119
+    cleanup "${scenario:+${scenario}}"
+    exit 1
+}
+
+trap cleanup ERR EXIT SIGABRT SIGTERM SIGQUIT
+
+# shellcheck disable=SC2120
+cleanup() {
+    trap - ERR EXIT SIGABRT SIGTERM SIGQUIT
+    local container
+    log info "Cleaning up environment"
+    container="${1:-${scenario:+${scenario}}}"
+    if [ "${STOP_CONTAINER:-"Y"}" == "Y" ] && [ -n "${container}" ]
+    then
+        run_if_exists container_stop "${container}"
+        [ -f "${inventory:-}" ] && rm "${inventory}"
+    else
+        if [ -n "${container}" ]
+        then
+            log info "Keeping container: $(podman ps --format "{{.Names}} - {{.ID}}" --filter "name=${container}")"
+        fi
+    fi  
+    if [ "${STOP_VIRTUALENV:-"N"}" == "Y" ]
+    then
+        echo "Deactivating virtual environment"
+        run_if_exists deactivate
+    fi  
+}
 
 usage() {
     local prog="${0##*/}"
     cat <<EOF
-usage: ${prog} [-h] [-l] [-e] [-K] [-A|-a ANSIBLE] [-p INTERPRETER] [-c CONTAINER] [-s TESTS_SUITE] [-x] [-S SEED.GRP] [-i IMAGE] [-m MEMORY] [-v...] [TEST...]
-    ${prog} runs playbook(s) TEST using an ansible-freeipa testing image.
+usage: ${prog} [-h] [-l] [-e] [-K] [-A|-a ANSIBLE] [-p INTERPRETER] [-c CONTAINER] [-s TESTS_SUITE] [-x] [-S SEED.GRP] [-i IMAGE] [-v...] [TEST...]
+    ${prog} runs test playbooks using an ansible-freeipa testing images.
 
 EOF
 }
@@ -33,10 +69,11 @@ optional arguments:
   -A              Do not install Ansible, use host's provided one.
   -c CONTAINER    use container CONTAINER to run tests
   -K              keep container, even if tests succeed
-  -l              list available images
+  -L              list available images
+  -l              Try to use local image first, if not found download.
   -e              force recreation of the virtual environment
-  -i IMAGE        select image to run the tests (default: fedora-latest)
-  -m MEMORY       container memory, in GiB (default: 3)
+  -i IMAGE        select image to run the tests
+                  (default: fedora-latest-server)
   -p INTERPRETER  Python interpreter to use on target container
   -s TEST_SUITE   run all playbooks for test suite, which is a directory
                   under ${WHITE}tests${RST}
@@ -47,29 +84,54 @@ EOF
 )"
 }
 
+install_ansible() {
+    ANSIBLE_VERSION="${1:-${ANSIBLE_VERSION:-"ansible-core"}}"
+    [ $# -gt 0 ] && shift
+    log info "Installing Ansible: ${ANSIBLE_VERSION}"
+    pip install --quiet "${ANSIBLE_VERSION}"
+    log debug "Ansible version: $(ansible --version | sed -n "1p")${RST}"
+
+    if [ -n "${ANSIBLE_COLLECTIONS}" ]
+    then
+        collections_path="$(mktemp -d)"
+        for collection in ${ANSIBLE_COLLECTIONS}
+        do
+            if ! quiet ansible-galaxy collection verify --offline "${collection}"
+            then
+                log info "Installing: Ansible Collection ${collection}"
+                # shellcheck disable=SC2086
+                quiet ansible-galaxy collection install \
+                    -p "${collections_path}" \
+                    "${collection}" || die "Failed to install Ansible collection: ${collection}"
+            fi
+        done
+        export ANSIBLE_COLLECTIONS_PATH="${collections_path}:${ANSIBLE_COLLECTIONS_PATH:-}"
+    fi  
+    export ANSIBLE_VERSION
+}
+
 
 # Defaults
 verbose=""
-engine="${engine:-"podman"}"
 CONTINUE_ON_ERROR=""
 STOP_CONTAINER="Y"
 STOP_VIRTUALENV="N"
+FORCE_ENV="N"
 declare -a ENABLED_MODULES
 declare -a ENABLED_TESTS
 read -r -a ENABLED_MODULES <<< "${IPA_ENABLED_MODULES:-""}"
 read -r -a ENABLED_TESTS <<< "${IPA_ENABLED_MODULES:-""}"
-IMAGE_TAG="fedora-latest"
-scenario="freeipa-tests"
-MEMORY=3
+IMAGE_TAG="fedora-latest-server"
+scenario="ansible-freeipa-tests"
 IPA_HOSTNAME="ipaserver.test.local"
 SEED="$(date "+%Y%m%d")"
 GROUP=1
 SPLITS=0
-ANSIBLE_COLLECTIONS=${ANSIBLE_COLLECTIONS:-"${engine_collection}"}
+ANSIBLE_COLLECTIONS=${ANSIBLE_COLLECTIONS:-"containers.podman"}
 SKIP_ANSIBLE=""
-ansible_interpreter="/usr/bin/python3"
 EXTRA_OPTIONS=""
 unset ANSIBLE_VERSION
+unset ansible_interpreter
 
 # Process command options
 
@@ -89,8 +151,7 @@ do
         e) FORCE_ENV="Y" ;;
         i) IMAGE_TAG="${OPTARG}" ;;
         K) STOP_CONTAINER="N" ;;
-        l) "${SCRIPTDIR}"/setup_test_container.sh -l && exit 0 || exit 1 ;;
-        m) MEMORY="${OPTARG}" ;;
+        l) list_images && exit 0 || exit 1 ;;
         p) ansible_interpreter="${OPTARG}" ;;
         s)
            [ ${SPLITS} -ne 0 ] && die -u "Can't use '-S' with '-s'"
@@ -131,16 +192,22 @@ done
 
 [ ${SPLITS} -eq 0 ] && [ ${#ENABLED_MODULES[@]} -eq 0 ] && [ ${#ENABLED_TESTS[@]} -eq 0 ] && die -u "No test defined."
 
-export STOP_CONTAINER FORCE_ENV STOP_VIRTUALENV ansible_interpreter
+export STOP_CONTAINER STOP_VIRTUALENV
 
 # Ensure $python is set
-[ -z "${python}" ] && python="python3"
+for py in "python3" "python"
+do
+    python="$(command -v "${py}")"
+    [ -n "${python}" ] && break
+done
 
 log info "Controller Python executable: ${python}"
 ${python} --version
 
 # Prepare virtual environment
-start_virtual_environment
+declare -a venv_opts=()
+[ "${FORCE_ENV}" == "Y" ] && venv_opts+=("-f")
+start_virtual_environment "${venv_opts[@]}"
 log info "Installing dependencies from 'requirements-tests.txt'"
 pip install --upgrade -r "${TOPDIR}/requirements-tests.txt"
 
@@ -151,17 +218,32 @@ export ANSIBLE_ROLES_PATH="${TOPDIR}/roles"
 export ANSIBLE_LIBRARY="${TOPDIR}/plugins"
 export ANSIBLE_MODULE_UTILS="${TOPDIR}/plugins/module_utils"
 
-# Start container
-"${SCRIPTDIR}/setup_test_container.sh" -e "${engine}" -m "${MEMORY}" -p "${ansible_interpreter}" -i "${IMAGE_TAG}" -n "${IPA_HOSTNAME}" -a "${scenario}" || die "Failed to setup test container"
-
+# Ensure container is up and running
+if [ "${FORCE_ENV:-"N"}" != "Y" ]
+then
+    state="$(container_get_state "${scenario}")"
+    case "${state}" in
+        exited)
+            podman start "${scenario}"
+            container_wait_for_journald "${scenario}"
+            container_wait_up "${scenario}"
+        ;;
+        running) ;; # container is running, nothing to do
+        *)
+            # assume container needs to be recreated
+            "${TOPDIR}/infra/image/start.sh" -l "${IMAGE_TAG}" -n "${IPA_HOSTNAME}"
+        ;;
+    esac
+else
+    "${TOPDIR}/infra/image/start.sh" -l "${IMAGE_TAG}" -n "${IPA_HOSTNAME}"
+fi
 
 # run tests
 RESULT=0
 
-export RUN_TESTS_IN_DOCKER=${engine}
+export RUN_TESTS_IN_DOCKER=podman
 export IPA_SERVER_HOST="${scenario}"
-# Ensure proper ansible_python_interpreter is used by pytest.
-export IPA_PYTHON_PATH="${ansible_interpreter}"
+[ -z "${ansible_interpreter:-}" ] || export IPA_PYTHON_PATH="${ansible_interpreter}"
 
 if [ ${SPLITS} -ne 0 ]
 then
@@ -184,13 +266,20 @@ IPA_VERBOSITY="${verbose}"
 [ -n "${IPA_VERBOSITY}" ] && export IPA_VERBOSITY
 
 # shellcheck disable=SC2086
-if ! pytest -m "playbook" --verbose --color=yes --suppress-no-test-exit-code --junit-xml=TEST-results-group-${GROUP:-1}.xml ${EXTRA_OPTIONS}
+if ! pytest -m "playbook" \
+        --verbose \
+        --color=yes \
+        --suppress-no-test-exit-code \
+        --junit-xml=TEST-results-group-${GROUP:-1}.xml \
+        ${EXTRA_OPTIONS}
 then
     RESULT=2
+    export STOP_CONTAINER="N"
     log error "Container not stopped for verification: ${scenario}"
-    log info "Container: $(${engine} ps -f "name=${scenario}" --format "{{.Names}} - {{.ID}}")"
+    log info "Container: $(podman ps -f "name=${scenario}" --format "{{.Names}} - {{.ID}}")"
 fi
-[ -z "${CONTINUE_ON_ERROR}" ] && [ $RESULT -ne 0 ] && die "Stopping on test failure."
 
-# cleanup environment
-cleanup "${scenario}" "${engine}"
+if [ -z "${CONTINUE_ON_ERROR}" ] && [ $RESULT -ne 0 ]
+then
+    die "Stopping on test failure."
+fi
diff --git a/infra/image/shcontainer b/infra/image/shcontainer
index 0bc3326ac..8769fc88b 100644
--- a/infra/image/shcontainer
+++ b/infra/image/shcontainer
@@ -2,9 +2,20 @@
 # This file is meant to be source'd by other scripts
 
 SCRIPTDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
-TOPDIR="$(readlink -f "${SCRIPTDIR}/../..")"
 
-. "${TOPDIR}/utils/shfun"
+# shellcheck source=infra/image/shfun
+. "${SCRIPTDIR}/shfun"
+
+list_images() {
+    local quay_api="https://quay.io/api/v1/repository/ansible-freeipa/upstream-tests/tag"
+    log info "Available images on quay:"
+    curl --silent -L "${quay_api}" | jq '.tags[]|.name' | tr -d '"'| sort | uniq | sed "s/.*/    &/"
+    echo
+    log info "Local images (use -l):"
+    local_image=$(container_image_list "${repo:-"quay.io/ansible-freeipa/upstream-tests"}:")
+    echo "${local_image}" | sed -e "s/.*://" | sed "s/.*/    &/"
+    echo
+}
 
 container_create() {
     local name=${1}
diff --git a/utils/shfun b/infra/image/shfun
similarity index 65%
rename from utils/shfun
rename to infra/image/shfun
index e14b9bd6a..168d86dc5 100644
--- a/utils/shfun
+++ b/infra/image/shfun
@@ -3,49 +3,15 @@
 
 SCRIPTDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
 
+# shellcheck source=infra/image/shlog
 . "${SCRIPTDIR}/shlog"
 
-[ -n "$(command -v python3)" ] && python="$(command -v python3)" || python="$(command -v python2)"
-export python
-
-trap interrupt_exception SIGINT
-
-interrupt_exception() {
-    trap - SIGINT
-    log warn "User interrupted test execution."
-    # shellcheck disable=SC2119
-    cleanup "${scenario:+${scenario}}"
-    exit 1
-}
-
 run_if_exists() {
     cmd="${1}"
     shift
     [ -n "$(command -v "${cmd}")" ] && "${cmd}" "${@}"
 }
 
-# shellcheck disable=SC2120
-cleanup() {
-    local container container_engine
-    container="${1:-${scenario:+${scenario}}}"
-    container_engine="${2:-${engine:-"podman"}}"
-    if [ "${STOP_CONTAINER:-"Y"}" == "Y" ] && [ -n "${container}" ]
-    then
-	    run_if_exists stop_container "${container}" "${container_engine}"
-        [ -f "${inventory:-}" ] && rm "${inventory}"
-    else
-        if [ -n "${container}" ]
-        then
-            log info "Keeping container: $(${container_engine} ps --format "{{.Names}} - {{.ID}}" --filter "name=${container}")"
-        fi
-    fi
-    if [ "${STOP_VIRTUALENV:-"N"}" == "Y" ]
-    then
-        echo "Deactivating virtual environment"
-        run_if_exists deactivate
-    fi
-}
-
 start_virtual_environment() {
     # options -f
     local FORCE_ENV VENV envdirectory
@@ -59,6 +25,16 @@ start_virtual_environment() {
     done
     envdirectory="${test_env:-/tmp/ansible-freeipa-tests}"
 
+    for py in python3 python2
+    do
+        if quiet command -v "${py}"
+        then
+            python="$(command -v ${py})"
+            export python
+            break
+        fi
+    done
+
     # Prepare virtual environment
     VENV=$(in_python_virtualenv && echo Y || echo N)
 
@@ -77,7 +53,7 @@ start_virtual_environment() {
         then
             log info "Creating virtual environment: ${envdirectory}..."
 	    log warn "RUN: ${python} -m venv ${envdirectory}"
-	    ${python} -m venv "${envdirectory}" || die "Cannot create virtual environment."
+	    "${python}" -m venv "${envdirectory}" || die "Cannot create virtual environment."
 	fi
 	log info "Starting virtual environment: ${envdirectory}"
 	[ -f "${envdirectory}/bin/activate" ] || die "Failed to create virtual environment."
@@ -100,8 +76,7 @@ die() {
        shift 1
     fi
     log error "${*}"
-    STOP_CONTAINER="N"
-    cleanup "${scenario:+${scenario}}"
+    export STOP_CONTAINER="N"
     [ "${usg}" == "Y" ] && run_if_exists usage
     exit 1
 }
diff --git a/utils/shlog b/infra/image/shlog
similarity index 97%
rename from utils/shlog
rename to infra/image/shlog
index d1b51e834..801e511ea 100644
--- a/utils/shlog
+++ b/infra/image/shlog
@@ -52,6 +52,6 @@ log() {
 }
 
 quiet() {
-     "$@" >/dev/null 2>&1
+     "$@" >/dev/null 2>/dev/null
 }
 
diff --git a/infra/image/start.sh b/infra/image/start.sh
index 0f17189d3..203a375d6 100755
--- a/infra/image/start.sh
+++ b/infra/image/start.sh
@@ -1,12 +1,11 @@
 #!/bin/bash -eu
 
 BASEDIR="$(readlink -f "$(dirname "$0")")"
-TOPDIR="$(readlink -f "${BASEDIR}/../..")"
 
 # shellcheck disable=SC1091
 . "${BASEDIR}/shcontainer"
 # shellcheck disable=SC1091
-. "${TOPDIR}/utils/shfun"
+. "${BASEDIR}/shfun"
 
 usage() {
     local prog="${0##*/}"
@@ -36,17 +35,6 @@ NOTE:
 EOF
 }
 
-list_images() {
-    local quay_api="https://quay.io/api/v1/repository/ansible-freeipa/upstream-tests/tag"
-    log info "Available images on quay:"
-    curl --silent -L "${quay_api}" | jq '.tags[]|.name' | tr -d '"'| sort | uniq | sed "s/.*/    &/"
-    echo
-    log info "Local images (use -l):"
-    local_image=$(container_image_list "${repo}:")
-    echo "${local_image}" | sed -e "s/.*://" | sed "s/.*/    &/"
-    echo
-}
-
 repo="quay.io/ansible-freeipa/upstream-tests"
 name="ansible-freeipa-tests"
 hostname="ipaserver.test.local"
diff --git a/utils/setup_test_container.sh b/utils/setup_test_container.sh
deleted file mode 100755
index 0916c27f5..000000000
--- a/utils/setup_test_container.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash -eu
-
-SCRIPTDIR="$(readlink -f "$(dirname "$0")")"
-
-# shellcheck source=utils/shcontainer
-. "${SCRIPTDIR}/shcontainer"
-# shellcheck source=utils/shansible
-. "${SCRIPTDIR}/shansible"
-
-usage() {
-    local prog="${0##*/}"
-    cat <<EOF
-usage: ${prog} [-h] [-l] [-a] [-e ENGINE] [-i IMAGE] [-m MEMORY] [-n HOSTNAME] NAME
-    ${prog} starts a container to test ansible-freeipa.
-
-EOF
-}
-
-help() {
-    usage
-    echo -e "$(cat <<EOF
-Arguments:
-
-  NAME            set the container name
-
-Options:
-
-  -h              display this message and exit
-  -l              list available images
-  -a              Test Ansible connection.
-  -e ENGINE       set the container engine to use
-                  (default: ${WHITE}podman${RST}, if available)
-  -i IMAGE        select image to run the tests (default: fedora-latest)
-  -m MEMORY       set container memory, in GiB (default: 3)
-  -n HOSTNAME     set the hostname in the container
-                  (default: ipaserver.test.local)
-  -p INTERPRETER  Python interpreter to use on target container
-EOF
-)"
-}
-
-list_images() {
-    local quay_api="https://quay.io/api/v1/repository/ansible-freeipa/upstream-tests/tag"
-    echo -e "${WHITE}Available images:"
-    curl --silent -L "${quay_api}" | jq '.tags[]|.name' | tr -d '"'| sort | uniq | sed "s/.*/    &/"
-    echo -e "${RST}"
-}
-
-IMAGE_TAG="fedora-latest"
-MEMORY="${MEMORY:-3}"
-IPA_HOSTNAME="${IPA_HOSTNAME:-"ipaserver.test.local"}"
-test_env="${test_env:-"/tmp"}"
-ansible_interpreter="/usr/bin/python3"
-engine="podman"
-ansible_test=""
-
-while getopts ":hae:i:lm:n:p:" option
-do
-    case "$option" in
-        h) help && exit 0 ;;
-        a) ansible_test="yes" ;;
-        e) engine="${OPTARG}" ;;
-        i) IMAGE_TAG="${OPTARG}" ;;
-        l) list_images && exit 0 || exit 1;;
-        m) MEMORY="${OPTARG}" ;;
-        n) IPA_HOSTNAME="${OPTARG}" ;;
-        p) ansible_interpreter="${OPTARG}" ;;
-        *) die -u "Invalid option: ${OPTARG}" ;;
-    esac
-done
-
-export IPA_HOSTNAME MEMORY IMAGE_TAG scenario
-
-shift $((OPTIND - 1))
-[ $# == 1 ] || die -u "You must provide the name for a single container." 
-scenario="${1}"
-shift
-
-prepare_container "${scenario}" "${IMAGE_TAG}"
-start_container "${scenario}"
-
-# wait for FreeIPA services to be available (usually ~45 seconds)
-log info "Wait for container to be initialized."
-wait=15
-while podman exec "${scenario}" systemctl list-jobs | grep -qvi "no jobs running"
-do
-    log none "Waiting ${wait}s... "
-    sleep "${wait}"
-    log none "Retrying".
-done
-
-# run tests
-
-# ensure we can get a TGT for admin
-log info "Testing kinit with admin."
-# shellcheck disable=SC2016
-"${engine}" exec "${scenario}" /bin/sh -c 'for i in $(seq 5); do echo "SomeADMINpassword" | kinit -c ansible_freeipa_cache admin && kdestroy -c ansible_freeipa_cache -A && break; echo "Failed to get TGT. Retrying in 10s..."; sleep 10; done' || die "Failed to grant admin TGT."
-
-# shellcheck disable=SC2154
-log info "Creating inventory."
-make_inventory "${scenario}" "${engine}" "${ansible_interpreter:-"/usr/bin/python3"}"
-if [ -z "${inventory:-''}" ]
-then
-    log error "Could not create inventory file."
-else
-    # shellcheck disable=SC2154
-    log info "Inventory path: [${inventory}]"
-    # shellcheck disable=SC2154
-    log debug "$(cat "${inventory}")"
-    if [ "${ansible_test}" == "yes" ]
-    then
-        log info "Testing Ansible connection."
-        # shellcheck disable=SC2154
-        run_if_exists ansible_ping "${inventory}"
-        log info "Querying installed software"
-        run_if_exists query_container_installed_software
-    fi
-fi
-
diff --git a/utils/shansible b/utils/shansible
deleted file mode 100644
index ca05f820c..000000000
--- a/utils/shansible
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash -eu
-# This file is meant to be source'd by other scripts
-
-SCRIPTDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
-
-# shellcheck source=utils/shfun
-. "${SCRIPTDIR}/shfun"
-
-install_ansible() {
-    ANSIBLE_VERSION="${1:-${ANSIBLE_VERSION:-"ansible-core"}}"
-    [ $# -gt 0 ] && shift
-    log info "Installing Ansible: ${ANSIBLE_VERSION}"
-    pip install --quiet "${ANSIBLE_VERSION}"
-    log debug "Ansible version: $(ansible --version | sed -n "1p")${RST}"
-
-    if [ -n "${ANSIBLE_COLLECTIONS}" ]
-    then
-        log warn "Installed collections will not be removed after execution."
-        log none "Installing: Ansible Collection ${ANSIBLE_COLLECTIONS}"
-        # shellcheck disable=SC2086
-        quiet ansible-galaxy collection install ${ANSIBLE_COLLECTIONS} || die "Failed to install Ansible collections."
-    fi
-    export ANSIBLE_VERSION
-}
-
-run_inline_playbook() {
-    local playbookdir playbook err
-    playbookdir=${1:-"playbooks"}
-    quiet mkdir -p "${playbookdir}"
-    playbook=$(mktemp "${playbookdir}/ansible-freeipa-test-playbook_ipa.XXXXXXXX" 2>/dev/null)
-    # In some configurations, it may not be possible to use another
-    # directory, so we store the playbook in the current one.
-    # [ -z "${playbook}" ] && playbook=$(mktemp "ansible-freeipa-test-playbook_ipa.XXXXXXXX")
-
-    inventory="${inventory:-${test_env:-"."}/inventory}"
-    quiet mkdir -p "${playbookdir}"
-    cat - >"${playbook}"
-    # shellcheck disable=SC2086
-    run_if_exists ansible-playbook ${ansible_options:-} -i "${inventory}" "${playbook}"
-    err=$?
-    rm -f "${playbook}"
-    return ${err}
-}
-
-make_inventory() {
-    local scenario pod_engine ansible_interpreter
-    scenario=$1
-    pod_engine="${engine:-${2:-podman}}"
-    ansible_interpreter="${3:-${ansible_interpreter:-"/usr/bin/python3"}}"
-    export inventory="${test_env:-"."}/inventory"
-    log info "Inventory file: ${inventory}"
-    cat << EOF > "${inventory}"
-[ipaserver]
-${scenario} ansible_connection=${pod_engine} ansible_python_interpreter=${ansible_interpreter}
-[ipaserver:vars]
-ipaserver_domain = test.local
-ipaserver_realm = TEST.LOCAL
-EOF
-}
-
-query_container_installed_software() {
-    # check image software versions.
-    run_inline_playbook "${test_env:-"/tmp"}/playbooks" <<EOF || die "Failed to verify software installation."
----
-- name: Software environment.
-  hosts: ipaserver
-  become: yes
-  gather_facts: no
-  tasks:
-  - name: Retrieve versions.
-    ansible.builtin.shell: |
-      cat /etc/redhat-release
-      ${python:-"python3"} --version
-      rpm -q freeipa-server freeipa-client ipa-server ipa-client 389-ds-base pki-ca krb5-server
-      uname -a
-    register: result
-  - name: Testing environment.
-    ansible.builtin.debug:
-      var: result.stdout_lines
-EOF
-}
-
-ansible_ping() {
-    # shellcheck disable=SC2086
-    ansible ${ansible_options:-} -m ping -i "${1:-${inventory}}" all || die "Could not connect to container."
-}
-
-export ANSIBLE_VERSION=${ANSIBLE_VERSION:-'ansible-core'}
diff --git a/utils/shcontainer b/utils/shcontainer
deleted file mode 100644
index b1c568308..000000000
--- a/utils/shcontainer
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash -eu
-# This file is meant to be source'd by other scripts
-
-SCRIPTDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
-
-IMAGE_REPO="quay.io/ansible-freeipa/upstream-tests"
-
-# shellcheck source=utils/shfun
-. "${SCRIPTDIR}/shfun"
-
-stop_container() {
-    local scenario=${1}
-    log none "Stopping container..."
-    quiet "${engine}" stop "${scenario}"
-    log none "Removing container..."
-    quiet "${engine}" rm "${scenario}"
-}
-
-# Prepare container
-prepare_container() {
-    local container_id container_status hostname scenario
-    local IMAGE_TAG img_id CONFIG
-    container_id=""
-    container_status=("-f" "status=created" "-f" "status=running")
-    hostname="${IPA_HOSTNAME:-"ipaserver.test.local"}"
-    scenario="${1:-${scenario:-"freeipa-tests"}}"
-    IMAGE_TAG="${2:-${IMAGE_TAG:-fedora-latest}}"
-    [ -n "${scenario}" ] && container_id="$(${engine} ps --all -q -f "name=${scenario}" "${container_status[@]}")"
-    if [ -z "${container_id}" ]
-    then
-        # Retrieve image and start container.
-        log info "Pulling FreeIPA image '${IMAGE_REPO}:${IMAGE_TAG}'..."
-        img_id=$(${engine} pull -q "${IMAGE_REPO}:${IMAGE_TAG}")
-        log debug "Hostname: ${hostname}"
-        log info "Creating container..."
-        CONFIG="--systemd true --hostname ${hostname} --memory ${MEMORY}g --memory-swap -1 --no-hosts"
-        [ -n "${scenario}" ] && CONFIG="${CONFIG} --name ${scenario}"
-        # shellcheck disable=SC2086
-        container_id=$(${engine} create ${CONFIG} "${img_id}" || die "Cannot create container")
-        log none "CONTAINER: ${container_id}"
-    fi
-    export scenario="${scenario:-$(${engine} ps -q --format "{{.Names}}" --filter "id=${container_id}" "${container_status[@]}")}"
-    log debug "Prepared container: ${scenario}"
-}
-
-start_container() {
-    local scenario="${1:-${scenario}}"
-    log info "Starting container for ${scenario}..."
-    "${engine}" start "${scenario}"
-}
-
-if [ -z "$(command -v podman)" ]
-then
-    engine="docker"
-    engine_collection="community.docker"
-else
-    engine="podman"
-    engine_collection="containers.podman"
-fi
-
-export engine engine_collection