diff --git a/cluster-up/cluster/external/provider.sh b/cluster-up/cluster/external/provider.sh
index 59ae9852d1..ca9631025e 100644
--- a/cluster-up/cluster/external/provider.sh
+++ b/cluster-up/cluster/external/provider.sh
@@ -22,15 +22,6 @@ manifest_docker_prefix=\${DOCKER_PREFIX}
 image_pull_policy=\${IMAGE_PULL_POLICY:-Always}
 EOF
 
-    if [ -n "$KUBECTL" ]; then
-       echo "kubectl=${KUBECTL}" >> "$PROVIDER_CONFIG_FILE_PATH"
-    else
-       if which kubectl; then
-          echo "kubectl=$(which kubectl)" >> "$PROVIDER_CONFIG_FILE_PATH"
-       fi 
-    fi
-
-
     if which oc; then
         echo "oc=$(which oc)" >> "$PROVIDER_CONFIG_FILE_PATH"
     fi
diff --git a/cluster-up/cluster/kind-1.28/provider.sh b/cluster-up/cluster/kind-1.28/provider.sh
index 0071f9fba6..27e9bddfe5 100755
--- a/cluster-up/cluster/kind-1.28/provider.sh
+++ b/cluster-up/cluster/kind-1.28/provider.sh
@@ -2,52 +2,16 @@
 
 set -e
 
-DEFAULT_CLUSTER_NAME="kind-1.28"
-DEFAULT_HOST_PORT=5000
-ALTERNATE_HOST_PORT=5001
-export CLUSTER_NAME=${CLUSTER_NAME:-$DEFAULT_CLUSTER_NAME}
+export CLUSTER_NAME="k8s-1.28"
 
-if [ $CLUSTER_NAME == $DEFAULT_CLUSTER_NAME ]; then
-    export HOST_PORT=$DEFAULT_HOST_PORT
-else
-    export HOST_PORT=$ALTERNATE_HOST_PORT
-fi
-
-function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
-    export KIND_VERSION="${KIND_VERSION:-$version}"
-
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
-    export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
-}
-
-function configure_registry_proxy() {
-    [ "$CI" != "true" ] && return
-
-    echo "Configuring cluster nodes to work with CI mirror-proxy..."
-
-    local -r ci_proxy_hostname="docker-mirror-proxy.kubevirt-prow.svc"
-    local -r kind_binary_path="${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind"
-    local -r configure_registry_proxy_script="${KUBEVIRTCI_PATH}/cluster/kind/configure-registry-proxy.sh"
-
-    KIND_BIN="$kind_binary_path" PROXY_HOSTNAME="$ci_proxy_hostname" $configure_registry_proxy_script
-}
+make -C cluster-provision/gocli cli
 
 function up() {
-    cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
-    _add_kubeadm_cpu_manager_config_patch
-    _add_extra_mounts
-    export CONFIG_WORKER_CPU_MANAGER=true
-    kind_up
-
-    configure_registry_proxy
-
-    # remove the rancher.io kind default storageClass
-    _kubectl delete sc standard
-
-    echo "$KUBEVIRT_PROVIDER cluster '$CLUSTER_NAME' is ready"
+    if [ "$CI" == "true" ]; then export REGISTRY_PROXY="docker-mirror-proxy.kubevirt-prow.svc"; fi
+    ./cluster-provision/gocli/build/cli run-kind k8s-1.28 \
+        --with-extra-mounts=true \
+        --nodes=$KUBEVIRT_NUM_NODES \
+        --registry-proxy=$REGISTRY_PROXY
 }
 
-set_kind_params
-
-source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
+source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
\ No newline at end of file
diff --git a/cluster-up/cluster/kind-1.30-vgpu/config_vgpu_cluster.sh b/cluster-up/cluster/kind-1.30-vgpu/config_vgpu_cluster.sh
deleted file mode 100755
index 87087c6de4..0000000000
--- a/cluster-up/cluster/kind-1.30-vgpu/config_vgpu_cluster.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-[ $(id -u) -ne 0 ] && echo "FATAL: this script requires sudo privileges" >&2 && exit 1
-
-set -xe
-
-SCRIPT_PATH=$(dirname "$(realpath "$0")")
-
-source ${SCRIPT_PATH}/vgpu-node/node.sh
-echo "_kubectl: " ${_kubectl}
-echo "KUBEVIRTCI_PATH: " ${KUBEVIRTCI_PATH}
-source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
-echo "_kubectl: " ${_kubectl}
-
-nodes=($(_kubectl get nodes -o custom-columns=:.metadata.name --no-headers))
-node::remount_sysfs "${nodes[*]}"
-node::discover_host_gpus
-
-_kubectl get nodes
diff --git a/cluster-up/cluster/kind-1.30-vgpu/provider.sh b/cluster-up/cluster/kind-1.30-vgpu/provider.sh
index 3ff5ade6f0..3129b080bc 100755
--- a/cluster-up/cluster/kind-1.30-vgpu/provider.sh
+++ b/cluster-up/cluster/kind-1.30-vgpu/provider.sh
@@ -2,36 +2,16 @@
 
 set -e
 
-DEFAULT_CLUSTER_NAME="vgpu"
-DEFAULT_HOST_PORT=5000
-ALTERNATE_HOST_PORT=5001
-export CLUSTER_NAME=${CLUSTER_NAME:-$DEFAULT_CLUSTER_NAME}
-
-if [ $CLUSTER_NAME == $DEFAULT_CLUSTER_NAME ]; then
-    export HOST_PORT=$DEFAULT_HOST_PORT
-else
-    export HOST_PORT=$ALTERNATE_HOST_PORT
-fi
-
-function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
-    export KIND_VERSION="${KIND_VERSION:-$version}"
-
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
-    export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
-}
+export CLUSTER_NAME="vgpu"
 
