diff --git a/test/e2e/platform_test.go b/test/e2e/platform_test.go
index 49afd5aed..24115567a 100644
--- a/test/e2e/platform_test.go
+++ b/test/e2e/platform_test.go
@@ -117,9 +117,9 @@ var _ = Describe("Validate the persistence", Ordered, func() {
 			}
 		},
 			Entry("with both Job Service and Data Index and ephemeral persistence and the workflow in a dev profile", test.GetSonataFlowE2EPlatformServicesDirectory(), dev, ephemeral),
-			XEntry("with both Job Service and Data Index and ephemeral persistence and the workflow in a production profile", test.GetSonataFlowE2EPlatformServicesDirectory(), production, ephemeral),
+			Entry("with both Job Service and Data Index and ephemeral persistence and the workflow in a production profile", test.GetSonataFlowE2EPlatformServicesDirectory(), production, ephemeral),
 			Entry("with both Job Service and Data Index and postgreSQL persistence and the workflow in a dev profile", test.GetSonataFlowE2EPlatformServicesDirectory(), dev, postgreSQL),
-			XEntry("with both Job Service and Data Index and postgreSQL persistence and the workflow in a production profile", test.GetSonataFlowE2EPlatformServicesDirectory(), production, postgreSQL),
+			Entry("with both Job Service and Data Index and postgreSQL persistence and the workflow in a production profile", test.GetSonataFlowE2EPlatformServicesDirectory(), production, postgreSQL),
 		)
 
 	})
diff --git a/test/e2e/workflow_test.go b/test/e2e/workflow_test.go
index e05c843f7..db31ee0b0 100644
--- a/test/e2e/workflow_test.go
+++ b/test/e2e/workflow_test.go
@@ -180,14 +180,14 @@ var _ = Describe("Validate the persistence ", Ordered, func() {
 		By("Wait for SonatatFlow CR to complete deployment")
 		// wait for service deployments to be ready
 		EventuallyWithOffset(1, func() error {
-			cmd = exec.Command("kubectl", "wait", "pod", "-n", ns, "-l", "sonataflow.org/workflow-app=callbackstatetimeouts", "--for", "condition=Ready", "--timeout=5s")
+			cmd = exec.Command("kubectl", "wait", "pod", "-n", ns, "-l", "sonataflow.org/workflow-app=callbackstatetimeouts-persistence", "--for", "condition=Ready", "--timeout=5s")
 			out, err := utils.Run(cmd)
 			GinkgoWriter.Printf("%s\n", string(out))
 			return err
 		}, 10*time.Minute, 5).Should(Succeed())
 
 		By("Evaluate status of the workflow's pod database connection health endpoint")
-		cmd = exec.Command("kubectl", "get", "pod", "-l", "sonataflow.org/workflow-app=callbackstatetimeouts", "-n", ns, "-ojsonpath={.items[*].metadata.name}")
+		cmd = exec.Command("kubectl", "get", "pod", "-l", "sonataflow.org/workflow-app=callbackstatetimeouts-persistence", "-n", ns, "-ojsonpath={.items[*].metadata.name}")
 		output, err := utils.Run(cmd)
 		Expect(err).NotTo(HaveOccurred())
 		EventuallyWithOffset(1, func() bool {
diff --git a/test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts.sw.yaml b/test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts_persistence.sw.yaml
similarity index 97%
rename from test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts.sw.yaml
rename to test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts_persistence.sw.yaml
index 9d0fcbc75..bab6a32a9 100644
--- a/test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts.sw.yaml
+++ b/test/testdata/persistence/workflow/by_service/03-sonataflow_callbackstatetimeouts_persistence.sw.yaml
@@ -15,7 +15,7 @@
 apiVersion: sonataflow.org/v1alpha08
 kind: SonataFlow
 metadata:
-  name: callbackstatetimeouts
+  name: callbackstatetimeouts-persistence
   annotations:
     sonataflow.org/description: Callback State Timeouts Example k8s
     sonataflow.org/version: 0.0.1
@@ -30,7 +30,7 @@ spec:
         name: postgres
         port: 5432
         databaseName: sonataflow
-        databaseSchema: callbackstatetimeouts
+        databaseSchema: callbackstatetimeouts-persistence
   podTemplate:
     container:
       env:
diff --git a/test/testdata/persistence/workflow/by_service/kustomization.yaml b/test/testdata/persistence/workflow/by_service/kustomization.yaml
index b7f587bcc..1561a580c 100644
--- a/test/testdata/persistence/workflow/by_service/kustomization.yaml
+++ b/test/testdata/persistence/workflow/by_service/kustomization.yaml
@@ -15,7 +15,7 @@
 resources:
 - 01-postgres.yaml
 - 02-sonataflow_platform.yaml
-- 03-sonataflow_callbackstatetimeouts.sw.yaml
+- 03-sonataflow_callbackstatetimeouts_persistence.sw.yaml
 
 generatorOptions:
   disableNameSuffixHash: true