diff --git a/.github/resources/minio/deployment.yaml b/.github/resources/minio/deployment.yaml
index 61f98f017..127c11ccb 100644
--- a/.github/resources/minio/deployment.yaml
+++ b/.github/resources/minio/deployment.yaml
@@ -55,7 +55,7 @@ spec:
           ports:
             - containerPort: 9000
               protocol: TCP
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           volumeMounts:
             - name: data
               mountPath: /data
diff --git a/.github/resources/pypiserver/base/pypiserver.yaml b/.github/resources/pypiserver/base/pypiserver.yaml
index 901410f80..61cb31c90 100644
--- a/.github/resources/pypiserver/base/pypiserver.yaml
+++ b/.github/resources/pypiserver/base/pypiserver.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - image: "quay.io/harshad16/pypi-server"
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: pypi-server
           command:
             - pypi-server
diff --git a/config/internal/mlpipelines-ui/deployment.yaml.tmpl b/config/internal/mlpipelines-ui/deployment.yaml.tmpl
index 3fd21c3bd..e6926a761 100644
--- a/config/internal/mlpipelines-ui/deployment.yaml.tmpl
+++ b/config/internal/mlpipelines-ui/deployment.yaml.tmpl
@@ -79,7 +79,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: {{.MlPipelineUI.Image}}
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             httpGet:
               port: 3000
diff --git a/config/internal/persistence-agent/deployment.yaml.tmpl b/config/internal/persistence-agent/deployment.yaml.tmpl
index 705d56200..9c91bc8d6 100644
--- a/config/internal/persistence-agent/deployment.yaml.tmpl
+++ b/config/internal/persistence-agent/deployment.yaml.tmpl
@@ -45,7 +45,7 @@ spec:
               value: "/etc/pki/tls/certs:/var/run/secrets/kubernetes.io/serviceaccount/"
             {{ end }}
           image: "{{.PersistenceAgent.Image}}"
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/config/internal/scheduled-workflow/deployment.yaml.tmpl b/config/internal/scheduled-workflow/deployment.yaml.tmpl
index dd7febf75..241b3e40d 100644
--- a/config/internal/scheduled-workflow/deployment.yaml.tmpl
+++ b/config/internal/scheduled-workflow/deployment.yaml.tmpl
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: "{{.ScheduledWorkflow.Image}}"
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/config/internal/workflow-controller/configmap.yaml.tmpl b/config/internal/workflow-controller/configmap.yaml.tmpl
index 7d7788bcc..49aab8a23 100644
--- a/config/internal/workflow-controller/configmap.yaml.tmpl
+++ b/config/internal/workflow-controller/configmap.yaml.tmpl
@@ -38,4 +38,4 @@ data:
         key: "{{.ObjectStorageConnection.CredentialsSecret.SecretKey}}"
   containerRuntimeExecutor: emissary  # TODO
   executor: |
-    imagePullPolicy: IfNotPresent  # TODO
+    # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting  # TODO
diff --git a/config/overlays/make-deploy/kustomization.yaml b/config/overlays/make-deploy/kustomization.yaml
index f59b8ee7a..022b1c9ad 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/opendatahub/data-science-pipelines-operator
-  newTag: main
+  newName: quay.io/hbelmiro/dspo
+  newTag: dev-remove-image-pull-policy-1725475322
diff --git a/config/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml b/config/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml
index c7302cc9f..940ba78bc 100644
--- a/config/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml
+++ b/config/samples/v2/custom-workflow-controller-config/custom-workflow-controller-configmap.yaml
@@ -27,7 +27,7 @@ data:
         key: "secretkey"
   containerRuntimeExecutor: emissary
   executor: |
-    imagePullPolicy: IfNotPresent  # TODO
+    # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting  # TODO
 kind: ConfigMap
 metadata:
   name: custom-workflow-controller-configmap
diff --git a/controllers/testdata/declarative/case_0/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_0/expected/created/persistence-agent_deployment.yaml
index ecce799ab..30b58463f 100644
--- a/controllers/testdata/declarative/case_0/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_0/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: persistenceagent:test0
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/controllers/testdata/declarative/case_0/expected/created/scheduled-workflow_deployment.yaml b/controllers/testdata/declarative/case_0/expected/created/scheduled-workflow_deployment.yaml
index e5aee424a..e25e252a6 100644
--- a/controllers/testdata/declarative/case_0/expected/created/scheduled-workflow_deployment.yaml
+++ b/controllers/testdata/declarative/case_0/expected/created/scheduled-workflow_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: scheduledworkflow:test0
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml
index 444851cc5..53b19793b 100644
--- a/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml
+++ b/controllers/testdata/declarative/case_2/expected/created/mlpipelines-ui_deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: frontend:test2
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             exec:
               command:
