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 b5cc383..48115d8 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
@@ -41,8 +41,9 @@
 ${OKA_NS_NAME}   namespace
 ${OKA_NS_PROFILE}   app-profile
 
-# Cluster
-${CLUSTER_NAME}   cl-madrid-norte1
+# VIM and Cluster
+${VIM_NAME}   gitops_02_vim
+${CLUSTER_NAME}   cl-gitops_02
 ${CLUSTER_DESCRIPTION}   "Cluster for gitops02 Robot test suite"
 
 # KSUs
@@ -58,7 +59,7 @@
 Create Dummy VIM For The Testsuite
     [Documentation]   Create dummy VIM for the testsuite.
     [Tags]   vim   cluster   create
-    ${vim_id}=   Create VIM Target   gitops_02_vim   u   p   http://localhost/dummy   t   dummy
+    ${vim_id}=   Create VIM Target   ${VIM_NAME}   u   p   http://localhost/dummy   t   dummy
     Set Suite Variable   ${VIM_ID}   ${vim_id}
 
 Add OKA Packages For The Testsuite
@@ -71,7 +72,7 @@
 Register Cluster For Testsuite
     [Documentation]   Register K8s cluster for the testsuite.
     [Tags]   cluster   create
-    ${id}=   Register Cluster   ${CLUSTER_NAME}   ${VIM_ID}   %{CLUSTER_KUBECONFIG_CREDENTIALS}   ${CLUSTER_DESCRIPTION}
+    ${id}=   Register Cluster   ${CLUSTER_NAME}   ${VIM_NAME}   %{CLUSTER_KUBECONFIG_CREDENTIALS}   ${CLUSTER_DESCRIPTION}
     Set Suite Variable   ${CLUSTER_ID}   ${id}
     Log   ${CLUSTER_ID}