diff --git a/Sanity/DAST_test/runtest.sh b/Sanity/DAST_test/runtest.sh
index 539e267..20e10de 100755
--- a/Sanity/DAST_test/runtest.sh
+++ b/Sanity/DAST_test/runtest.sh
@@ -32,6 +32,10 @@
 
 rlJournalStart
     rlPhaseStartSetup
+        if [ -z "${OPERATOR_NAME}" ];
+        then
+            OPERATOR_NAME=tang-operator
+        fi
         rlRun 'rlImport "common-cloud-orchestration/ocpop-lib"' || rlDie "cannot import ocpop lib"
         rlRun ". ../../TestHelpers/functions.sh" || rlDie "cannot import function script"
         TO_DAST_POD_COMPLETED=300 #seconds (DAST lasts around 120 seconds)
@@ -59,7 +63,12 @@ rlJournalStart
 
         # 3 - download configuration file template
         # WARNING: if tang-operator is changed to OpenShift organization, change this
-        rlRun "curl -o tang_operator.yaml https://raw.githubusercontent.com/latchset/tang-operator/main/tools/scan_tools/tang_operator_template.yaml"
+        if [ -z "${KONFLUX}" ];
+        then
+            rlRun "curl -o tang_operator.yaml https://raw.githubusercontent.com/latchset/tang-operator/main/tools/scan_tools/tang_operator_template.yaml"
+        else
+            rlRun "curl -o tang_operator.yaml https://raw.githubusercontent.com/openshift/nbde-tang-server/main/tools/scan_tools/tang_operator_template.yaml"
+        fi
 
         # 4 - adapt configuration file template (token, machine)
         if [ "${EXECUTION_MODE}" == "MINIKUBE" ];
@@ -67,12 +76,12 @@ rlJournalStart
             API_HOST_PORT=$(minikube ip)
             DEFAULT_TOKEN="TEST_TOKEN_UNREQUIRED_IN_MINIKUBE"
         else
-            API_HOST_PORT=$("${OC_CLIENT}" whoami --show-server | tr -d  ' ')
+            API_HOST_PORT=$("${OC_CLIENT}" whoami --show-server | tr -d  ' ' | sed -e s@https://@@g)
             DEFAULT_TOKEN=$("${OC_CLIENT}" get secret -n "${OPERATOR_NAMESPACE}" "$("${OC_CLIENT}" get secret -n "${OPERATOR_NAMESPACE}"\
-                            | grep ^tang-operator | grep service-account | awk '{print $1}')" -o json | jq -Mr '.data.token' | base64 -d)
+                            | grep ^${OPERATOR_NAME} | grep service-account | awk '{print $1}')" -o json | jq -Mr '.data.token' | base64 -d)
 	    test -z "${DEFAULT_TOKEN}" &&\
 		DEFAULT_TOKEN=$("${OC_CLIENT}" get secret -n  "${OPERATOR_NAMESPACE}" $("${OC_CLIENT}" get secret -n "${OPERATOR_NAMESPACE}"\
-		            | grep ^tang-operator | awk '{print $1}') -o json | jq -M '.data | .[]' | tr -d '"')
+		            | grep ^${OPERATOR_NAME} | awk '{print $1}') -o json | jq -M '.data | .[]' | tr -d '"')
             echo "API_HOST_PORT=${API_HOST_PORT}"
             echo "DEFAULT_TOKEN=${DEFAULT_TOKEN}"
         fi
@@ -88,9 +97,10 @@ rlJournalStart
         pushd rapidast || exit
         sed -i s@"kubectl --kubeconfig=./kubeconfig "@"${OC_CLIENT} "@g helm/results.sh
         sed -i s@"secContext: '{}'"@"secContext: '{\"privileged\": true}'"@ helm/chart/values.yaml
-        sed -i s@'tag: "latest"'@'tag: "2.6.0"'@g helm/chart/values.yaml
+        sed -i s@'tag: "latest"'@'tag: "2.8.0"'@g helm/chart/values.yaml
 
         # 6 - run rapidast on adapted configuration file (via helm)
+        helm uninstall rapidast
         rlRun -c "helm install rapidast ./helm/chart/ --set-file rapidastConfig=${tmpdir}/tang_operator.yaml 2>/dev/null" 0 "Installing rapidast helm chart"
         pod_name=$(ocpopGetPodNameWithPartialName "rapidast" "default" 5 1)
         rlRun "ocpopCheckPodState Completed ${TO_DAST_POD_COMPLETED} default ${pod_name}" 0 "Checking POD ${pod_name} in Completed state [Timeout=${TO_DAST_POD_COMPLETED} secs.]"
