diff --git a/internal/machine/db.go b/internal/machine/db.go
index 24055856..eac4e8a0 100644
--- a/internal/machine/db.go
+++ b/internal/machine/db.go
@@ -36,16 +36,11 @@ func NewDB(path string) (*sqlx.DB, error) {
 	schema := `
 	CREATE TABLE IF NOT EXISTS containers (
 	    id TEXT NOT NULL PRIMARY KEY,
-	    service_id TEXT NOT NULL,
-	    service_name TEXT AS (json_extract(service_spec, '$.Name')),
 	    service_spec TEXT NOT NULL CHECK (json_valid(service_spec)),
 	    -- 'subsecond' modifier is used to store timestamps with millisecond precision.
 	    created_at TIMESTAMP NOT NULL DEFAULT (datetime('subsecond')),
 	    updated_at TIMESTAMP NOT NULL DEFAULT (datetime('subsecond'))
 	);
-
-	CREATE INDEX IF NOT EXISTS idx_containers_service_id ON containers (service_id);
-	CREATE INDEX IF NOT EXISTS idx_containers_service_name ON containers (service_name);
     `
 
 	if _, err = db.Exec(schema); err != nil {
diff --git a/internal/machine/docker/server.go b/internal/machine/docker/server.go
index 0060ea22..b3dd524b 100644
--- a/internal/machine/docker/server.go
+++ b/internal/machine/docker/server.go
@@ -527,9 +527,8 @@ func (s *Server) CreateServiceContainer(
 		return nil, status.Errorf(codes.Internal, "marshal service spec: %v", err)
 	}
 
-	if _, err = s.db.ExecContext(ctx,
-		`INSERT INTO containers (id, service_id, service_spec) VALUES ($1, $2, $3)`,
-		resp.ID, req.ServiceId, string(specBytes)); err != nil {
+	if _, err = s.db.ExecContext(ctx, `INSERT INTO containers (id, service_spec) VALUES ($1, $2)`,
+		resp.ID, string(specBytes)); err != nil {
 		removeContainer()
 		return nil, status.Errorf(codes.Internal, "store container in database: %v", err)
 	}