diff --git a/controllers/testdata/declarative/case_2/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/persistence-agent_deployment.yaml
index db064397e..6db4d107e 100644
--- a/controllers/testdata/declarative/case_2/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_2/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: persistenceagent:test2
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/controllers/testdata/declarative/case_2/expected/created/scheduled-workflow_deployment.yaml b/controllers/testdata/declarative/case_2/expected/created/scheduled-workflow_deployment.yaml
index 78b8b382b..f49e43414 100644
--- a/controllers/testdata/declarative/case_2/expected/created/scheduled-workflow_deployment.yaml
+++ b/controllers/testdata/declarative/case_2/expected/created/scheduled-workflow_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: scheduledworkflow:test2
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml
index 1b7597019..62022305b 100644
--- a/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml
+++ b/controllers/testdata/declarative/case_4/expected/created/mlpipelines-ui_deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: this-frontend-image-from-cr-should-be-used:test4
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             exec:
               command:
diff --git a/controllers/testdata/declarative/case_4/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/persistence-agent_deployment.yaml
index c4118d680..b25c44713 100644
--- a/controllers/testdata/declarative/case_4/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_4/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: this-persistenceagent-image-from-cr-should-be-used:test4
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/controllers/testdata/declarative/case_4/expected/created/scheduled-workflow_deployment.yaml b/controllers/testdata/declarative/case_4/expected/created/scheduled-workflow_deployment.yaml
index 80e2084ad..c85f687e2 100644
--- a/controllers/testdata/declarative/case_4/expected/created/scheduled-workflow_deployment.yaml
+++ b/controllers/testdata/declarative/case_4/expected/created/scheduled-workflow_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: this-scheduledworkflow-image-from-cr-should-be-used:test4
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml
index abec9309d..a549d1d5b 100644
--- a/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml
+++ b/controllers/testdata/declarative/case_5/expected/created/mlpipelines-ui_deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: frontend:test5
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             exec:
               command:
diff --git a/controllers/testdata/declarative/case_5/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_5/expected/created/persistence-agent_deployment.yaml
index 2a22a22ae..faad5b733 100644
--- a/controllers/testdata/declarative/case_5/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_5/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: persistenceagent:test5
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/controllers/testdata/declarative/case_5/expected/created/scheduled-workflow_deployment.yaml b/controllers/testdata/declarative/case_5/expected/created/scheduled-workflow_deployment.yaml
index ab88f8de9..f315e6ccc 100644
--- a/controllers/testdata/declarative/case_5/expected/created/scheduled-workflow_deployment.yaml
+++ b/controllers/testdata/declarative/case_5/expected/created/scheduled-workflow_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: scheduledworkflow:test5
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml
index 2c0c82d61..abf2d040d 100644
--- a/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml
+++ b/controllers/testdata/declarative/case_7/expected/created/mlpipelines-ui_deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: frontend:test7
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             exec:
               command:
diff --git a/controllers/testdata/declarative/case_7/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/persistence-agent_deployment.yaml
index abcb70d3e..a5f4e31fb 100644
--- a/controllers/testdata/declarative/case_7/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_7/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: Workflow
           image: persistenceagent:test7
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent
diff --git a/controllers/testdata/declarative/case_7/expected/created/scheduled-workflow_deployment.yaml b/controllers/testdata/declarative/case_7/expected/created/scheduled-workflow_deployment.yaml
index 03d14f33f..2a0d4fd06 100644
--- a/controllers/testdata/declarative/case_7/expected/created/scheduled-workflow_deployment.yaml
+++ b/controllers/testdata/declarative/case_7/expected/created/scheduled-workflow_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXECUTIONTYPE
               value: PipelineRun
           image: scheduledworkflow:test7
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-scheduledworkflow
           command:
             - controller
diff --git a/controllers/testdata/declarative/case_9/expected/created/mlpipelines-ui_deployment.yaml b/controllers/testdata/declarative/case_9/expected/created/mlpipelines-ui_deployment.yaml
index a34edeb0f..d8bf9c83c 100644
--- a/controllers/testdata/declarative/case_9/expected/created/mlpipelines-ui_deployment.yaml
+++ b/controllers/testdata/declarative/case_9/expected/created/mlpipelines-ui_deployment.yaml
@@ -72,7 +72,7 @@ spec:
             - name: DISABLE_GKE_METADATA
               value: 'true'
           image: frontend:test9
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           livenessProbe:
             exec:
               command:
diff --git a/controllers/testdata/declarative/case_9/expected/created/persistence-agent_deployment.yaml b/controllers/testdata/declarative/case_9/expected/created/persistence-agent_deployment.yaml
index 46d622e32..27fcf1353 100644
--- a/controllers/testdata/declarative/case_9/expected/created/persistence-agent_deployment.yaml
+++ b/controllers/testdata/declarative/case_9/expected/created/persistence-agent_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXECUTIONTYPE
               value: Workflow
           image: persistenceagent:test9
-          imagePullPolicy: IfNotPresent
+          # imagePullPolicy: default - https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
           name: ds-pipeline-persistenceagent
           command:
             - persistence_agent