diff --git a/config/300-crds/300-pipelinerun.yaml b/config/300-crds/300-pipelinerun.yaml
index bd89cccf07f..bb755a64d34 100644
--- a/config/300-crds/300-pipelinerun.yaml
+++ b/config/300-crds/300-pipelinerun.yaml
@@ -2205,6 +2205,8 @@ spec:
                         enableStepActions:
                           description: EnableStepActions is a no-op flag since StepActions are stable
                           type: boolean
+                        enableTektonOCIBundles:
+                          type: boolean
                         enableWaitExponentialBackoff:
                           type: boolean
                         enforceNonfalsifiability:
@@ -2620,6 +2622,8 @@ spec:
                                   enableStepActions:
                                     description: EnableStepActions is a no-op flag since StepActions are stable
                                     type: boolean
+                                  enableTektonOCIBundles:
+                                    type: boolean
                                   enableWaitExponentialBackoff:
                                     type: boolean
                                   enforceNonfalsifiability:
@@ -2909,6 +2913,8 @@ spec:
                                         enableStepActions:
                                           description: EnableStepActions is a no-op flag since StepActions are stable
                                           type: boolean
+                                        enableTektonOCIBundles:
+                                          type: boolean
                                         enableWaitExponentialBackoff:
                                           type: boolean
                                         enforceNonfalsifiability:
@@ -5138,6 +5144,8 @@ spec:
                         enableStepActions:
                           description: EnableStepActions is a no-op flag since StepActions are stable
                           type: boolean
+                        enableTektonOCIBundles:
+                          type: boolean
                         enableWaitExponentialBackoff:
                           type: boolean
                         enforceNonfalsifiability:
diff --git a/config/300-crds/300-taskrun.yaml b/config/300-crds/300-taskrun.yaml
index c939014d3a7..4437391d050 100644
--- a/config/300-crds/300-taskrun.yaml
+++ b/config/300-crds/300-taskrun.yaml
@@ -1776,6 +1776,8 @@ spec:
                         enableStepActions:
                           description: EnableStepActions is a no-op flag since StepActions are stable
                           type: boolean
+                        enableTektonOCIBundles:
+                          type: boolean
                         enableWaitExponentialBackoff:
                           type: boolean
                         enforceNonfalsifiability:
@@ -2065,6 +2067,8 @@ spec:
                               enableStepActions:
                                 description: EnableStepActions is a no-op flag since StepActions are stable
                                 type: boolean
+                              enableTektonOCIBundles:
+                                type: boolean
                               enableWaitExponentialBackoff:
                                 type: boolean
                               enforceNonfalsifiability:
@@ -3771,6 +3775,8 @@ spec:
                         enableStepActions:
                           description: EnableStepActions is a no-op flag since StepActions are stable
                           type: boolean
+                        enableTektonOCIBundles:
+                          type: boolean
                         enableWaitExponentialBackoff:
                           type: boolean
                         enforceNonfalsifiability:
@@ -4026,6 +4032,8 @@ spec:
                               enableStepActions:
                                 description: EnableStepActions is a no-op flag since StepActions are stable
                                 type: boolean
+                              enableTektonOCIBundles:
+                                type: boolean
                               enableWaitExponentialBackoff:
                                 type: boolean
                               enforceNonfalsifiability:
diff --git a/pkg/apis/config/feature_flags.go b/pkg/apis/config/feature_flags.go
index bac9a55dc0f..d3b79b3b663 100644
--- a/pkg/apis/config/feature_flags.go
+++ b/pkg/apis/config/feature_flags.go
@@ -123,7 +123,7 @@ const (
 	runningInEnvWithInjectedSidecarsKey = "running-in-environment-with-injected-sidecars"
 	awaitSidecarReadinessKey            = "await-sidecar-readiness"
 	requireGitSSHSecretKnownHostsKey    = "require-git-ssh-secret-known-hosts" //nolint:gosec
-	// enableTektonOCIBundles              = "enable-tekton-oci-bundles"
+	EnableTektonOCIBundles              = "enable-tekton-oci-bundles"
 
 	enableAPIFields                             = "enable-api-fields"
 	sendCloudEventsForRuns                      = "send-cloudevents-for-runs"
@@ -175,6 +175,13 @@ var (
 		Stability: AlphaAPIFields,
 		Enabled:   DefaultAlphaFeatureEnabled,
 	}
+
+	DefaultEnableTektonOCIBundles = PerFeatureFlag{
+		Name:       EnableTektonOCIBundles,
+		Stability:  AlphaAPIFields,
+		Enabled:    DefaultAlphaFeatureEnabled,
+		Deprecated: true,
+	}
 )
 
 // FeatureFlags holds the features configurations