-function configure_registry_proxy() {
-    [ "$CI" != "true" ] && return
 
-    echo "Configuring cluster nodes to work with CI mirror-proxy..."
+function detect_cri() {
+    if podman ps >/dev/null 2>&1; then echo podman; elif docker ps >/dev/null 2>&1; then echo docker; fi
+}
 
-    local -r ci_proxy_hostname="docker-mirror-proxy.kubevirt-prow.svc"
-    local -r kind_binary_path="${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind"
-    local -r configure_registry_proxy_script="${KUBEVIRTCI_PATH}/cluster/kind/configure-registry-proxy.sh"
+make -C cluster-provision/gocli cli
 
-    KIND_BIN="$kind_binary_path" PROXY_HOSTNAME="$ci_proxy_hostname" $configure_registry_proxy_script
-}
+export CRI_BIN=${CRI_BIN:-$(detect_cri)}
 
 function up() {
     # print hardware info for easier debugging based on logs
@@ -39,20 +19,11 @@ function up() {
     ${CRI_BIN} run --rm --cap-add=SYS_RAWIO quay.io/phoracek/lspci@sha256:0f3cacf7098202ef284308c64e3fc0ba441871a846022bb87d65ff130c79adb1 sh -c "lspci -k | grep -EA2 'VGA|3D'"
     echo ""
 
-    cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
-    _add_extra_mounts
-    kind_up
-
-    configure_registry_proxy
-
-    # remove the rancher.io kind default storageClass
-    _kubectl delete sc standard
-
-    ${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/config_vgpu_cluster.sh
-
-    echo "$KUBEVIRT_PROVIDER cluster '$CLUSTER_NAME' is ready"
+    if [ "$CI" == "true" ]; then export REGISTRY_PROXY="docker-mirror-proxy.kubevirt-prow.svc"; fi
+    ./cluster-provision/gocli/build/cli run-kind vgpu \
+        --with-extra-mounts=true \
+        --nodes=$KUBEVIRT_NUM_NODES \
+        --registry-proxy=$REGISTRY_PROXY
 }
 
-set_kind_params
-
-source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
+source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
\ No newline at end of file
diff --git a/cluster-up/cluster/kind-1.30-vgpu/vgpu-node/node.sh b/cluster-up/cluster/kind-1.30-vgpu/vgpu-node/node.sh
deleted file mode 100644
index 4a69c54a09..0000000000
--- a/cluster-up/cluster/kind-1.30-vgpu/vgpu-node/node.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-function node::discover_host_gpus() {
-  local -r gpu_types=( $(find /sys/class/mdev_bus/*/mdev_supported_types) )
-  [ "${#gpu_types[@]}" -eq 0 ] && echo "FATAL: Could not find available GPUs on host" >&2 && return 1
-
-  local gpu_addr
-  local gpu_addresses=()
-  for path in "${gpu_types}"; do
-    gpu_addr="${gpu_types#/sys/class/mdev_bus/}"
-    gpu_addr=${gpu_addr%/*}
-
-    gpu_addresses+=( $gpu_addr )
-  done
-
-  echo "${gpu_addresses[@]}"
-}
-
-function node::remount_sysfs() {
-  local -r nodes_array=($1)
-  local node_exec
-
-  for node in "${nodes_array[@]}"; do
-
-    # KIND mounts sysfs as read-only by default, remount as R/W"
-    node_exec="${CRI_BIN} exec $node"
-    $node_exec mount -o remount,rw /sys
-    $node_exec chmod 666 /dev/vfio/vfio
-
-  done
-}
-
diff --git a/cluster-up/cluster/kind-sriov/config_sriov_cluster.sh b/cluster-up/cluster/kind-sriov/config_sriov_cluster.sh
deleted file mode 100755
index af53bb91a5..0000000000
--- a/cluster-up/cluster/kind-sriov/config_sriov_cluster.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-[ $(id -u) -ne 0 ] && echo "FATAL: this script requires sudo privileges" >&2 && exit 1
-
-set -xe
-
-PF_COUNT_PER_NODE=${PF_COUNT_PER_NODE:-1}
-[ $PF_COUNT_PER_NODE -le 0 ] && echo "FATAL: PF_COUNT_PER_NODE must be a positive integer" >&2 && exit 1
-
-SCRIPT_PATH=$(dirname "$(realpath "$0")")
-
-source ${SCRIPT_PATH}/sriov-node/node.sh
-source ${SCRIPT_PATH}/sriov-components/sriov_components.sh
-
-CONFIGURE_VFS_SCRIPT_PATH="$SCRIPT_PATH/sriov-node/configure_vfs.sh"
-
-SRIOV_COMPONENTS_NAMESPACE="sriov"
-SRIOV_NODE_LABEL_KEY="sriov_capable"
-SRIOV_NODE_LABEL_VALUE="true"
-SRIOV_NODE_LABEL="$SRIOV_NODE_LABEL_KEY=$SRIOV_NODE_LABEL_VALUE"
-SRIOVDP_RESOURCE_PREFIX="kubevirt.io"
-SRIOVDP_RESOURCE_NAME="sriov_net"
-VFS_DRIVER="vfio-pci"
-VFS_DRIVER_KMODULE="vfio_pci"
-VFS_COUNT="6"
-
-function validate_nodes_sriov_allocatable_resource() {
-  local -r resource_name="$SRIOVDP_RESOURCE_PREFIX/$SRIOVDP_RESOURCE_NAME"
-  local -r sriov_nodes=$(_kubectl get nodes -l $SRIOV_NODE_LABEL -o custom-columns=:.metadata.name --no-headers)
-
-  local num_vfs
-  for sriov_node in $sriov_nodes; do
-    num_vfs=$(node::total_vfs_count "$sriov_node")
-    sriov_components::wait_allocatable_resource "$sriov_node" "$resource_name" "$num_vfs"
-  done
-}
-
-worker_nodes=($(_kubectl get nodes -l node-role.kubernetes.io/worker -o custom-columns=:.metadata.name --no-headers))
-worker_nodes_count=${#worker_nodes[@]}
-[ "$worker_nodes_count" -eq 0 ] && echo "FATAL: no worker nodes found" >&2 && exit 1
-
-pfs_names=($(node::discover_host_pfs))
-pf_count="${#pfs_names[@]}"
-[ "$pf_count" -eq 0 ] && echo "FATAL: Could not find available sriov PF's" >&2 && exit 1
-
-total_pf_required=$((worker_nodes_count*PF_COUNT_PER_NODE))
-[ "$pf_count" -lt "$total_pf_required" ] && \
-  echo "FATAL: there are not enough PF's on the host, try to reduce PF_COUNT_PER_NODE
-  Worker nodes count: $worker_nodes_count
-  PF per node count:  $PF_COUNT_PER_NODE
-  Total PF count required:  $total_pf_required" >&2 && exit 1
-
-## Move SR-IOV Physical Functions to worker nodes
-PFS_IN_USE=""
-node::configure_sriov_pfs "${worker_nodes[*]}" "${pfs_names[*]}" "$PF_COUNT_PER_NODE" "PFS_IN_USE"
-
-## Create VFs and configure their drivers on each SR-IOV node
-node::configure_sriov_vfs "${worker_nodes[*]}" "$VFS_DRIVER" "$VFS_DRIVER_KMODULE" "$VFS_COUNT"
-
-## Deploy Multus and SRIOV components
-sriov_components::deploy_multus
-sriov_components::deploy \
-  "$PFS_IN_USE" \
-  "$VFS_DRIVER" \
-  "$SRIOVDP_RESOURCE_PREFIX" "$SRIOVDP_RESOURCE_NAME" \
-  "$SRIOV_NODE_LABEL_KEY" "$SRIOV_NODE_LABEL_VALUE"
-
-# Verify that each sriov capable node has sriov VFs allocatable resource
-validate_nodes_sriov_allocatable_resource
-sriov_components::wait_pods_ready
-
-_kubectl get nodes
-_kubectl get pods -n $SRIOV_COMPONENTS_NAMESPACE
diff --git a/cluster-up/cluster/kind-sriov/provider.sh b/cluster-up/cluster/kind-sriov/provider.sh
index 34d54837f4..11298a976e 100755
--- a/cluster-up/cluster/kind-sriov/provider.sh
+++ b/cluster-up/cluster/kind-sriov/provider.sh
@@ -2,77 +2,31 @@
 
 set -e
 
-DEFAULT_CLUSTER_NAME="sriov"
-DEFAULT_HOST_PORT=5000
-ALTERNATE_HOST_PORT=5001
-export CLUSTER_NAME=${CLUSTER_NAME:-$DEFAULT_CLUSTER_NAME}
+export CLUSTER_NAME="sriov"
+PF_COUNT_PER_NODE=${PF_COUNT_PER_NODE:-1}
+VF_COUNT_PER_NODE=${VF_COUNT_PER_NODE:-6}
 
-if [ $CLUSTER_NAME == $DEFAULT_CLUSTER_NAME ]; then
-    export HOST_PORT=$DEFAULT_HOST_PORT
-else
-    export HOST_PORT=$ALTERNATE_HOST_PORT
-fi
-
-function print_available_nics() {
-    # print hardware info for easier debugging based on logs
-    echo 'Available NICs'
-    ${CRI_BIN} run --rm --cap-add=SYS_RAWIO quay.io/phoracek/lspci@sha256:0f3cacf7098202ef284308c64e3fc0ba441871a846022bb87d65ff130c79adb1 sh -c "lspci | egrep -i 'network|ethernet'"
-    echo ""
-}
-
-function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
-    export KIND_VERSION="${KIND_VERSION:-$version}"
-
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
-    export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
+function detect_cri() {
+    if podman ps >/dev/null 2>&1; then echo podman; elif docker ps >/dev/null 2>&1; then echo docker; fi
 }
 
-function print_sriov_data() {
-    nodes=$(_kubectl get nodes -o=custom-columns=:.metadata.name | awk NF)
-    for node in $nodes; do
-        if [[ ! "$node" =~ .*"control-plane".* ]]; then
-            echo "Node: $node"
-            echo "VFs:"
-            ${CRI_BIN} exec $node bash -c "ls -l /sys/class/net/*/device/virtfn*"
-            echo "PFs PCI Addresses:"
-            ${CRI_BIN} exec $node bash -c "grep PCI_SLOT_NAME /sys/class/net/*/device/uevent"
-        fi
-    done
-}
+make -C cluster-provision/gocli cli
 
-function configure_registry_proxy() {
-    [ "$CI" != "true" ] && return
+export CRI_BIN=${CRI_BIN:-$(detect_cri)}
 
-    echo "Configuring cluster nodes to work with CI mirror-proxy..."
-
-    local -r ci_proxy_hostname="docker-mirror-proxy.kubevirt-prow.svc"
-    local -r kind_binary_path="${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind"
-    local -r configure_registry_proxy_script="${KUBEVIRTCI_PATH}/cluster/kind/configure-registry-proxy.sh"
-
-    KIND_BIN="$kind_binary_path" PROXY_HOSTNAME="$ci_proxy_hostname" $configure_registry_proxy_script
-}
-
-function deploy_sriov() {
-    print_available_nics
-    ${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/config_sriov_cluster.sh
-    print_sriov_data
-}
 
 function up() {
-    cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
-    export CONFIG_WORKER_CPU_MANAGER=true
-    kind_up
-
-    configure_registry_proxy
-
-    # remove the rancher.io kind default storageClass
-    _kubectl delete sc standard
+    echo 'Available NICs'
+    ${CRI_BIN} run --rm --cap-add=SYS_RAWIO quay.io/phoracek/lspci@sha256:0f3cacf7098202ef284308c64e3fc0ba441871a846022bb87d65ff130c79adb1 sh -c "lspci | egrep -i 'network|ethernet'"
+    echo ""
 
-    deploy_sriov
-    echo "$KUBEVIRT_PROVIDER cluster '$CLUSTER_NAME' is ready"
+    if [ "$CI" == "true" ]; then export REGISTRY_PROXY="docker-mirror-proxy.kubevirt-prow.svc"; fi
+    ./cluster-provision/gocli/build/cli run-kind sriov \
+        --with-extra-mounts=true \
+        --nodes=$KUBEVIRT_NUM_NODES \
+        --registry-proxy=$REGISTRY_PROXY \
+        --pf-count-per-node=$PF_COUNT_PER_NODE
+        --vf-count-per-node=$VF_COUNT_PER_NODE
 }
 
-set_kind_params
-
-source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
+source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh
\ No newline at end of file
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/kustomization.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/kustomization.yaml
deleted file mode 100644
index 0c1caec162..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/kustomization.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: sriov
-resources:
-- sriov-ns.yaml
-- sriov-cni-daemonset.yaml
-- sriovdp-daemonset.yaml
-- sriovdp-config.yaml
-patchesJson6902:
-- target:
-    group: apps
-    version: v1
-    kind: DaemonSet
-    name: kube-sriov-cni-ds-amd64
-  path: patch-node-selector.yaml
-- target:
-    group: apps
-    version: v1
-    kind: DaemonSet
-    name: kube-sriov-device-plugin-amd64
-  path: patch-node-selector.yaml
-- target:
-    group: apps
-    version: v1
-    kind: DaemonSet
-    name: kube-sriov-device-plugin-amd64
-  path: patch-sriovdp-resource-prefix.yaml
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/kustomization.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/kustomization.yaml
deleted file mode 100644
index 657061704b..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/kustomization.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- multus.yaml
-images:
-- name: ghcr.io/k8snetworkplumbingwg/multus-cni
-  newTag: v3.8
-patchesJson6902:
-- path: patch-args.yaml
-  target:
-    group: apps
-    version: v1
-    kind: DaemonSet
-    name: kube-multus-ds
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/multus.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/multus.yaml
deleted file mode 100644
index 4b6b950d85..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/multus.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: network-attachment-definitions.k8s.cni.cncf.io
-spec:
-  group: k8s.cni.cncf.io
-  scope: Namespaced
-  names:
-    plural: network-attachment-definitions
-    singular: network-attachment-definition
-    kind: NetworkAttachmentDefinition
-    shortNames:
-    - net-attach-def
-  versions:
-    - name: v1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          description: 'NetworkAttachmentDefinition is a CRD schema specified by the Network Plumbing
-            Working Group to express the intent for attaching pods to one or more logical or physical
-            networks. More information available at: https://github.com/k8snetworkplumbingwg/multi-net-spec'
-          type: object
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this represen
-                tation of an object. Servers should convert recognized schemas to the
-                latest internal value, and may reject unrecognized values. More info:
-                https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this
-                object represents. Servers may infer this from the endpoint the client
-                submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: 'NetworkAttachmentDefinition spec defines the desired state of a network attachment'
-              type: object
-              properties:
-                config:
-                  description: 'NetworkAttachmentDefinition config is a JSON-formatted CNI configuration'
-                  type: string
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: multus
-rules:
-  - apiGroups: ["k8s.cni.cncf.io"]
-    resources:
-      - '*'
-    verbs:
-      - '*'
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - pods/status
-    verbs:
-      - get
-      - update
-  - apiGroups:
-      - ""
-      - events.k8s.io
-    resources:
-      - events
-    verbs:
-      - create
-      - patch
-      - update
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: multus
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: multus
-subjects:
-- kind: ServiceAccount
-  name: multus
-  namespace: kube-system
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: multus
-  namespace: kube-system
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: multus-cni-config
-  namespace: kube-system
-  labels:
-    tier: node
-    app: multus
-data:
-  # NOTE: If you'd prefer to manually apply a configuration file, you may create one here.
-  # In the case you'd like to customize the Multus installation, you should change the arguments to the Multus pod
-  # change the "args" line below from
-  # - "--multus-conf-file=auto"
-  # to:
-  # "--multus-conf-file=/tmp/multus-conf/70-multus.conf"
-  # Additionally -- you should ensure that the name "70-multus.conf" is the alphabetically first name in the
-  # /etc/cni/net.d/ directory on each node, otherwise, it will not be used by the Kubelet.
-  cni-conf.json: |
-    {
-      "name": "multus-cni-network",
-      "type": "multus",
-      "capabilities": {
-        "portMappings": true
-      },
-      "delegates": [
-        {
-          "cniVersion": "0.3.1",
-          "name": "default-cni-network",
-          "plugins": [
-            {
-              "type": "flannel",
-              "name": "flannel.1",
-                "delegate": {
-                  "isDefaultGateway": true,
-                  "hairpinMode": true
-                }
-              },
-              {
-                "type": "portmap",
-                "capabilities": {
-                  "portMappings": true
-                }
-              }
-          ]
-        }
-      ],
-      "kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig"
-    }
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-multus-ds
-  namespace: kube-system
-  labels:
-    tier: node
-    app: multus
-    name: multus
-spec:
-  selector:
-    matchLabels:
-      name: multus
-  updateStrategy:
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        tier: node
-        app: multus
-        name: multus
-    spec:
-      hostNetwork: true
-      tolerations:
-      - operator: Exists
-        effect: NoSchedule
-      serviceAccountName: multus
-      containers:
-      - name: kube-multus
-        image: ghcr.io/k8snetworkplumbingwg/multus-cni:stable
-        command: ["/entrypoint.sh"]
-        args:
-        - "--multus-conf-file=auto"
-        - "--cni-version=0.3.1"
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "50Mi"
-          limits:
-            cpu: "100m"
-            memory: "50Mi"
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: cni
-          mountPath: /host/etc/cni/net.d
-        - name: cnibin
-          mountPath: /host/opt/cni/bin
-        - name: multus-cfg
-          mountPath: /tmp/multus-conf
-      terminationGracePeriodSeconds: 10
-      volumes:
-        - name: cni
-          hostPath:
-            path: /etc/cni/net.d
-        - name: cnibin
-          hostPath:
-            path: /opt/cni/bin
-        - name: multus-cfg
-          configMap:
-            name: multus-cni-config
-            items:
-            - key: cni-conf.json
-              path: 70-multus.conf
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/patch-args.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/patch-args.yaml
deleted file mode 100644
index ea9cd10923..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/multus/patch-args.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "--multus-log-level=debug"
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "--multus-log-file=/var/log/multus.log"
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-node-selector.yaml.in b/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-node-selector.yaml.in
deleted file mode 100644
index 0117c8cdd5..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-node-selector.yaml.in
+++ /dev/null
@@ -1,3 +0,0 @@
-- op: add
-  path: /spec/template/spec/nodeSelector/$LABEL_KEY
-  value: "$LABEL_VALUE"
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-sriovdp-resource-prefix.yaml.in b/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-sriovdp-resource-prefix.yaml.in
deleted file mode 100644
index 563e606a9f..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/patch-sriovdp-resource-prefix.yaml.in
+++ /dev/null
@@ -1,3 +0,0 @@
-- op: add
-  path: /spec/template/spec/containers/0/args/-1
-  value: --resource-prefix=$RESOURCE_PREFIX
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-cni-daemonset.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-cni-daemonset.yaml
deleted file mode 100644
index 7d0150e380..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-cni-daemonset.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-cni-ds-amd64
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriov-cni
-spec:
-  selector:
-    matchLabels:
-      name: sriov-cni
-  template:
-    metadata:
-      labels:
-        name: sriov-cni
-        tier: node
-        app: sriov-cni
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      tolerations:
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
-      containers:
-      - name: kube-sriov-cni
-        image: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.7.0
-        imagePullPolicy: IfNotPresent
-        securityContext:
-          allowPrivilegeEscalation: false
-          privileged: false
-          readOnlyRootFilesystem: true
-          capabilities:
-            drop:
-              - ALL
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "50Mi"
-          limits:
-            cpu: "100m"
-            memory: "50Mi"
-        volumeMounts:
-        - name: cnibin
-          mountPath: /host/opt/cni/bin
-      volumes:
-        - name: cnibin
-          hostPath:
-            path: /opt/cni/bin
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-ns.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-ns.yaml
deleted file mode 100644
index bfe55b30d9..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriov-ns.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: sriov
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-config.yaml.in b/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-config.yaml.in
deleted file mode 100644
index 5e97881681..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-config.yaml.in
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sriovdp-config
-  namespace: kube-system
-data:
-  config.json: |
-    {
-      "resourceList": [{
-        "resourceName": "$RESOURCE_NAME",
-        "selectors": {
-          "drivers": $DRIVERS,
-          "pfNames": $PF_NAMES
-        }
-      }]
-    }
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-daemonset.yaml b/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-daemonset.yaml
deleted file mode 100644
index 322a223977..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/manifests/sriovdp-daemonset.yaml
+++ /dev/null
@@ -1,221 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: sriov-device-plugin
-  namespace: kube-system
-
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-device-plugin-amd64
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriovdp
-spec:
-  selector:
-    matchLabels:
-      name: sriov-device-plugin
-  template:
-    metadata:
-      labels:
-        name: sriov-device-plugin
-        tier: node
-        app: sriovdp
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
-      tolerations:
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
-      serviceAccountName: sriov-device-plugin
-      containers:
-      - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.4.0
-        imagePullPolicy: IfNotPresent
-        args:
-        - --log-dir=sriovdp
-        - --log-level=10
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "250m"
-            memory: "40Mi"
-          limits:
-            cpu: 1
-            memory: "200Mi"
-        volumeMounts:
-        - name: devicesock
-          mountPath: /var/lib/kubelet/
-          readOnly: false
-        - name: log
-          mountPath: /var/log
-        - name: config-volume
-          mountPath: /etc/pcidp
-        - name: device-info
-          mountPath: /var/run/k8s.cni.cncf.io/devinfo/dp
-      volumes:
-        - name: devicesock
-          hostPath:
-            path: /var/lib/kubelet/
-        - name: log
-          hostPath:
-            path: /var/log
-        - name: device-info
-          hostPath:
-            path: /var/run/k8s.cni.cncf.io/devinfo/dp
-            type: DirectoryOrCreate
-        - name: config-volume
-          configMap:
-            name: sriovdp-config
-            items:
-            - key: config.json
-              path: config.json
-
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-device-plugin-ppc64le
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriovdp
-spec:
-  selector:
-    matchLabels:
-      name: sriov-device-plugin
-  template:
-    metadata:
-      labels:
-        name: sriov-device-plugin
-        tier: node
-        app: sriovdp
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        beta.kubernetes.io/arch: ppc64le
-      tolerations:
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
-      serviceAccountName: sriov-device-plugin
-      containers:
-      - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-ppc64le
-        imagePullPolicy: IfNotPresent
-        args:
-        - --log-dir=sriovdp
-        - --log-level=10
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "250m"
-            memory: "40Mi"
-          limits:
-            cpu: 1
-            memory: "200Mi"
-        volumeMounts:
-        - name: devicesock
-          mountPath: /var/lib/kubelet/
-          readOnly: false
-        - name: log
-          mountPath: /var/log
-        - name: config-volume
-          mountPath: /etc/pcidp
-        - name: device-info
-          mountPath: /var/run/k8s.cni.cncf.io/devinfo/dp
-      volumes:
-        - name: devicesock
-          hostPath:
-            path: /var/lib/kubelet/
-        - name: log
-          hostPath:
-            path: /var/log
-        - name: device-info
-          hostPath:
-            path: /var/run/k8s.cni.cncf.io/devinfo/dp
-            type: DirectoryOrCreate
-        - name: config-volume
-          configMap:
-            name: sriovdp-config
-            items:
-            - key: config.json
-              path: config.json
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-device-plugin-arm64
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriovdp
-spec:
-  selector:
-    matchLabels:
-      name: sriov-device-plugin
-  template:
-    metadata:
-      labels:
-        name: sriov-device-plugin
-        tier: node
-        app: sriovdp
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        beta.kubernetes.io/arch: arm64
-      tolerations:
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
-      serviceAccountName: sriov-device-plugin
-      containers:
-      - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-arm64
-        imagePullPolicy: IfNotPresent
-        args:
-        - --log-dir=sriovdp
-        - --log-level=10
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "250m"
-            memory: "40Mi"
-          limits:
-            cpu: 1
-            memory: "200Mi"
-        volumeMounts:
-        - name: devicesock
-          mountPath: /var/lib/kubelet/
-          readOnly: false
-        - name: log
-          mountPath: /var/log
-        - name: config-volume
-          mountPath: /etc/pcidp
-        - name: device-info
-          mountPath: /var/run/k8s.cni.cncf.io/devinfo/dp
-      volumes:
-        - name: devicesock
-          hostPath:
-            path: /var/lib/kubelet/
-        - name: log
-          hostPath:
-            path: /var/log
-        - name: device-info
-          hostPath:
-            path: /var/run/k8s.cni.cncf.io/devinfo/dp
-            type: DirectoryOrCreate
-        - name: config-volume
-          configMap:
-            name: sriovdp-config
-            items:
-            - key: config.json
-              path: config.json
diff --git a/cluster-up/cluster/kind-sriov/sriov-components/sriov_components.sh b/cluster-up/cluster/kind-sriov/sriov-components/sriov_components.sh
deleted file mode 100644
index 23d87aeee6..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-components/sriov_components.sh
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/bin/bash
-
-MANIFESTS_DIR="${KUBEVIRTCI_PATH}/cluster/${KUBEVIRT_PROVIDER}/sriov-components/manifests"
-
-KUSTOMIZE_MULTUS_DIR="${MANIFESTS_DIR}/multus"
-MULTUS_MANIFEST="${CUSTOM_MANIFESTS}/multus.yaml"
-
-CUSTOM_MANIFESTS="${KUBEVIRTCI_CONFIG_PATH}/${KUBEVIRT_PROVIDER}/manifests"
-SRIOV_COMPONENTS_MANIFEST="${CUSTOM_MANIFESTS}/sriov-components.yaml"
-
-SRIOV_DEVICE_PLUGIN_CONFIG_TEMPLATE="${MANIFESTS_DIR}/sriovdp-config.yaml.in"
-SRIOV_DEVICE_PLUGIN_CONFIG="${CUSTOM_MANIFESTS}/sriovdp-config.yaml"
-
-PATCH_SRIOVDP_RESOURCE_PREFIX_TEMPLATE="${MANIFESTS_DIR}/patch-sriovdp-resource-prefix.yaml.in"
-PATCH_SRIOVDP_RESOURCE_PREFIX="${CUSTOM_MANIFESTS}/patch-sriovdp-resource-prefix.yaml"
-
-PATCH_NODE_SELECTOR_TEMPLATE="${MANIFESTS_DIR}/patch-node-selector.yaml.in"
-PATCH_NODE_SELECTOR="${CUSTOM_MANIFESTS}/patch-node-selector.yaml"
-
-KUBECONFIG="${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubeconfig"
-KUBECTL="${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubectl --kubeconfig=${KUBECONFIG}"
-
-function _kubectl() {
-    ${KUBECTL} "$@"
-}
-
-function _retry() {
-  local -r tries=$1
-  local -r wait_time=$2
-  local -r action=$3
-  local -r wait_message=$4
-  local -r waiting_action=$5
-
-  eval $action
-  local return_code=$?
-  for i in $(seq $tries); do
-    if [[ $return_code -ne 0 ]]; then
-      echo "[$i/$tries] $wait_message"
-      eval $waiting_action
-      sleep $wait_time
-      eval $action
-      return_code=$?
-    else
-      return 0
-    fi
-  done
-
-  return 1
-}
-
-function _check_all_pods_ready() {
-  all_pods_ready_condition=$(_kubectl get pods -A --no-headers -o custom-columns=':.status.conditions[?(@.type == "Ready")].status')
-  if [ "$?" -eq 0 ]; then
-    pods_not_ready_count=$(grep -cw False <<<"$all_pods_ready_condition")
-    if [ "$pods_not_ready_count" -eq 0 ]; then
-      return 0
-    fi
-  fi
-
-  return 1
-}
-
-# not using kubectl wait since with the sriov operator the pods get restarted a couple of times and this is
-# more reliable
-function sriov_components::wait_pods_ready() {
-  local -r tries=30
-  local -r wait_time=10
-
-  local -r wait_message="Waiting for all pods to become ready.."
-  local -r error_message="Not all pods were ready after $(($tries * $wait_time)) seconds"
-
-  local -r get_pods='_kubectl get pods --all-namespaces'
-  local -r action="_check_all_pods_ready"
-
-  set +x
-  trap "set -x" RETURN
-
-  if ! _retry "$tries" "$wait_time" "$action" "$wait_message" "$get_pods"; then
-    echo $error_message
-    return 1
-  fi
-
-  echo "all pods are ready"
-  return 0
-}
-
-function sriov_components::wait_allocatable_resource() {
-  local -r node=$1
-  local resource_name=$2
-  local -r expected_value=$3
-
-  local -r tries=48
-  local -r wait_time=10
-
-  local -r wait_message="wait for $node node to have allocatable resource: $resource_name: $expected_value"
-  local -r error_message="node $node doesnt have allocatable resource $resource_name:$expected_value"
-
-  # it is necessary to add '\' before '.' in the resource name.
-  resource_name=$(echo $resource_name | sed s/\\./\\\\\./g)
-  local -r action='_kubectl get node $node -ocustom-columns=:.status.allocatable.$resource_name --no-headers | grep -w $expected_value'
-
-  if ! _retry $tries $wait_time "$action" "$wait_message"; then
-    echo $error_message
-    return 1
-  fi
-
-  return 0
-}
-
-function sriov_components::deploy_multus() {
-  _kubectl kustomize "$KUSTOMIZE_MULTUS_DIR" > "$MULTUS_MANIFEST"
-
-  echo "Deploying Multus:"
-  cat "$MULTUS_MANIFEST"
-
-  _kubectl apply -f "$MULTUS_MANIFEST"
-
-  return 0
-}
-
-function sriov_components::deploy() {
-  local -r pf_names=$1
-  local -r drivers=$2
-  local -r resource_prefix=$3
-  local -r resource_name=$4
-  local -r label_key=$5
-  local -r label_value=$6
-
-  _create_custom_manifests_dir 
-  _prepare_node_selector_patch "$label_key" "$label_value"
-  _prepare_sriovdp_resource_prefix_patch "$resource_prefix"
-  _prepare_device_plugin_config \
-    "$pf_names" \
-    "$resource_name" \
-    "$drivers"
-  _deploy_sriov_components
-
-  return 0
-}
-
-function _create_custom_manifests_dir() {
-  mkdir -p "$CUSTOM_MANIFESTS"
-
-  cp -f $(find "$MANIFESTS_DIR"/*.yaml) "$CUSTOM_MANIFESTS"
-
-  return 0
-}
-
-function _prepare_node_selector_patch() {
-  local -r label_key=$1
-  local -r label_value=$2
-
-  (
-    export LABEL_KEY=$label_key
-    export LABEL_VALUE=$label_value
-    envsubst < "$PATCH_NODE_SELECTOR_TEMPLATE" > "$PATCH_NODE_SELECTOR"
-  )
-}
-
-function _prepare_sriovdp_resource_prefix_patch() {
-  local -r resource_prefix=$1
-
-  (
-    export RESOURCE_PREFIX=$resource_prefix
-    envsubst < "$PATCH_SRIOVDP_RESOURCE_PREFIX_TEMPLATE" > "$PATCH_SRIOVDP_RESOURCE_PREFIX"
-  )
-}
-
-function _prepare_device_plugin_config() {
-  local -r pf_names=$1
-  local -r resource_name=$2
-  local -r drivers=$3
-
-  (
-    export RESOURCE_NAME=$resource_name
-    export DRIVERS=$(_format_json_array "$drivers")
-    export PF_NAMES=$(_format_json_array "$pf_names")
-    envsubst < "$SRIOV_DEVICE_PLUGIN_CONFIG_TEMPLATE" > "$SRIOV_DEVICE_PLUGIN_CONFIG"
-  )
-
-  return 0
-}
-
-function _format_json_array() {
-  local -r string=$1
-
-  local json_array="$string"
-  # Replace all spaces with ",": aa bb -> aa","bb
-  local -r replace='","'
-  json_array="${json_array// /$replace}"
-
-  # Add opening quotes for first element, and closing quotes for last element
-  # aa","bb -> "aa","bb"
-  json_array="\"${json_array}\""
-
-  # Add brackets: "aa","bb" -> ["aa","bb"]
-  json_array="[${json_array}]"
-
-  echo "$json_array"
-}
-
-function _deploy_sriov_components() {
-  _kubectl kustomize "$CUSTOM_MANIFESTS" >"$SRIOV_COMPONENTS_MANIFEST"
-
-  echo "Deploying SRIOV components:"
-  cat "$SRIOV_COMPONENTS_MANIFEST"
-
-  _kubectl apply -f "$SRIOV_COMPONENTS_MANIFEST"
-
-  return 0
-}
-
diff --git a/cluster-up/cluster/kind-sriov/sriov-node/configure_vfs.sh b/cluster-up/cluster/kind-sriov/sriov-node/configure_vfs.sh
deleted file mode 100755
index 0312a97591..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-node/configure_vfs.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/bash
-
-set -ex
-
-function configure_vf_driver() {
-  local -r vf_sys_device=$1
-  local -r driver=$2
-
-  vf_pci_address=$(basename $vf_sys_device)
-  # Check if a VF is bound to a different driver
-  if [ -d "$vf_sys_device/driver" ]; then
-    vf_bus_pci_device_driver=$(readlink -e $vf_sys_device/driver)
-    vf_driver_name=$(basename $vf_bus_pci_device_driver)
-
-    # Check if VF already configured with supported driver
-    if [[ $vf_driver_name == $driver ]]; then
-      return
-    else
-      echo "Unbind VF $vf_pci_address from $vf_driver_name driver"
-      echo "$vf_pci_address" >> "$vf_bus_pci_device_driver/unbind"
-    fi
-  fi
-
-  echo "Bind VF $vf_pci_address to $driver driver"
-  echo "$driver" >> "$vf_sys_device/driver_override"
-  echo "$vf_pci_address" >> "/sys/bus/pci/drivers/$driver/bind"
-  echo "" >> "$vf_sys_device/driver_override"
-
-  return 0
-}
-
-function create_vfs() {
-  local -r pf_net_device=$1
-  local -r vfs_count=$2
-
-  local -r pf_name=$(basename $pf_net_device)
-  local -r pf_sys_device=$(readlink -e $pf_net_device)
-
-  local -r sriov_totalvfs_content=$(cat $pf_sys_device/sriov_totalvfs)
-  [ $sriov_totalvfs_content -lt $vfs_count ] && \
-    echo "FATAL: PF $pf_name, VF's count should be up to sriov_totalvfs: $sriov_totalvfs_content" >&2 && return 1
-
-  echo "Creating $vfs_count VFs on PF $pf_name "
-  echo 0 >> "$pf_sys_device/sriov_numvfs"
-  echo "$vfs_count" >> "$pf_sys_device/sriov_numvfs"
-  sleep 3
-
-  return 0
-}
-
-function validate_run_with_sudo() {
-  [ "$(id -u)" -ne 0 ] && echo "FATAL: This script requires sudo privileges" >&2 && return 1
-
-  return 0
-}
-
-function validate_sysfs_mount_as_rw() {
-  local -r sysfs_permissions=$(grep -Po 'sysfs.*\K(ro|rw)' /proc/mounts)
-  [ "$sysfs_permissions" != rw ] && echo "FATAL: sysfs is read-only, try to remount as RW" >&2 && return 1
-
-  return 0
-}
-
-function ensure_driver_is_loaded() {
-  local -r driver_name=$1
-  local -r module_name=$2
-
-  if ! grep "$module_name" /proc/modules; then
-    if ! modprobe "$driver_name"; then
-      echo "FATAL: failed to load $DRIVER kernel module $DRIVER_KMODULE" >&2 && return 1
-    fi
-  fi
-
-  return 0
-}
-
-DRIVER="${DRIVER:-vfio-pci}"
-DRIVER_KMODULE="${DRIVER_KMODULE:-vfio_pci}"
-VFS_COUNT=${VFS_COUNT:-6}
-
-[ $((VFS_COUNT)) -lt 1 ] && echo "INFO: VFS_COUNT is lower then 1, nothing to do..." && exit 0
-
-validate_run_with_sudo
-validate_sysfs_mount_as_rw
-ensure_driver_is_loaded $DRIVER $DRIVER_KMODULE
-
-sriov_pfs=( $(find /sys/class/net/*/device/sriov_numvfs) )
-[ "${#sriov_pfs[@]}" -eq 0 ] && echo "FATAL: Could not find available sriov PFs" >&2 && exit 1
-
-for pf_name in $sriov_pfs; do
-  pf_device=$(dirname "$pf_name")
-
-  echo "Create VF's"
-  create_vfs "$pf_device" "$VFS_COUNT"
-
-  echo "Configuring VF's drivers"
-  # /sys/class/net/<pf name>/device/virtfn*
-  vfs_sys_devices=$(readlink -e $pf_device/virtfn*)
-  for vf in $vfs_sys_devices; do
-    configure_vf_driver "$vf" $DRIVER
-    ls -l "$vf/driver"
-  done
-done
diff --git a/cluster-up/cluster/kind-sriov/sriov-node/node.sh b/cluster-up/cluster/kind-sriov/sriov-node/node.sh
deleted file mode 100644
index 8d1a997c24..0000000000
--- a/cluster-up/cluster/kind-sriov/sriov-node/node.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-SCRIPT_PATH=${SCRIPT_PATH:-$(dirname "$(realpath "$0")")}
-
-CONFIGURE_VFS_SCRIPT_PATH="${SCRIPT_PATH}/configure_vfs.sh"
-PFS_IN_USE=${PFS_IN_USE:-}
-
-function node::discover_host_pfs() {
-  local -r sriov_pfs=( $(find /sys/class/net/*/device/sriov_numvfs) )
-  [ "${#sriov_pfs[@]}" -eq 0 ] && echo "FATAL: Could not find available sriov PFs on host" >&2 && return 1
-
-  local pf_name
-  local pf_names=()
-  for pf in "${sriov_pfs[@]}"; do
-    pf_name="${pf%%/device/*}"
-    pf_name="${pf_name##*/}"
-    if [ $(echo "${PF_BLACKLIST[@]}" | grep "${pf_name}") ]; then
-      continue
-    fi
-
-    pfs_names+=( $pf_name )
-  done
-
-  echo "${pfs_names[@]}"
-}
-
-# node::configure_sriov_pfs moves SR-IOV PFs to nodes netns.
-# It exports 'PFS_IN_USE' environment variable with a list
-# of SR-IOV PFs that been moved to the nodes netns.
-function node::configure_sriov_pfs() {
-  local -r nodes_array=($1)
-  local -r pfs_names_array=($2)
-  local -r pf_count_per_node=$3
-  local -r pfs_in_use_var_name=$4
-
-  local pfs_to_move=()
-  local pfs_array_offset=0
-  local pfs_in_use=()
-  local node_exec
-
-  # 'iplink' learns which network namespaces there are by checking /var/run/netns
-  mkdir -p /var/run/netns
-  for node in "${nodes_array[@]}"; do
-    prepare_node_netns "$node"
-
-    ## Move PF's to node netns
-    # Slice '$pfs_names_array' to have unique silce for each node
-    # with '$pf_count_per_node' PF's names
-    pfs_to_move=( "${pfs_names_array[@]:$pfs_array_offset:$pf_count_per_node}" )
-    echo "Moving '${pfs_to_move[*]}' PF's to '$node' netns"
-    for pf_name in "${pfs_to_move[@]}"; do
-      move_pf_to_node_netns "$node" "$pf_name"
-    done
-    # Increment the offset for next slice
-    pfs_array_offset=$((pfs_array_offset + pf_count_per_node))
-    pfs_in_use+=( $pf_name )
-
-    # KIND mounts sysfs as read-only by default, remount as R/W"
-    node_exec="${CRI_BIN} exec $node"
-    $node_exec mount -o remount,rw /sys
-
-    ls_node_dev_vfio="${node_exec} ls -la -Z /dev/vfio"
-    $ls_node_dev_vfio
-    $node_exec chmod 0666 /dev/vfio/vfio
-    $ls_node_dev_vfio
-
-    _kubectl label node $node $SRIOV_NODE_LABEL
-  done
-
-  # Set new variable with the used PF names that will consumed by the caller
-  eval $pfs_in_use_var_name="'${pfs_in_use[*]}'"
-}
-
-# node::configure_sriov_vfs create SR-IOV VFs and configure their driver on each node.
-function node::configure_sriov_vfs() {
-    local -r nodes_array=($1)
-    local -r driver=$2
-    local -r driver_kmodule=$3
-    local -r vfs_count=$4
-
-    local -r config_vf_script=$(basename "$CONFIGURE_VFS_SCRIPT_PATH")
-
-    for node in "${nodes_array[@]}"; do
-      ${CRI_BIN} cp "$CONFIGURE_VFS_SCRIPT_PATH" "$node:/"
-      ${CRI_BIN} exec "$node" bash -c "DRIVER=$driver DRIVER_KMODULE=$driver_kmodule VFS_COUNT=$vfs_count ./$config_vf_script"
-      ${CRI_BIN} exec "$node" ls -la -Z /dev/vfio
-    done
-}
-
-function prepare_node_netns() {
-  local -r node_name=$1
-  local -r node_pid=$($CRI_BIN inspect -f '{{.State.Pid}}' "$node_name")
-
-  # Docker does not create the required symlink for a container netns
-  # it perverts iplink from learning that container netns.
-  # Thus it is necessary to create symlink between the current
-  # worker node (container) netns to /var/run/netns (consumed by iplink)
-  # Now the node container netns named with the node name will be visible.
-  ln -sf "/proc/$node_pid/ns/net" "/var/run/netns/$node_name"
-}
-
-function move_pf_to_node_netns() {
-  local -r node_name=$1
-  local -r pf_name=$2
-
-  # Move PF to node network-namespace
-  ip link set "$pf_name" netns "$node_name"
-  # Ensure current PF is up
-  ip netns exec "$node_name" ip link set up dev "$pf_name"
-  ip netns exec "$node_name" ip link show
-}
-
-function node::total_vfs_count() {
-  local -r node_name=$1
-  local -r node_pid=$($CRI_BIN inspect -f '{{.State.Pid}}' "$node_name")
-  local -r pfs_sriov_numvfs=( $(cat /proc/$node_pid/root/sys/class/net/*/device/sriov_numvfs) )
-  local total_vfs_on_node=0
-
-  for num_vfs in "${pfs_sriov_numvfs[@]}"; do
-    total_vfs_on_node=$((total_vfs_on_node + num_vfs))
-  done
-
-  echo "$total_vfs_on_node"
-}
diff --git a/cluster-up/cluster/kind-sriov/sriovdp_setup.sh b/cluster-up/cluster/kind-sriov/sriovdp_setup.sh
deleted file mode 100755
index 2eed8318f2..0000000000
--- a/cluster-up/cluster/kind-sriov/sriovdp_setup.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-get_sriov_pci_root_addresses() {
-  for dir in $(find /sys/devices/ -name sriov_totalvfs -exec dirname {} \;); do
-    if [ $(cat $dir/sriov_numvfs) -gt 0 ]; then
-      # use perl because sed doesn't support non-greedy matching
-      basename $dir | perl -pe 's|(.*?:)(.*)|\2|'
-    fi
-  done
-}
-
-create_pci_string() {
-  local quoted_values=($(echo "${pci_addresses[@]}" | xargs printf "\"%s\" "  ))
-  local quoted_as_string=${quoted_values[@]}
-  if [ "$quoted_as_string" = "\"\"" ]; then
-    pci_string=""
-  else
-    pci_string=${quoted_as_string// /, }
-  fi
-}
-
-sriov_device_plugin() {
-  pci_addresses=$(get_sriov_pci_root_addresses)
-  create_pci_string
-
-  cat <<EOF > /etc/pcidp/config.json
-{
-    "resourceList":
-    [
-        {
-            "resourceName": "sriov",
-            "rootDevices": [$pci_string],
-            "sriovMode": true,
-            "deviceType": "vfio"
-        }
-    ]
-}
-EOF
-}
-
-mkdir -p /etc/pcidp
-sriov_device_plugin