diff --git a/tools/testing-toolbox/jjb/custom_test_jobs.j2 b/tools/testing-toolbox/jjb/custom_test_jobs.j2
index e7d403d..2bf47b2 100644
--- a/tools/testing-toolbox/jjb/custom_test_jobs.j2
+++ b/tools/testing-toolbox/jjb/custom_test_jobs.j2
@@ -35,13 +35,6 @@
           choices:{% for platform in platforms[testsuite.name] %}
             - {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
           description: On which platform should the test run?
-      - extended-choice:
-          name: OPERATOR_VERSION
-          description: Version of the operator (binary) this test should use
-          property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
-          property-key: {{ testsuite.name }}
-          quote-value: false
-          visible-items: 10
       - string:
           name: BEKU_SUITE
           description: Testsuite which is used (beku feature)
@@ -87,7 +80,7 @@
               --env K8S_VERSION=$K8S_VERSION \
               --env GIT_BRANCH=$GIT_BRANCH \
               --env BEKU_SUITE=$BEKU_SUITE \
-              --env OPERATOR_VERSION=$OPERATOR_VERSION \
+              --env OPERATOR_VERSION=NONE \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
@@ -127,7 +120,6 @@
           custom-message: |
             *platform:* $TEST_PLATFORM
             *branch or tag:* `$GIT_BRANCH_OR_TAG`
-            *operator version:* `$OPERATOR_VERSION`
             (<$BUILD_URL|Open in classic Jenkins UI>)
             (<${BUILD_URL}artifact/testsuite/target/logs.html|Open logs overview>)
       - description-setter:
diff --git a/tools/testing-toolbox/jjb/nightly_test_jobs.j2 b/tools/testing-toolbox/jjb/nightly_test_jobs.j2
index 458b120..6271fad 100644
--- a/tools/testing-toolbox/jjb/nightly_test_jobs.j2
+++ b/tools/testing-toolbox/jjb/nightly_test_jobs.j2
@@ -59,7 +59,7 @@
               --env PLATFORM='{{ testsuite.nightly_test.platform }}' \
               --env GIT_BRANCH=main \
               --env BEKU_SUITE=nightly \
-              --env OPERATOR_VERSION=DEV \
+              --env OPERATOR_VERSION=NONE \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
diff --git a/tools/testing-toolbox/jjb/self_service_test_jobs.j2 b/tools/testing-toolbox/jjb/self_service_test_jobs.j2
index c8cc332..def6399 100644
--- a/tools/testing-toolbox/jjb/self_service_test_jobs.j2
+++ b/tools/testing-toolbox/jjb/self_service_test_jobs.j2
@@ -20,13 +20,6 @@
           choices:{% for platform in platforms[testsuite.name] %}
             - {{ platform.display_name }}, {{ platform.version }} <{{ platform.id }}|{{ platform.version }}>{% endfor %}
           description: On which platform should the test run?
-      - extended-choice:
-          name: OPERATOR_VERSION
-          description: Version of the operator (binary) this test should use
-          property-file: /var/jenkins_home/workspace/Available Versions/versions.properties
-          property-key: {{ testsuite.name }}
-          quote-value: false
-          visible-items: 10
       - string:
           name: CLUSTER_NICKNAME
           description: Nickname of the cluster to be created (mandatory)
@@ -74,7 +67,7 @@
               --env TESTSUITE={{ testsuite.name }} \
               --env PLATFORM=$PLATFORM_ID \
               --env K8S_VERSION=$K8S_VERSION \
-              --env OPERATOR_VERSION=$OPERATOR_VERSION \
+              --env OPERATOR_VERSION=NONE \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user="${BUILD_USER}" \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-id=${BUILD_USER_ID} \
               --env METADATA_ANNOTATION_t2.stackable.tech/jenkins-user-email=${BUILD_USER_EMAIL} \
diff --git a/tools/testing-toolbox/templates/test.sh.j2 b/tools/testing-toolbox/templates/test.sh.j2
index 6284ccd..b660f83 100644
--- a/tools/testing-toolbox/templates/test.sh.j2
+++ b/tools/testing-toolbox/templates/test.sh.j2
@@ -5,6 +5,11 @@ sleep 60
 # Install tool for test suite expansion
 pip install beku-stackabletech
 
+# Install stackablectl
+curl -L https://github.com/stackabletech/stackable-cockpit/releases/latest/download/stackablectl-x86_64-unknown-linux-gnu --output /usr/local/bin/stackablectl 
+chmod a+x /usr/local/bin/stackablectl 
+
+# Clone repo of system under test
 {% if git_branch %}
 git clone -b {{ git_branch }} https://github.com/stackabletech/{{ testsuite.git_repo }}.git
 {% else %}
@@ -15,15 +20,15 @@ git clone https://github.com/stackabletech/{{ testsuite.git_repo }}.git
 {% endfor %}
 
 
+# Tests want to know where to pipe their logs to
 export VECTOR_AGGREGATOR=vector-aggregator.t2-cluster-logging.svc.cluster.local:6000
 
 {% if beku_suite %}
-(cd {{ testsuite.git_repo }}/ && beku --suite {{ beku_suite }})
+(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh --test-suite {{ beku_suite }} {{ test_params }})
 {% else %}
-(cd {{ testsuite.git_repo }}/ && beku)
+(cd {{ testsuite.git_repo }}/ && ./scripts/run_tests.sh {{ test_params }})
 {% endif %}
 
-(cd {{ testsuite.git_repo }}/tests/_work && kubectl kuttl test {{ test_params }})
 exit_code=$?
 
 # cleanup of the test resources might take a while, so we wait another minute