diff --git a/bpm/src/main/java/org/jboss/pnc/bpm/BpmManager.java b/bpm/src/main/java/org/jboss/pnc/bpm/BpmManager.java
index <HASH>..<HASH> 100644
--- a/bpm/src/main/java/org/jboss/pnc/bpm/BpmManager.java
+++ b/bpm/src/main/java/org/jboss/pnc/bpm/BpmManager.java
@@ -162,7 +162,7 @@ public class BpmManager {
     public void cleanup() {
         log.debug("Bpm manager tasks cleanup started");
         Map<Integer, BpmTask> clonnedTasks = null;
-        synchronized(this.tasks) {
+        synchronized(this) {
             clonnedTasks = new HashMap<>(this.tasks);
         }
Fix synchronization in BpmManager not to allow concurency issues on tasks field