diff --git a/robot-systest/testsuite/gitops_01-advanced_cluster_management.robot b/robot-systest/testsuite/gitops_01-advanced_cluster_management.robot
index b5ff991..a30e59f 100644
--- a/robot-systest/testsuite/gitops_01-advanced_cluster_management.robot
+++ b/robot-systest/testsuite/gitops_01-advanced_cluster_management.robot
@@ -79,20 +79,20 @@
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
     Log   ${stdout}
 
-Create KSU1 Without Params
-    [Documentation]   Create KSU based on ${OKA1_NAME} without params.
-    [Tags]   ksu   ksu1   create
-    ${id}=   Create KSU   ${KSU1_NAME}   ${KSU1_NAME}   ${CLUSTER_NAME}   app-profile   ${OKA1_NAME}
-    Set Suite Variable   ${KSU1_ID}   ${id}
-    Log   ${KSU1_ID}
-
-Create KSU Namespace For KSU2 and KSU3
+Create KSU Namespace For All KSUs
     [Documentation]   Create KSU based on ${OKA_NS_NAME} with params.
     [Tags]   ksu   ksu-ns   create
     ${id}=   Create KSU   ${KSU_NS_NAME}   ${KSU_NS_NAME}   ${CLUSTER_NAME}   app-profile   ${OKA_NS_NAME}   ${OKA_FOLDER}/apps/jenkins-ns-params.yaml
     Set Suite Variable   ${KSU_NS_ID}   ${id}
     Log   ${KSU_NS_ID}
 
+Create KSU1 Without Params
+    [Documentation]   Create KSU based on ${OKA1_NAME} without params (default namespace).
+    [Tags]   ksu   ksu1   create
+    ${id}=   Create KSU   ${KSU1_NAME}   ${KSU1_NAME}   ${CLUSTER_NAME}   app-profile   ${OKA1_NAME}
+    Set Suite Variable   ${KSU1_ID}   ${id}
+    Log   ${KSU1_ID}
+
 Create KSU2 With Params
     [Documentation]   Create KSU based on ${OKA2_NAME} with params.
     [Tags]   ksu   ksu2   create
@@ -117,16 +117,16 @@
     [Tags]   cleanup   ksu   ksu2
     Delete KSU   ${KSU2_ID}
 
-Delete KSU Namespace
-    [Documentation]   Delete KSU based on ${OKA_NS_NAME}.
-    [Tags]   cleanup   ksu   ksu-ns
-    Delete KSU   ${KSU_NS_ID}
-
 Delete KSU1
     [Documentation]   Delete KSU1 based on ${OKA1_NAME}.
     [Tags]   cleanup   ksu   ksu1
     Delete KSU   ${KSU1_NAME}
 
+Delete KSU Namespace
+    [Documentation]   Delete KSU based on ${OKA_NS_NAME}.
+    [Tags]   cleanup   ksu   ksu-ns
+    Delete KSU   ${KSU_NS_ID}
+
 Delete Cluster For Testsuite
     [Documentation]   Delete K8s cluster for the testsuite.
     [Tags]   cleanup   cluster