diff --git a/hack/manifests/testing/kustomization.yaml b/hack/manifests/testing/kustomization.yaml
index a8d47c6b1..76a8ac97a 100644
--- a/hack/manifests/testing/kustomization.yaml
+++ b/hack/manifests/testing/kustomization.yaml
@@ -7,13 +7,14 @@ resources:
 - postgres.yaml
 - ../base
 
-patchesStrategicMerge:
-- parodos-patch.yaml
+patches:
+- path: parodos-patch-workflow-service.yaml
+- path: parodos-patch-workflow-service-config.yaml
+- path: parodos-patch-notification-service-config.yaml
 
 images:
 - name: quay.io/parodos-dev/workflow-service:main
   newTag: test
-
 - name: quay.io/parodos-dev/notification-service:main
   newTag: test
 
diff --git a/hack/manifests/testing/parodos-patch-notification-service-config.yaml b/hack/manifests/testing/parodos-patch-notification-service-config.yaml
new file mode 100644
index 000000000..9786c07fe
--- /dev/null
+++ b/hack/manifests/testing/parodos-patch-notification-service-config.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: notification-service-config
+data:
+  SPRING_PROFILES_ACTIVE: "local"
diff --git a/hack/manifests/testing/parodos-patch.yaml b/hack/manifests/testing/parodos-patch-workflow-service-config.yaml
similarity index 54%
rename from hack/manifests/testing/parodos-patch.yaml
rename to hack/manifests/testing/parodos-patch-workflow-service-config.yaml
index 62d32295f..04ed6d4ee 100644
--- a/hack/manifests/testing/parodos-patch.yaml
+++ b/hack/manifests/testing/parodos-patch-workflow-service-config.yaml
@@ -1,14 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: workflow-service
-spec:
-  template:
-    spec:
-      containers:
-      - name: workflow-service
-        imagePullPolicy: IfNotPresent
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -20,10 +9,3 @@ data:
   DATASOURCE_PASSWORD: "parodos"
   SPRING_PROFILES_ACTIVE: "dev"
   NOTIFICATION_SERVER_URL: "http://notification-service.default.svc.cluster.local:8080"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: notification-service-config
-data:
-  SPRING_PROFILES_ACTIVE: "local"
diff --git a/hack/manifests/testing/parodos-patch-workflow-service.yaml b/hack/manifests/testing/parodos-patch-workflow-service.yaml
new file mode 100644
index 000000000..a19fed64f
--- /dev/null
+++ b/hack/manifests/testing/parodos-patch-workflow-service.yaml
@@ -0,0 +1,10 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: workflow-service
+spec:
+  template:
+    spec:
+      containers:
+      - name: workflow-service
+        imagePullPolicy: IfNotPresent