diff --git a/pkg/autoscaler/autoscaler.go b/pkg/autoscaler/autoscaler.go
index 5e30005c6..6397fde13 100644
--- a/pkg/autoscaler/autoscaler.go
+++ b/pkg/autoscaler/autoscaler.go
@@ -110,7 +110,7 @@ func machineAutoscalerResource(targetMachineSet *machinev1.MachineSet, minReplic
 	}
 }
 
-var _ = Describe("Autoscaler should", framework.LabelAutoscaler, Serial, func() {
+var _ = Describe("Autoscaler should", framework.LabelAutoscaler, framework.LabelDisruptive, Serial, func() {
 
 	var workloadMemRequest resource.Quantity
 	var client runtimeclient.Client
diff --git a/pkg/framework/ginkgo-labels.go b/pkg/framework/ginkgo-labels.go
index 9a5a91879..f86d0be5f 100644
--- a/pkg/framework/ginkgo-labels.go
+++ b/pkg/framework/ginkgo-labels.go
@@ -3,14 +3,15 @@ package framework
 import "github.com/onsi/ginkgo/v2"
 
 var (
-	LabelCAPI                  = ginkgo.Label("capi")
-	LabelDisruptive            = ginkgo.Label("disruptive")
 	LabelAutoscaler            = ginkgo.Label("autoscaler")
+	LabelCAPI                  = ginkgo.Label("capi")
+	LabelMAPI                  = ginkgo.Label("mapi")
+	LabelMachineHealthChecks   = ginkgo.Label("machine-health-checks")
+	LabelMachineApprover       = ginkgo.Label("machine-approver")
 	LabelOperators             = ginkgo.Label("operators")
-	LabelPeriodic              = ginkgo.Label("periodic")
 	LabelSpot                  = ginkgo.Label("spot-instances")
-	LabelMachines              = ginkgo.Label("machines")
-	LabelMachineHealthChecks   = ginkgo.Label("machine-health-checks")
+	LabelDisruptive            = ginkgo.Label("disruptive")
+	LabelPeriodic              = ginkgo.Label("periodic")
 	LabelCloudProviderSpecific = ginkgo.Label("cloud-provider-specific")
 	LabelProviderAWS           = ginkgo.Label("AWS")
 )
diff --git a/pkg/infra/infra.go b/pkg/infra/infra.go
index aebee335c..7a40424ee 100644
--- a/pkg/infra/infra.go
+++ b/pkg/infra/infra.go
@@ -147,7 +147,7 @@ func deleteObjects(client runtimeclient.Client, delObjects map[string]runtimecli
 	return nil
 }
 
-var _ = Describe("Managed cluster should", framework.LabelMachines, func() {
+var _ = Describe("Managed cluster should", framework.LabelMAPI, func() {
 	var client runtimeclient.Client
 	var ctx context.Context
 	var machineSet *machinev1.MachineSet
@@ -186,7 +186,7 @@ var _ = Describe("Managed cluster should", framework.LabelMachines, func() {
 		}
 	})
 
-	When("machineset has one replica", func() {
+	When("machineset has one replica", framework.LabelDisruptive, func() {
 		BeforeEach(func() {
 			var err error
 			machineSetParams = framework.BuildMachineSetParams(ctx, client, 1)
@@ -266,7 +266,7 @@ var _ = Describe("Managed cluster should", framework.LabelMachines, func() {
 
 	})
 
-	When("machineset has 2 replicas", func() {
+	When("machineset has 2 replicas", framework.LabelDisruptive, func() {
 		BeforeEach(func() {
 			var err error
 			machineSetParams = framework.BuildMachineSetParams(ctx, client, 2)
diff --git a/pkg/infra/lifecyclehooks.go b/pkg/infra/lifecyclehooks.go
index c8cf7ce1e..e0ee0929c 100644
--- a/pkg/infra/lifecyclehooks.go
+++ b/pkg/infra/lifecyclehooks.go
@@ -29,7 +29,7 @@ const (
 	pollingInterval                   = 3 * time.Second
 )
 
-var _ = Describe("Lifecycle Hooks should", framework.LabelMachines, func() {
+var _ = Describe("Lifecycle Hooks should", framework.LabelMAPI, framework.LabelDisruptive, func() {
 	var client runtimeclient.Client
 	var machineSet *machinev1.MachineSet
 	var workload *batchv1.Job
diff --git a/pkg/infra/spot.go b/pkg/infra/spot.go
index afc821e75..a6093a5df 100644
--- a/pkg/infra/spot.go
+++ b/pkg/infra/spot.go
@@ -38,7 +38,7 @@ const (
 	spotMachineSetMaxProvisioningRetryCount = 3
 )
 
-var _ = Describe("Running on Spot", framework.LabelMachines, framework.LabelSpot, func() {
+var _ = Describe("Running on Spot", framework.LabelMAPI, framework.LabelSpot, framework.LabelDisruptive, func() {
 	var ctx = context.Background()
 
 	var client runtimeclient.Client
diff --git a/pkg/infra/webhooks.go b/pkg/infra/webhooks.go
index 10ad62935..137310f5e 100644
--- a/pkg/infra/webhooks.go
+++ b/pkg/infra/webhooks.go
@@ -22,7 +22,7 @@ import (
 	"github.com/openshift/cluster-api-actuator-pkg/pkg/framework/gatherer"
 )
 
-var _ = Describe("Webhooks", framework.LabelMachines, func() {
+var _ = Describe("Webhooks", framework.LabelMAPI, func() {
 	var client runtimeclient.Client
 	var platform configv1.PlatformType
 	var machineSetParams framework.MachineSetParams
diff --git a/pkg/machinehealthcheck/machinehealthcheck.go b/pkg/machinehealthcheck/machinehealthcheck.go
index eef6d7da3..4e0613c0c 100644
--- a/pkg/machinehealthcheck/machinehealthcheck.go
+++ b/pkg/machinehealthcheck/machinehealthcheck.go
@@ -16,7 +16,7 @@ import (
 	"github.com/openshift/cluster-api-actuator-pkg/pkg/framework/gatherer"
 )
 
-var _ = Describe("MachineHealthCheck", framework.LabelMachineHealthChecks, func() {
+var _ = Describe("MachineHealthCheck", framework.LabelMachineHealthChecks, framework.LabelDisruptive, func() {
 	var client client.Client
 	var ctx context.Context
 
diff --git a/pkg/operators/cluster-machine-approver.go b/pkg/operators/cluster-machine-approver.go
index 961e1e7fd..92a389eca 100644
--- a/pkg/operators/cluster-machine-approver.go
+++ b/pkg/operators/cluster-machine-approver.go
@@ -13,7 +13,7 @@ const (
 	cmaNamespace       = "openshift-cluster-machine-approver"
 )
 
-var _ = Describe("Cluster Machine Approver deployment", framework.LabelOperators, func() {
+var _ = Describe("Cluster Machine Approver deployment", framework.LabelOperators, framework.LabelMachineApprover, func() {
 	It("should be available", func() {
 		ctx := framework.GetContext()
 
@@ -25,7 +25,7 @@ var _ = Describe("Cluster Machine Approver deployment", framework.LabelOperators
 	})
 })
 
-var _ = Describe("Cluster Machine Approver Cluster Operator Status", framework.LabelOperators, func() {
+var _ = Describe("Cluster Machine Approver Cluster Operator Status", framework.LabelOperators, framework.LabelMachineApprover, func() {
 	It("should be available", func() {
 		client, err := framework.LoadClient()
 		Expect(err).NotTo(HaveOccurred(), "Failed to load client")
diff --git a/pkg/operators/machine-api-operator.go b/pkg/operators/machine-api-operator.go
index 7827a4e68..3989d014a 100644
--- a/pkg/operators/machine-api-operator.go
+++ b/pkg/operators/machine-api-operator.go
@@ -24,7 +24,7 @@ var (
 
 var _ = Describe(
 	"Machine API operator deployment should",
-	framework.LabelDisruptive, framework.LabelOperators, framework.LabelMachines,
+	framework.LabelDisruptive, framework.LabelOperators, framework.LabelMAPI,
 	Serial,
 	func() {
 		var gatherer *gatherer.StateGatherer
@@ -251,7 +251,7 @@ var _ = Describe(
 	})
 
 var _ = Describe(
-	"Machine API cluster operator status should", framework.LabelOperators, framework.LabelMachines, func() {
+	"Machine API cluster operator status should", framework.LabelOperators, framework.LabelMAPI, func() {
 		It("be available", func() {
 			ctx := framework.GetContext()
 
@@ -265,7 +265,7 @@ var _ = Describe(
 
 var _ = Describe(
 	"When cluster-wide proxy is configured, Machine API cluster operator should ",
-	framework.LabelDisruptive, framework.LabelOperators, framework.LabelPeriodic, framework.LabelMachines,
+	framework.LabelDisruptive, framework.LabelOperators, framework.LabelPeriodic, framework.LabelMAPI,
 	Serial,
 	func() {
 		var gatherer *gatherer.StateGatherer
diff --git a/pkg/providers/aws.go b/pkg/providers/aws.go
index fd0a50328..b72429f38 100644
--- a/pkg/providers/aws.go
+++ b/pkg/providers/aws.go
@@ -64,7 +64,7 @@ func createAWSClient(oc *gatherer.CLI) *framework.AwsClient {
 	return aClient
 }
 
-var _ = Describe("MetadataServiceOptions", framework.LabelCloudProviderSpecific, framework.LabelProviderAWS, func() {
+var _ = Describe("MetadataServiceOptions", framework.LabelCloudProviderSpecific, framework.LabelProviderAWS, framework.LabelDisruptive, func() {
 	var client runtimeclient.Client
 	var clientset *kubernetes.Clientset
 
@@ -197,7 +197,7 @@ var _ = Describe("MetadataServiceOptions", framework.LabelCloudProviderSpecific,
 	})
 })
 
-var _ = Describe("CapacityReservationID", framework.LabelCloudProviderSpecific, framework.LabelProviderAWS, func() {
+var _ = Describe("CapacityReservationID", framework.LabelCloudProviderSpecific, framework.LabelProviderAWS, framework.LabelDisruptive, func() {
 	var client runtimeclient.Client
 	var gatherer *gatherer.StateGatherer
 	var ctx context.Context