diff --git a/src/main/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapper.java b/src/main/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapper.java
index 16acd1c..6c6b768 100644
--- a/src/main/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapper.java
+++ b/src/main/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapper.java
@@ -199,7 +199,7 @@ public ProjectComponentProvisionStatus asProjectComponentProvisionStatus(String
                 .catalogItemRef(projectComponentInfo.getCatalogItemRef())
                 .status(projectComponentInfo.getStatus())
                 .componentUrl(projectComponentInfo.getComponentUrl())
-                .workflowJobId(Optional.ofNullable(workflowJob).map(JobDetail::getId).map(Object::toString).orElse("N/A"))
+                .workflowJobId(projectComponentInfo.getWorkflowJobId())
                 .errorTask(Optional.ofNullable(workflowJob).map(JobDetail::getArtifacts).map(artifacts -> artifacts.getOrDefault(AwxResultNames.RESULT_OUTPUT.getValue(), "N/A")).orElse("N/A"))
                 .errorMessage(Optional.ofNullable(workflowJob).map(JobDetail::getArtifacts).map(artifacts -> artifacts.getOrDefault(AwxResultNames.RESULT_CODE.getValue(), "N/A")).orElse("N/A"))
                 .parameters(parameters)
diff --git a/src/test/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapperTest.java b/src/test/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapperTest.java
index a06968c..5ea1e38 100644
--- a/src/test/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapperTest.java
+++ b/src/test/java/org/opendevstack/component_provisioner/server/mappers/EntitiesMapperTest.java
@@ -41,7 +41,7 @@ void testAsProjectComponentProvisionStatusWithValidData() {
         assertEquals("comp-123", result.getComponentId());
         assertEquals("PROVISIONED", result.getStatus());
         assertEquals("TEST_PROJECT", result.getProjectKey());
-        assertEquals("42", result.getWorkflowJobId());
+        assertEquals("12345", result.getWorkflowJobId());
         assertEquals("SUCCESS", result.getErrorMessage());
         assertEquals("Component provisioned successfully", result.getErrorTask());
     }
@@ -59,7 +59,7 @@ void testAsProjectComponentProvisionStatusWithNullJobDetailId() {
                 projectKey, projectComponentInfo, jobDetail);
 
         // Assert
-        assertEquals("N/A", result.getWorkflowJobId());
+        assertEquals("12345", result.getWorkflowJobId());
     }
 
     @Test