diff --git a/Sanity/key_management_test/runtest.sh b/Sanity/key_management_test/runtest.sh
index 368e755..65fc8fd 100755
--- a/Sanity/key_management_test/runtest.sh
+++ b/Sanity/key_management_test/runtest.sh
@@ -36,7 +36,10 @@ rlJournalStart
         rlRun ". ../../TestHelpers/functions.sh" || rlDie "cannot import function script"
         TO_ACTIVE_KEYS=60 #seconds
         TO_HIDDEN_KEYS=60 #seconds
-
+        if [ -z "${OPERATOR_NAME}" ];
+        then
+            OPERATOR_NAME=tang-operator
+        fi
         rlRun "${OC_CLIENT} apply -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml" 0 "Creating key management test pv"
         rlRun "${OC_CLIENT} apply -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml" 0 "Creating key management test tangserver"
         rlRun "ocpopCheckPodAmount 1 ${TO_POD_START} ${TEST_NAMESPACE}" 0 "Checking 1 POD is started [Timeout=${TO_POD_START} secs.]"
@@ -75,6 +78,7 @@ rlJournalStart
         rlRun "${OC_CLIENT} apply -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml" 0 "Creating multiple key management test pv"
         rlRun "${OC_CLIENT} apply -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml" 0 "Creating multiple key management test tangserver"
         sed "s/{{OPERATOR_NAMESPACE}}/${OPERATOR_NAMESPACE}/g" < "${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml" | ${OC_CLIENT} apply -f -
+        sed "s/{{OPERATOR_NAME}}/${OPERATOR_NAME}/g" < $TANG_FUNCTION_DIR/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml | ${OC_CLIENT} apply -f -
         rlRun "ocpopCheckPodAmount 3 ${TO_POD_START} ${TEST_NAMESPACE}" 0 "Checking 3 PODs are started [Timeout=${TO_POD_START} secs.]"
         pod1_name=$(ocpopGetPodNameWithPartialName "tang" "${TEST_NAMESPACE}" 5 1)
         pod2_name=$(ocpopGetPodNameWithPartialName "tang" "${TEST_NAMESPACE}" 5 2)
@@ -88,6 +92,7 @@ rlJournalStart
         rlRun "${OC_CLIENT} delete -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml" 0 "Deleting key management test tangserver"
         rlRun "${OC_CLIENT} delete -f ${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml" 0 "Deleting key management test pv"
         sed "s/{{OPERATOR_NAMESPACE}}/${OPERATOR_NAMESPACE}/g" < "${TANG_FUNCTION_DIR}/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml" | ${OC_CLIENT} delete -f -
+        sed "s/{{OPERATOR_NAME}}/${OPERATOR_NAME}/g" < $TANG_FUNCTION_DIR/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml | ${OC_CLIENT} delete -f -
         rlRun "ocpopCheckPodAmount 0 ${TO_POD_STOP} ${TEST_NAMESPACE}" 0 "Checking no PODs continue running [Timeout=${TO_POD_STOP} secs.]"
         rlRun "ocpopCheckServiceAmount 0 ${TO_SERVICE_STOP} ${TEST_NAMESPACE}" 0 "Checking no Services continue running [Timeout=${TO_SERVICE_STOP} secs.]"
     rlPhaseEnd
diff --git a/Sanity/malware_detection_test/runtest.sh b/Sanity/malware_detection_test/runtest.sh
index c0ab9fd..0b1793c 100755
--- a/Sanity/malware_detection_test/runtest.sh
+++ b/Sanity/malware_detection_test/runtest.sh
@@ -33,6 +33,10 @@ rlJournalStart
     ############# MALWARE DETECTION TESTS ############
     ### Only execute if podman and clamscan commands exist ...
         rlPhaseStartTest "Malware Detection Testing"
+            if [ -z "${OPERATOR_NAME}" ];
+            then
+                OPERATOR_NAME=tang-operator
+            fi
             rlRun 'rlImport "common-cloud-orchestration/ocpop-lib"' || rlDie "cannot import ocpop lib"
             rlRun ". ../../TestHelpers/functions.sh" || rlDie "cannot import function script"
             installed_version=$(ocpopGetVersion)