@@ -203,13 +210,14 @@ type FeatureFlags struct {
 	Coschedule                               string `json:"coschedule,omitempty"`
 	EnableCELInWhenExpression                bool   `json:"enableCELInWhenExpression,omitempty"`
 	// EnableStepActions is a no-op flag since StepActions are stable
-	EnableStepActions            bool   `json:"enableStepActions,omitempty"`
-	EnableParamEnum              bool   `json:"enableParamEnum,omitempty"`
-	EnableArtifacts              bool   `json:"enableArtifacts,omitempty"`
-	DisableInlineSpec            string `json:"disableInlineSpec,omitempty"`
-	EnableConciseResolverSyntax  bool   `json:"enableConciseResolverSyntax,omitempty"`
-	EnableKubernetesSidecar      bool   `json:"enableKubernetesSidecar,omitempty"`
-	EnableWaitExponentialBackoff bool   `json:"enableWaitExponentialBackoff,omitempty"`
+	EnableStepActions                bool   `json:"enableStepActions,omitempty"`
+	EnableParamEnum                  bool   `json:"enableParamEnum,omitempty"`
+	EnableArtifacts                  bool   `json:"enableArtifacts,omitempty"`
+	DisableInlineSpec                string `json:"disableInlineSpec,omitempty"`
+	EnableConciseResolverSyntax      bool   `json:"enableConciseResolverSyntax,omitempty"`
+	EnableKubernetesSidecar          bool   `json:"enableKubernetesSidecar,omitempty"`
+	EnableWaitExponentialBackoff     bool   `json:"enableWaitExponentialBackoff,omitempty"`
+	DeprecatedEnableTektonOCIBundles *bool  `json:"enableTektonOCIBundles,omitempty"       yaml:"EnableTektonOCIBundles,omitempty"`
 }
 
 // GetFeatureFlagsConfigName returns the name of the configmap containing all
diff --git a/pkg/apis/config/zz_generated.deepcopy.go b/pkg/apis/config/zz_generated.deepcopy.go
index 12ceac0433d..5b59f22e956 100644
--- a/pkg/apis/config/zz_generated.deepcopy.go
+++ b/pkg/apis/config/zz_generated.deepcopy.go
@@ -90,6 +90,11 @@ func (in *Events) DeepCopy() *Events {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FeatureFlags) DeepCopyInto(out *FeatureFlags) {
 	*out = *in
+	if in.DeprecatedEnableTektonOCIBundles != nil {
+		in, out := &in.DeprecatedEnableTektonOCIBundles, &out.DeprecatedEnableTektonOCIBundles
+		*out = new(bool)
+		**out = **in
+	}
 	return
 }
 
diff --git a/pkg/apis/pipeline/v1/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1/zz_generated.deepcopy.go
index 618e05a3529..c867b16633c 100644
--- a/pkg/apis/pipeline/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/pipeline/v1/zz_generated.deepcopy.go
@@ -1079,7 +1079,7 @@ func (in *Provenance) DeepCopyInto(out *Provenance) {
 	if in.FeatureFlags != nil {
 		in, out := &in.FeatureFlags, &out.FeatureFlags
 		*out = new(config.FeatureFlags)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
diff --git a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
index e57a992ddae..33ad55d0cac 100644
--- a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
@@ -1487,7 +1487,7 @@ func (in *Provenance) DeepCopyInto(out *Provenance) {
 	if in.FeatureFlags != nil {
 		in, out := &in.FeatureFlags, &out.FeatureFlags
 		*out = new(config.FeatureFlags)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }