diff --git a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/AbstractController.java b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/AbstractController.java
index ddc82322d..b4871b4ff 100644
--- a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/AbstractController.java
+++ b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/AbstractController.java
@@ -152,12 +152,16 @@ protected UpdateControl<GenerationRequest> updateRequest(
             String reason,
             Object... params) {
 
-        setPhaseLabel(generationRequest);
+        // Get the latest version to avoid conflicts on SSA patch updates
+        generationRequest = (GenerationRequest) kubernetesClient.configMaps()
+                .withName(generationRequest.getMetadata().getName())
+                .get();
+        cleanMetadata(generationRequest);
 
+        setPhaseLabel(generationRequest);
         generationRequest.setStatus(status);
         generationRequest.setResult(result);
         generationRequest.setReason(MessageFormatter.arrayFormat(reason, params).getMessage());
-        cleanMetadata(generationRequest);
 
         return UpdateControl.patchResource(generationRequest);
     }