@@ -42,7 +46,7 @@ rlJournalStart
             ### Bundle Image
             analyzeVersion "${installed_version}"
             ### Container Image
-            controller_name=$(ocpopGetPodNameWithPartialName "tang-operator-controller" "${OPERATOR_NAMESPACE}" 1)
+            controller_name=$(ocpopGetPodNameWithPartialName "${OPERATOR_NAME}-controller" "${OPERATOR_NAMESPACE}" 1)
             rlAssertNotEquals "Checking controller_name is not empty" "${controller_name}" ""
             container_image=$("${OC_CLIENT}" -n "${OPERATOR_NAMESPACE}" describe pod "${controller_name}" | grep tang | tr -d ' ' | grep "^Image:" | awk -F "Image:" '{print $2}' | tail -1)
             if [[ $container_image == *"registry.redhat.io"* ]];then
diff --git a/Setup/clean_cluster/runtest.sh b/Setup/clean_cluster/runtest.sh
index 7423d8e..103d2d4 100755
--- a/Setup/clean_cluster/runtest.sh
+++ b/Setup/clean_cluster/runtest.sh
@@ -31,18 +31,22 @@
 
 rlJournalStart
     rlPhaseStartCleanup
+        if [ -z "${OPERATOR_NAME}" ];
+        then
+            OPERATOR_NAME=tang-operator
+        fi
         rlRun 'rlImport "common-cloud-orchestration/ocpop-lib"' || rlDie "cannot import ocpop lib"
         rlRun ". ../../TestHelpers/functions.sh" || rlDie "cannot import function script"
         TO_POD_CONTROLLER_TERMINATE=180 #seconds (for controller to end must wait longer)
 
         rlRun "ocpopCheckClusterStatus" 0 "Checking cluster status"
-        controller_name=$(ocpopGetPodNameWithPartialName "tang-operator-controller" "${OPERATOR_NAMESPACE}" 1)
+        controller_name=$(ocpopGetPodNameWithPartialName "${OPERATOR_NAME}-controller" "${OPERATOR_NAMESPACE}" 1)
         ocpopLogVerbose "Controller name:[${controller_name}]"
         if [ -n "${DOWNSTREAM_IMAGE_VERSION}" ] && [ "${DISABLE_BUNDLE_INSTALL_TESTS}" != "1" ];
         then
             rlRun "uninstallDownstreamVersion" 0 "Uninstalling downstream version"
         fi
-        rlRun "bundleStop" 0 "Cleaning installed tang-operator"
+        rlRun "ocpopBundleStop" 0 "Cleaning installed operator"
         if [ "${DISABLE_BUNDLE_INSTALL_TESTS}" != "1" ] && [ "${DISABLE_BUNDLE_UNINSTALL_TESTS}" != "1" ];
         then
           test -z "${controller_name}" ||
diff --git a/Setup/creating_test_namespace/runtest.sh b/Setup/creating_test_namespace/runtest.sh
index acf6df1..498e50d 100755
--- a/Setup/creating_test_namespace/runtest.sh
+++ b/Setup/creating_test_namespace/runtest.sh
@@ -30,19 +30,25 @@
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 TIMEOUT_CONTROLLER_KEEPS_RUNNING=10
+if [ -z "${OPERATOR_NAME}" ];
+then
+    export OPERATOR_NAME=tang-operator
+fi
 
 rlJournalStart
     rlPhaseStartSetup
+        rlLog "OPERATOR_NAME=${OPERATOR_NAME}"
         rlRun 'rlImport "common-cloud-orchestration/ocpop-lib"' || rlDie "cannot import ocpop lib"
         rlRun ". ../../TestHelpers/functions.sh" || rlDie "cannot import function script"
         ocpopDumpDate
         ocpopDumpInfo
+        checkKonflux
         rlRun "ocpopDumpOpenShiftClientStatus" 0 "Checking OpenshiftClient installation"
         rlRun "operator-sdk version > /dev/null" 0 "Checking operator-sdk installation"
         rlRun "ocpopCheckClusterStatus" 0 "Checking cluster status"
         # In case previous execution was abruptelly stopped:
