diff --git a/config/overlays/make-deploy/kustomization.yaml b/config/overlays/make-deploy/kustomization.yaml
index acdfaff2a..f59b8ee7a 100644
--- a/config/overlays/make-deploy/kustomization.yaml
+++ b/config/overlays/make-deploy/kustomization.yaml
@@ -8,5 +8,5 @@ patchesStrategicMerge:
 - img_patch.yaml
 images:
 - name: controller
-  newName: quay.io/hbelmiro/dspo
-  newTag: dev-RHOAIENG-13871-1730387808
+  newName: quay.io/opendatahub/data-science-pipelines-operator
+  newTag: main
diff --git a/config/samples/dspa-simple/dspa_simple.yaml b/config/samples/dspa-simple/dspa_simple.yaml
index 8f5630076..6a035e128 100644
--- a/config/samples/dspa-simple/dspa_simple.yaml
+++ b/config/samples/dspa-simple/dspa_simple.yaml
@@ -6,23 +6,9 @@ spec:
   dspVersion: v2
   apiServer:
     enableSamplePipeline: true
-    image: quay.io/hbelmiro/dsp-api-server:dev-RHOAIENG-13871-1730320518
-    argoDriverImage: quay.io/hbelmiro/dsp-driver:dev-RHOAIENG-13871-1730320872
-    argoLauncherImage: quay.io/hbelmiro/dsp-launcher:dev-RHOAIENG-13871-1730320874
     cABundle:
       configMapKey: ca.crt
       configMapName: kube-root-ca.crt
-  persistenceAgent:
-    deploy: true
-    image: quay.io/hbelmiro/dsp-persistence-agent:dev-RHOAIENG-13871-1730320875
-    numWorkers: 2
-    resources:
-      requests:
-        cpu: 120m
-        memory: 500Mi
-      limits:
-        cpu: 250m
-        memory: 1Gi
   objectStorage:
     # Need to enable this for artifact download links to work
     # i.e. for when requesting /apis/v2beta1/artifacts/{id}?share_url=true