diff --git a/Makefile b/Makefile
index 9f924ab..68c1ac5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 # Image URL to use all building/pushing image targets
 #IMG_TAG ?= $(shell git rev-parse --short HEAD)
-IMG_TAG ?= 0.2.0
+IMG_TAG ?= 0.2.1
 IMG_NAME ?= rekuberate-io-sleepcycles
 DOCKER_HUB_NAME ?= $(shell docker info | sed '/Username:/!d;s/.* //')
 IMG ?= $(DOCKER_HUB_NAME)/$(IMG_NAME):$(IMG_TAG)
diff --git a/charts/sleepcycles/Chart.yaml b/charts/sleepcycles/Chart.yaml
index f680433..d6ffcb7 100644
--- a/charts/sleepcycles/Chart.yaml
+++ b/charts/sleepcycles/Chart.yaml
@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.2.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.0"
\ No newline at end of file
+appVersion: "0.2.1"
\ No newline at end of file
diff --git a/charts/sleepcycles/values.yaml b/charts/sleepcycles/values.yaml
index dcb79a7..c0c562f 100644
--- a/charts/sleepcycles/values.yaml
+++ b/charts/sleepcycles/values.yaml
@@ -32,7 +32,7 @@ controllerManager:
         - ALL
     image:
       repository: akyriako78/rekuberate-io-sleepcycles
-      tag: 0.2.0
+      tag: 0.2.1
     resources:
       limits:
         cpu: 500m
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 10452d2..aa06ad0 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: akyriako78/rekuberate-io-sleepcycles
-  newTag: 0.2.0
+  newTag: 0.2.1
diff --git a/controllers/sleepcycle_runners_cronjobs.go b/controllers/sleepcycle_runners_cronjobs.go
index d9ffdf9..d01a065 100644
--- a/controllers/sleepcycle_runners_cronjobs.go
+++ b/controllers/sleepcycle_runners_cronjobs.go
@@ -223,9 +223,11 @@ func (r *SleepCycleReconciler) reconcileCronJob(
 		}
 	}
 
-	//TODO: If cronjob is actively running, quit and wait next reconciliation loop
-
 	if cronjob != nil {
+		if cronjob.Status.Active != nil {
+			return nil
+		}
+
 		if !isShutdownOp && sleepcycle.Spec.WakeUp == nil {
 			err := r.deleteCronJob(ctx, sleepcycle, cronjob)
 			if err != nil {