-        rlRun "bundleInitialStop" 0 "Cleaning already installed tang-operator (if any)"
-        rlRun "bundleStart" 0 "Installing tang-operator-bundle version:${VERSION}"
+        rlRun "ocpopBundleInitialStop" 0 "Cleaning already installed operator (if any)"
+        rlRun "bundleStart" 0 "Installing ${OPERATOR_NAME}-bundle version:${VERSION}"
         rlRun "${OC_CLIENT} apply -f ${TEST_NAMESPACE_FILE}" 0 "Creating test namespace:${TEST_NAMESPACE}"
         rlRun "${OC_CLIENT} get namespace ${TEST_NAMESPACE}" 0 "Checking test namespace:${TEST_NAMESPACE}"
         #go through all the files and set substition for TANG_IMAGE keyword
@@ -53,7 +59,8 @@ rlJournalStart
 
     rlPhaseStartTest "Controller runs appropriately"
         ########## CHECK CONTROLLER RUNS WITH NO ERRORS #########
-        controller_name=$(ocpopGetPodNameWithPartialName "tang-operator-controller" "${OPERATOR_NAMESPACE}" "${TO_POD_START}")
+        rlLog "OPERATOR_NAME=${OPERATOR_NAME}"
+        controller_name=$(ocpopGetPodNameWithPartialName "${OPERATOR_NAME}-controller" "${OPERATOR_NAMESPACE}" "${TO_POD_START}")
         rlRun "ocpopCheckPodState Running ${TO_POD_START} ${OPERATOR_NAMESPACE} ${controller_name} Error" 0 \
               "Checking controller POD in Running [Timeout=${TO_POD_START} secs.] and not in Error state"
         rlRun "ocpopCheckPodStateAndContinues Running ${TIMEOUT_CONTROLLER_KEEPS_RUNNING} ${OPERATOR_NAMESPACE} ${controller_name}" 0 \
diff --git a/TestHelpers/functions.sh b/TestHelpers/functions.sh
index 07ac690..9790846 100755
--- a/TestHelpers/functions.sh
+++ b/TestHelpers/functions.sh
@@ -27,7 +27,6 @@
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 ### Global Test Variables
-TANG_FUNCTION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TO_BUNDLE="15m"
 TANG_FUNCTION_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TEST_NAMESPACE_PATH="${TANG_FUNCTION_DIR}/reg_test/all_test_namespace"
@@ -52,9 +51,13 @@ TO_ALL_POD_CONTROLLER_TERMINATE=120 #seconds
 TO_KEY_ROTATION=1 #seconds
 [ -n "$TANG_IMAGE" ] || TANG_IMAGE="registry.redhat.io/rhel9/tang"
 
+if [ -z "${OPERATOR_NAME}" ];
+then
+    OPERATOR_NAME=tang-operator
+fi
 test -z "${DISABLE_BUNDLE_INSTALL_TESTS}" && DISABLE_BUNDLE_INSTALL_TESTS="0"
 test -z "${DISABLE_BUNDLE_UNINSTALL_TESTS}" && DISABLE_BUNDLE_UNINSTALL_TESTS="0"
-test -z "${IMAGE_VERSION}" && IMAGE_VERSION="quay.io/sec-eng-special/tang-operator-bundle:${VERSION}"
+test -z "${IMAGE_VERSION}" && IMAGE_VERSION="quay.io/sec-eng-special/${OPERATOR_NAME}-bundle:${VERSION}"
 test -z "${CONTAINER_MGR}" && CONTAINER_MGR="podman"
 
 checkActiveKeysAmount() {
@@ -290,8 +293,12 @@ analyzeVersion() {
 }
 
 useUpstreamImages(){
-    for yaml_file in `find ${TANG_FUNCTION_DIR}/reg_test \( -iname "*.yaml" -o -iname "*.sh" \) -type f -print`
+    for yaml_file in `find ${TANG_FUNCTION_DIR}/reg_test* \( -iname "*.yaml" -o -iname "*.sh" \) -type f -print`
     do
         sed -i "s~\"registry.redhat.io/rhel9/tang\"~\"${TANG_IMAGE}\"~g" $yaml_file
     done
 }
+
+checkKonflux() {
+    pushd ${TANG_FUNCTION_DIR}; rm -v reg_test; test -z "${KONFLUX}" && ln -s reg_test_ori reg_test || ln -s reg_test_openshift_konflux reg_test; popd
+}
diff --git a/TestHelpers/reg_test b/TestHelpers/reg_test
new file mode 120000
index 0000000..d590f30
--- /dev/null
+++ b/TestHelpers/reg_test
@@ -0,0 +1 @@
+./reg_test_ori/
\ No newline at end of file
diff --git a/TestHelpers/reg_test/all_test_namespace/daemons_v1alpha1_namespace.yaml b/TestHelpers/reg_test_openshift_konflux/all_test_namespace/daemons_v1alpha1_namespace.yaml
similarity index 100%
rename from TestHelpers/reg_test/all_test_namespace/daemons_v1alpha1_namespace.yaml
rename to TestHelpers/reg_test_openshift_konflux/all_test_namespace/daemons_v1alpha1_namespace.yaml
diff --git a/TestHelpers/reg_test/all_test_namespace/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/all_test_namespace/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/all_test_namespace/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/all_test_namespace/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test/conf_test/main/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/main/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/main/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/conf_test/main/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/conf_test/main/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/main/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..171ae7e
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/conf_test/main/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-main
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  replicas: 3
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-main"
+  serviceListenPort: 9999
diff --git a/TestHelpers/reg_test/conf_test/minimal/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/minimal/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/minimal/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/conf_test/minimal/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/conf_test/minimal/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/minimal/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..0110988
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/conf_test/minimal/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  replicas: 1
diff --git a/TestHelpers/reg_test/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..b307027
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,28 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-multi1
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 2
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-multi1"
+  serviceListenPort: 9998
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-multi2
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 3
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-multi2"
+  serviceListenPort: 9999
diff --git a/TestHelpers/reg_test/func_test/key_rotation/clean_keys.sh b/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/clean_keys.sh
similarity index 100%
rename from TestHelpers/reg_test/func_test/key_rotation/clean_keys.sh
rename to TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/clean_keys.sh
diff --git a/TestHelpers/reg_test/func_test/key_rotation/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/key_rotation/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..141cf90
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-key-rotation
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
diff --git a/TestHelpers/reg_test/func_test/key_rotation/rotate_keys.sh b/TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/rotate_keys.sh
similarity index 100%
rename from TestHelpers/reg_test/func_test/key_rotation/rotate_keys.sh
rename to TestHelpers/reg_test_openshift_konflux/func_test/key_rotation/rotate_keys.sh
diff --git a/TestHelpers/reg_test/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..80bc4e0
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,28 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-functional1
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-functional1"
+  serviceListenPort: 3333
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-functional2
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-functional2"
+  serviceListenPort: 4444
diff --git a/TestHelpers/reg_test/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..1252643
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-none-cluster-ip
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  clusterIP: "None"
+  serviceType: "ClusterIP"
diff --git a/TestHelpers/reg_test/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..26ad53b
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-functional
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  persistentVolumeClaim: "tangserver-pvc-main"
+  serviceListenPort: 2222
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/api_key_rotate.sh b/TestHelpers/reg_test_openshift_konflux/key_management_test/api_key_rotate.sh
new file mode 100755
index 0000000..f210c0c
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/api_key_rotate.sh
@@ -0,0 +1,54 @@
+#!/bin/bash -e
+
+namespace=""
+
+usage() {
+  echo
+  echo "Usage:"
+  echo
+  echo "$1 -n namespace -c openshift_client"
+  echo
+  exit "$2"
+}
+
+while getopts "n:c:hv" arg
+do
+case "${arg}" in
+  n) namespace=${OPTARG}
+  ;;
+  c) oc_client=${OPTARG}
+  ;;
+  h) usage "$0" 0
+  ;;
+  v) set -x
+  ;;
+  *) usage "$0" 1
+  ;;
+esac
+done
+
+test -z "${namespace}" && namespace="default"
+test -z "${oc_client}" && oc_client="oc"
+
+sha1_1=$("${oc_client}" -n nbde get tangservers.nbde.openshift.io  -o json | jq '.items[0].status.activeKeys[0].sha1')
+replicas=$("${oc_client}" -n nbde get tangservers.nbde.openshift.io  -o json | jq '.items[0].spec.replicas')
+
+ftemp=$(mktemp)
+cat<<EOF>"${ftemp}"
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+  - finalizer.daemons.tangserver.redhat.com
+spec:
+  replicas: ${replicas}
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  hiddenKeys:
+  - sha1: ${sha1_1}
+EOF
+
+"${oc_client}" apply -f "${ftemp}" -n "${namespace}"
+rm "${ftemp}"
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/key_delete_one_keep_one.sh b/TestHelpers/reg_test_openshift_konflux/key_management_test/key_delete_one_keep_one.sh
new file mode 100755
index 0000000..a60a591
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/key_delete_one_keep_one.sh
@@ -0,0 +1,64 @@
+#!/bin/bash -e
+
+namespace=""
+
+usage() {
+  echo
+  echo "Usage:"
+  echo
+  echo "$1 -n namespace [-c k8s_client] [-v (verbose)]"
+  echo
+  exit "$2"
+}
+
+while getopts "n:c:hv" arg
+do
+case "${arg}" in
+  n) namespace=${OPTARG}
+  ;;
+  c) oc_client=${OPTARG}
+  ;;
+  h) usage "$0" 0
+  ;;
+  v) set -x
+  ;;
+  *) usage "$0" 1
+  ;;
+esac
+done
+
+test -z "${namespace}" && namespace="default"
+test -z "${oc_client}" && oc_client="oc"
+
+sha1_1=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].status.hiddenKeys[0].sha1)
+sha1_2=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].status.hiddenKeys[1].sha1)
+replicas=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].spec.replicas)
+
+if [ "${sha1_2}" == "null" ] || [ "${sha1_2}" == "" ];
+then
+  echo "Less than 2 hidden keys exist, exiting ..."
+  exit 1
+fi
+
+echo "Keeping key:[$sha1_1], deleting other keys"
+
+ftemp=$(mktemp)
+cat<<EOF>"${ftemp}"
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+  - finalizer.daemons.tangserver.redhat.com
+spec:
+  replicas: ${replicas}
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  hiddenKeys:
+  - sha1: ${sha1_1}
+EOF
+
+"${oc_client}" apply -f "${ftemp}" -n "${namespace}"
+rm "${ftemp}"
+
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/key_rotate_keep_existing.sh b/TestHelpers/reg_test_openshift_konflux/key_management_test/key_rotate_keep_existing.sh
new file mode 100755
index 0000000..5aa1179
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/key_rotate_keep_existing.sh
@@ -0,0 +1,59 @@
+#!/bin/bash -e
+
+namespace=""
+
+usage() {
+  echo
+  echo "Usage:"
+  echo
+  echo "$1 -n namespace [-c k8s_client] [-v (verbose)]"
+  echo
+  exit "$2"
+}
+
+while getopts "n:c:hv" arg
+do
+case "${arg}" in
+  n) namespace=${OPTARG}
+  ;;
+  c) oc_client=${OPTARG}
+  ;;
+  h) usage "$0" 0
+  ;;
+  v) set -x
+  ;;
+  *) usage "$0" 1
+  ;;
+esac
+done
+
+test -z "${namespace}" && namespace="default"
+test -z "${oc_client}" && oc_client="oc"
+
+sha1_1=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].status.activeKeys[0].sha1)
+# Keep the existing hidden sha1, if it does not exist, set with the active
+hsha1_1=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].status.hiddenKeys[0].sha1)
+test -z "${hsha1_1}" && hsha1_1="${hsha1_1}"
+replicas=$("${oc_client}" -n "${namespace}" get tangservers.nbde.openshift.io  -o json | jq .items[0].spec.replicas)
+
+ftemp=$(mktemp)
+cat<<EOF>"${ftemp}"
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+  - finalizer.daemons.tangserver.redhat.com
+spec:
+  replicas: ${replicas}
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  hiddenKeys:
+  - sha1: ${sha1_1}
+  - sha1: ${hsha1_1}
+EOF
+
+"${oc_client}" apply -f "${ftemp}" -n "${namespace}"
+rm "${ftemp}"
+
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml
new file mode 100644
index 0000000..f8df0f6
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pod-reader-executor-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: pod-reader-executor
+subjects:
+  - kind: ServiceAccount
+    name: <
+        {{OPERATOR_NAME}}-controller-manager
+    namespace: {{OPERATOR_NAMESPACE}}
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..2efc910
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  hiddenKeys: []
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..8a09c4b
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  replicas: 1
diff --git a/TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
diff --git a/TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..1ab8a6d
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-mini
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  replicas: 3
diff --git a/TestHelpers/reg_test/legacy_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/legacy_test/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/legacy_test/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/legacy_test/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/legacy_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/legacy_test/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..abd8325
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/legacy_test/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-legacy-test
+  namespace: nbde
+spec:
+  keyPath: /var/db
+  replicas: 1
+  image: quay.io/sarroutb/ubi_tang_server_tests
+  version: latest
diff --git a/TestHelpers/reg_test/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..c1b1133
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaledown
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  resourcesRequest:
+    cpu: "40m"
+    memory: "40M"
+  resourcesLimit:
+    cpu: "50m"
+    memory: "50M"
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..bdd7339
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaledown
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  resourcesRequest:
+    cpu: "30m"
+    memory: "30M"
+  resourcesLimit:
+    cpu: "40m"
+    memory: "40M"
diff --git a/TestHelpers/reg_test/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..f1e3955
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scalein
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 2
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..18f36ac
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scalein
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
diff --git a/TestHelpers/reg_test/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..fd6dd6e
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaleout
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..a079317
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaleout
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  replicas: 2
diff --git a/TestHelpers/reg_test/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml
rename to TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..61fce63
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaleup
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  # Add fields here
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  resourcesRequest:
+    cpu: "30m"
+    memory: "30M"
+  resourcesLimit:
+    cpu: "50m"
+    memory: "50M"
diff --git a/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml
new file mode 100644
index 0000000..61b39ce
--- /dev/null
+++ b/TestHelpers/reg_test_openshift_konflux/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: nbde.openshift.io/v1alpha1
+kind: TangServer
+metadata:
+  name: tangserver-scaleup
+  namespace: nbde
+  finalizers:
+    - finalizer.nbde.tangserver.openshift.io
+spec:
+  replicas: 1
+  image: "registry.redhat.io/rhel9/tang"
+  version: "latest"
+  resourcesRequest:
+    cpu: "40m"
+    memory: "40M"
+  resourcesLimit:
+    cpu: "60m"
+    memory: "60M"
diff --git a/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_namespace.yaml b/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_namespace.yaml
new file mode 100644
index 0000000..d19def9
--- /dev/null
+++ b/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: nbde
diff --git a/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..80db0be
--- /dev/null
+++ b/TestHelpers/reg_test_ori/all_test_namespace/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: tangserver-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    path: /tmp
+    server: 172.17.0.2
diff --git a/TestHelpers/reg_test_ori/conf_test/main/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/conf_test/main/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..aaac436
--- /dev/null
+++ b/TestHelpers/reg_test_ori/conf_test/main/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-main
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/conf_test/main/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/conf_test/main/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/main/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/conf_test/main/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/conf_test/minimal/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/conf_test/minimal/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/conf_test/minimal/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/conf_test/minimal/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/conf_test/minimal/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/minimal/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/conf_test/minimal/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..7dcbbd0
--- /dev/null
+++ b/TestHelpers/reg_test_ori/conf_test/multi_deployment/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-multi1
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-multi2
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/conf_test/multi_deployment/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/func_test/key_rotation/clean_keys.sh b/TestHelpers/reg_test_ori/func_test/key_rotation/clean_keys.sh
new file mode 100755
index 0000000..cf94beb
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/key_rotation/clean_keys.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+OSH_CLIENT="oc"
+KR_NAMESPACE="nbde"
+
+function get_pod() {
+  "${OSH_CLIENT}" -n "${KR_NAMESPACE}" get pods | tail -1 | awk '{print $1}'
+}
+
+KR_POD=$(get_pod)
+echo "KR_POD=${KR_POD}"
+
+"${OSH_CLIENT}" -n ${KR_NAMESPACE} exec -it "${KR_POD}" -- /bin/bash -c 'cd /var/db/tang; rm ./*'
diff --git a/TestHelpers/reg_test_ori/func_test/key_rotation/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/func_test/key_rotation/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/key_rotation/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/func_test/key_rotation/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/func_test/key_rotation/rotate_keys.sh b/TestHelpers/reg_test_ori/func_test/key_rotation/rotate_keys.sh
new file mode 100755
index 0000000..ec7bfea
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/key_rotation/rotate_keys.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+kr_namespace=$1
+os_client=$2
+
+test -z "${kr_namespace}" && kr_namespace="nbde"
+test -z "${os_client}" && os_client="oc"
+
+function get_pod() {
+  "${os_client}" -n "${kr_namespace}" get pods | tail -1 | awk '{print $1}'
+}
+
+kr_pod=$(get_pod)
+
+"${os_client}" -n ${kr_namespace} exec -i "${kr_pod}" -- /bin/bash -xc 'cd /var/db/tang; for key in *jwk; do mv -- $key .$key; done'
diff --git a/TestHelpers/reg_test_ori/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..a32bbe6
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/multiple_deployment_test/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-functional1
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-functional2
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/func_test/multiple_deployment_test/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/none_cluster_ip/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/func_test/none_cluster_ip/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..aaac436
--- /dev/null
+++ b/TestHelpers/reg_test_ori/func_test/unique_deployment_test/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc-main
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/func_test/unique_deployment_test/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test/key_management_test/api_key_rotate.sh b/TestHelpers/reg_test_ori/key_management_test/api_key_rotate.sh
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/api_key_rotate.sh
rename to TestHelpers/reg_test_ori/key_management_test/api_key_rotate.sh
diff --git a/TestHelpers/reg_test/key_management_test/key_delete_one_keep_one.sh b/TestHelpers/reg_test_ori/key_management_test/key_delete_one_keep_one.sh
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/key_delete_one_keep_one.sh
rename to TestHelpers/reg_test_ori/key_management_test/key_delete_one_keep_one.sh
diff --git a/TestHelpers/reg_test/key_management_test/key_rotate_keep_existing.sh b/TestHelpers/reg_test_ori/key_management_test/key_rotate_keep_existing.sh
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/key_rotate_keep_existing.sh
rename to TestHelpers/reg_test_ori/key_management_test/key_rotate_keep_existing.sh
diff --git a/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml
new file mode 100644
index 0000000..36402fc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrole.yaml
@@ -0,0 +1,9 @@
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: pod-reader-executor
+rules:
+  - apiGroups: [""]  # "" indicates the core API group
+    resources: ["pods", "pods/log", "pods/exec", "pods/status"]
+    verbs: ["get", "watch", "list", "create", "update"]
diff --git a/TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
rename to TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_clusterrolebinding.yaml
diff --git a/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve-deletehiddenkeys/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml
new file mode 100644
index 0000000..36402fc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrole.yaml
@@ -0,0 +1,9 @@
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: pod-reader-executor
+rules:
+  - apiGroups: [""]  # "" indicates the core API group
+    resources: ["pods", "pods/log", "pods/exec", "pods/status"]
+    verbs: ["get", "watch", "list", "create", "update"]
diff --git a/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
new file mode 100644
index 0000000..adf5e2d
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pod-reader-executor-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: pod-reader-executor
+subjects:
+  - kind: ServiceAccount
+    name: tang-operator-controller-manager
+    namespace: {{OPERATOR_NAMESPACE}}
diff --git a/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/key_management_test/minimal-keyretrieve/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml
new file mode 100644
index 0000000..36402fc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrole.yaml
@@ -0,0 +1,9 @@
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: pod-reader-executor
+rules:
+  - apiGroups: [""]  # "" indicates the core API group
+    resources: ["pods", "pods/log", "pods/exec", "pods/status"]
+    verbs: ["get", "watch", "list", "create", "update"]
diff --git a/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
new file mode 100644
index 0000000..adf5e2d
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_clusterrolebinding.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pod-reader-executor-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: pod-reader-executor
+subjects:
+  - kind: ServiceAccount
+    name: tang-operator-controller-manager
+    namespace: {{OPERATOR_NAMESPACE}}
diff --git a/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/key_management_test/multiple-keyretrieve/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/legacy_test/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/legacy_test/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/legacy_test/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/legacy_test/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/legacy_test/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/legacy_test/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/legacy_test/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/scale_test/scale_down/scale_down0/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_down/scale_down0/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_down/scale_down1/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/scale_test/scale_in/scale_in0/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_in/scale_in0/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_in/scale_in1/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/scale_test/scale_out/scale_out0/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_out/scale_out0/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_out/scale_out1/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test_ori/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml b/TestHelpers/reg_test_ori/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml
new file mode 100644
index 0000000..4b46edc
--- /dev/null
+++ b/TestHelpers/reg_test_ori/scale_test/scale_up/scale_up0/daemons_v1alpha1_pv.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: tangserver-pvc
+  namespace: nbde
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/TestHelpers/reg_test/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_up/scale_up0/daemons_v1alpha1_tangserver.yaml
diff --git a/TestHelpers/reg_test/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml b/TestHelpers/reg_test_ori/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml
similarity index 100%
rename from TestHelpers/reg_test/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml
rename to TestHelpers/reg_test_ori/scale_test/scale_up/scale_up1/daemons_v1alpha1_tangserver.yaml