diff --git a/internal/cli/client/service.go b/internal/cli/client/service.go
index 4882299d..dad3397c 100644
--- a/internal/cli/client/service.go
+++ b/internal/cli/client/service.go
@@ -16,6 +16,11 @@ import (
 	"uncloud/internal/secret"
 )
 
+const (
+	LabelServiceID   = "uncloud.service.id"
+	LabelServiceName = "uncloud.service.name"
+)
+
 // ServiceOptions contains all the options for creating a service.
 type ServiceOptions struct {
 	Image   string
@@ -100,8 +105,8 @@ func (c *Client) RunService(ctx context.Context, opts *ServiceOptions) (RunServi
 	config := &container.Config{
 		Image: opts.Image,
 		Labels: map[string]string{
-			"uncloud.service.id":   serviceID,
-			"uncloud.service.name": serviceName,
+			LabelServiceID:   serviceID,
+			LabelServiceName: serviceName,
 		},
 	}
 	netConfig := &network.NetworkingConfig{
diff --git a/internal/machine/store/schema.sql b/internal/machine/store/schema.sql
index 84b792df..5366d065 100644
--- a/internal/machine/store/schema.sql
+++ b/internal/machine/store/schema.sql
@@ -26,5 +26,7 @@ CREATE TABLE containers
 );
 
 CREATE INDEX idx_machines_name ON machines (name);
+
+CREATE INDEX idx_containers_machine_id ON containers (machine_id);
 CREATE INDEX idx_containers_service_id ON containers (service_id);
 CREATE INDEX idx_containers_service_name ON containers (service_name);