diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go
index 69b77c19..219206f6 100644
--- a/internal/deployer/deployer.go
+++ b/internal/deployer/deployer.go
@@ -504,6 +504,16 @@ func (d *Deployer) Deploy(ctx context.Context, components component.Component, r
 
 	d.logger.Infof("Initiating deployment of %s", components)
 
+	if d.useKonflux {
+		if err := d.ensureKonfluxImageRewriting(ctx); err != nil {
+			return fmt.Errorf("failed to configure Konflux image rewriting: %w", err)
+		}
+	} else {
+		if err := d.removeKonfluxImageRewriting(ctx); err != nil {
+			return fmt.Errorf("failed to remove Konflux ImageContentSourcePolicy: %w", err)
+		}
+	}
+
 	// If only deploying operator, use the operator-only flow
 	if components.IncludesOperatorExplicitly() {
 		return d.deployOperatorOnly(ctx)
@@ -621,6 +631,10 @@ func (d *Deployer) Teardown(ctx context.Context, components component.Component)
 			}
 		}
 
+		if err := d.removeKonfluxImageRewriting(ctx); err != nil {
+			d.logger.Warningf("Error while removing any lingering image rewriting rules for Konflux deployments: %v", err)
+		}
+
 		return nil
 	default:
 		return fmt.Errorf("unknown component: %s", components)
diff --git a/internal/deployer/operator.go b/internal/deployer/operator.go
index 10fa5f8b..d3b7d9bd 100644
--- a/internal/deployer/operator.go
+++ b/internal/deployer/operator.go
@@ -36,15 +36,6 @@ var requiredCRDs = []string{
 // deployOperatorNonOLM deploys the RHACS operator without OLM
 func (d *Deployer) deployOperatorNonOLM(ctx context.Context) error {
 	d.logger.Infof("Operator tag: %s", d.operatorTag)
-	if d.useKonflux {
-		if err := d.ensureKonfluxImageRewriting(ctx); err != nil {
-			return fmt.Errorf("failed to configure Konflux image rewriting: %w", err)
-		}
-	} else {
-		if err := d.removeKonfluxImageRewriting(ctx); err != nil {
-			return fmt.Errorf("failed to remove Konflux ImageContentSourcePolicy: %v", err)
-		}
-	}
 	bundleImage := d.getOperatorBundleImage()
 
 	bundleDir, err := d.downloadAndExtractOperatorBundle(ctx, bundleImage)