diff --git a/src/ectl/utils.go b/src/ectl/utils.go
index 16dd6c7..e54b936 100644
--- a/src/ectl/utils.go
+++ b/src/ectl/utils.go
@@ -48,7 +48,7 @@ func setServiceEnabled(service string, stage int) error {
 	if err != nil {
 		return err
 	}
-	err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), data, 0644)
+	err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled-services.yml"), data, 0644)
 	if err != nil {
 		return err
 	}
@@ -59,7 +59,7 @@ func setServiceEnabled(service string, stage int) error {
 func readEnabledServices() (EnabledServices map[int][]string) {
 	EnabledServices = make(map[int][]string)
 
-	data, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled_services"))
+	data, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled-services.yml"))
 	if err != nil {
 		return EnabledServices
 	}
@@ -71,12 +71,12 @@ func readEnabledServices() (EnabledServices map[int][]string) {
 			EnabledServices[3] = append(EnabledServices[3], service)
 		}
 
-		// Update enabled_services file
+		// Update enabled-services.yml file
 		data, err := yaml.Marshal(EnabledServices)
 		if err != nil {
 			return EnabledServices
 		}
-		err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), data, 0644)
+		err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled-services.yml"), data, 0644)
 		if err != nil {
 			return EnabledServices
 		}
diff --git a/src/esvm/service.go b/src/esvm/service.go
index a35e5c1..4ab6bb1 100644
--- a/src/esvm/service.go
+++ b/src/esvm/service.go
@@ -514,28 +514,13 @@ func (service *EnitService) RestartService() error {
 func ReadEnabledServices() (EnabledServices map[int][]string) {
 	EnabledServices = make(map[int][]string)
 
-	data, err := os.ReadFile(path.Join(serviceConfigDir, "enabled_services"))
+	data, err := os.ReadFile(path.Join(serviceConfigDir, "enabled-services.yml"))
 	if err != nil {
 		return EnabledServices
 	}
 
 	err = yaml.Unmarshal(data, &EnabledServices)
 	if err != nil {
-		// Assume old plain text format
-		for _, service := range strings.Split(strings.TrimSpace(string(data)), "\n") {
-			EnabledServices[3] = append(EnabledServices[3], service)
-		}
-
-		// Update enabled_services file
-		data, err := yaml.Marshal(EnabledServices)
-		if err != nil {
-			return EnabledServices
-		}
-		err = os.WriteFile(path.Join(serviceConfigDir, "enabled_services"), data, 0644)
-		if err != nil {
-			return EnabledServices
-		}
-
 		return EnabledServices
 	}