diff --git a/pkg/controller/functions.go b/pkg/controller/functions.go
index d528c0729..d2fc78bce 100644
--- a/pkg/controller/functions.go
+++ b/pkg/controller/functions.go
@@ -23,11 +23,7 @@ import (
 )
 
 // CloudPrepare is for init controller connection and obtain device list
-func CloudPrepare() (Cloud, error) {
-	vars, err := utils.InitVars()
-	if err != nil {
-		return nil, fmt.Errorf("utils.InitVars: %s", err)
-	}
+func CloudPrepare(vars *utils.ConfigVars) (Cloud, error) {
 	ctx := &CloudCtx{vars: vars, Controller: &adam.Ctx{}}
 	if err := ctx.InitWithVars(vars); err != nil {
 		return nil, fmt.Errorf("cloud.InitWithVars: %s", err)
diff --git a/pkg/openevec/changers.go b/pkg/openevec/changers.go
index 84fbfa384..90eb4638a 100644
--- a/pkg/openevec/changers.go
+++ b/pkg/openevec/changers.go
@@ -72,16 +72,13 @@ func (ctx *fileChanger) getControllerAndDevFromConfig(cfg *EdenSetupArgs) (contr
 	if _, err := os.Lstat(ctx.fileConfig); os.IsNotExist(err) {
 		return nil, nil, err
 	}
-	ctrl, err := controller.CloudPrepare()
+	vars, err := InitVarsFromConfig(cfg)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("InitVarsFromConfig error: %w", err)
 	}
-	if cfg != nil {
-		vars, err := InitVarsFromConfig(cfg)
-		if err != nil {
-			return nil, nil, fmt.Errorf("InitVarsFromConfig error: %w", err)
-		}
-		ctrl.SetVars(vars)
+	ctrl, err := controller.CloudPrepare(vars)
+	if err != nil {
+		return nil, nil, err
 	}
 	data, err := os.ReadFile(ctx.fileConfig)
 	if err != nil {
@@ -108,8 +105,12 @@ type adamChanger struct {
 	adamURL string
 }
 
-func (ctx *adamChanger) getController() (controller.Cloud, error) {
-	ctrl, err := controller.CloudPrepare()
+func (ctx *adamChanger) getController(cfg *EdenSetupArgs) (controller.Cloud, error) {
+	vars, err := InitVarsFromConfig(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("InitVarsFromConfig error: %w", err)
+	}
+	ctrl, err := controller.CloudPrepare(vars)
 	if err != nil {
 		return nil, fmt.Errorf("CloudPrepare error: %w", err)
 	}
@@ -117,7 +118,7 @@ func (ctx *adamChanger) getController() (controller.Cloud, error) {
 }
 
 func (ctx *adamChanger) getControllerAndDevFromConfig(cfg *EdenSetupArgs) (controller.Cloud, *device.Ctx, error) {
-	ctrl, err := ctx.getController()
+	ctrl, err := ctx.getController(cfg)
 	if err != nil {
 		return nil, nil, fmt.Errorf("getController error: %w", err)
 	}
diff --git a/pkg/openevec/eden.go b/pkg/openevec/eden.go
index 25ba47703..84968b383 100644
--- a/pkg/openevec/eden.go
+++ b/pkg/openevec/eden.go
@@ -535,10 +535,14 @@ func (openEVEC *OpenEVEC) cleanContext(vmName string, configSaved string) (err e
 	if err != nil {
 		return fmt.Errorf("CleanContext: %s", err)
 	}
+	vars, err := InitVarsFromConfig(cfg)
+	if err != nil {
+		return fmt.Errorf("InitVarsFromConfig error: %w", err)
+	}
 
 	eveStatusFile := filepath.Join(edenDir, fmt.Sprintf("state-%s.yml", cfg.Eve.CertsUUID))
 	if _, err = os.Stat(eveStatusFile); !os.IsNotExist(err) {
-		ctrl, err := controller.CloudPrepare()
+		ctrl, err := controller.CloudPrepare(vars)
 		if err != nil {
 			return fmt.Errorf("CleanContext: error in CloudPrepare: %s", err)
 		}
diff --git a/pkg/openevec/edgeNode.go b/pkg/openevec/edgeNode.go
index 04d044e57..2dddca8b5 100644
--- a/pkg/openevec/edgeNode.go
+++ b/pkg/openevec/edgeNode.go
@@ -273,15 +273,14 @@ func (openEVEC *OpenEVEC) EdgeNodeGetConfig(controllerMode, fileWithConfig strin
 }
 
 func (openEVEC *OpenEVEC) EdgeNodeSetConfig(fileWithConfig string) error {
-	ctrl, err := controller.CloudPrepare()
-	if err != nil {
-		return fmt.Errorf("CloudPrepare: %w", err)
-	}
 	vars, err := InitVarsFromConfig(openEVEC.cfg)
 	if err != nil {
 		return fmt.Errorf("InitVarsFromConfig error: %w", err)
 	}
-	ctrl.SetVars(vars)
+	ctrl, err := controller.CloudPrepare(vars)
+	if err != nil {
+		return fmt.Errorf("CloudPrepare: %w", err)
+	}
 	devFirst, err := ctrl.GetDeviceCurrent()
 	if err != nil {
 		return fmt.Errorf("GetDeviceCurrent error: %w", err)
@@ -382,15 +381,14 @@ func (openEVEC *OpenEVEC) EdgeNodeSetOptions(controllerMode, fileWithConfig stri
 }
 
 func (openEVEC *OpenEVEC) ControllerGetOptions(fileWithConfig string) error {
-	ctrl, err := controller.CloudPrepare()
-	if err != nil {
-		return fmt.Errorf("CloudPrepare error: %w", err)
-	}
 	vars, err := InitVarsFromConfig(openEVEC.cfg)
 	if err != nil {
 		return fmt.Errorf("InitVarsFromConfig error: %w", err)
 	}
-	ctrl.SetVars(vars)
+	ctrl, err := controller.CloudPrepare(vars)
+	if err != nil {
+		return fmt.Errorf("CloudPrepare error: %w", err)
+	}
 	res, err := ctrl.GetGlobalOptions()
 	if err != nil {
 		return fmt.Errorf("GetGlobalOptions error: %w", err)
@@ -410,15 +408,14 @@ func (openEVEC *OpenEVEC) ControllerGetOptions(fileWithConfig string) error {
 }
 
 func (openEVEC *OpenEVEC) ControllerSetOptions(fileWithConfig string) error {
-	ctrl, err := controller.CloudPrepare()
-	if err != nil {
-		return fmt.Errorf("CloudPrepare error: %w", err)
-	}
 	vars, err := InitVarsFromConfig(openEVEC.cfg)
 	if err != nil {
 		return fmt.Errorf("InitVarsFromConfig error: %w", err)
 	}
-	ctrl.SetVars(vars)
+	ctrl, err := controller.CloudPrepare(vars)
+	if err != nil {
+		return fmt.Errorf("CloudPrepare error: %w", err)
+	}
 	var newOptionsBytes []byte
 	if fileWithConfig != "" {
 		newOptionsBytes, err = os.ReadFile(fileWithConfig)
diff --git a/pkg/openevec/onboard.go b/pkg/openevec/onboard.go
index 8d758537f..2fb2b184a 100644
--- a/pkg/openevec/onboard.go
+++ b/pkg/openevec/onboard.go
@@ -10,7 +10,6 @@ import (
 )
 
 func (openEVEC *OpenEVEC) OnboardEve(eveUUID string) error {
-
 	edenDir, err := utils.DefaultEdenDir()
 	if err != nil {
 		return fmt.Errorf("error getting default eden dir %w", err)
@@ -19,7 +18,7 @@ func (openEVEC *OpenEVEC) OnboardEve(eveUUID string) error {
 		return fmt.Errorf("error getting file %w", err)
 	}
 	changer := &adamChanger{}
-	ctrl, err := changer.getController()
+	ctrl, err := changer.getController(openEVEC.cfg)
 	if err != nil {
 		return fmt.Errorf("error fetching controller %w", err)
 	}
@@ -27,7 +26,6 @@ func (openEVEC *OpenEVEC) OnboardEve(eveUUID string) error {
 	if err != nil {
 		return fmt.Errorf("InitVarsFromConfig error: %w", err)
 	}
-	ctrl.SetVars(vars)
 	dev, err := ctrl.GetDeviceCurrent()
 	if err != nil || dev == nil {
 		// create new one if not exists