diff --git a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
index 48115d8..8965a0b 100644
--- a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
+++ b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
@@ -42,8 +42,8 @@
 ${OKA_NS_PROFILE}   app-profile
 
 # VIM and Cluster
-${VIM_NAME}   gitops_02_vim
-${CLUSTER_NAME}   cl-gitops_02
+${VIM_NAME}   gitops02vim
+${CLUSTER_NAME}   cl-gitops02
 ${CLUSTER_DESCRIPTION}   "Cluster for gitops02 Robot test suite"
 
 # KSUs