diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTask.java
index 07c5520fb8..a56515b661 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTask.java
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTask.java
@@ -21,7 +21,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.spinnaker.orca.ExecutionStatus;
 import com.netflix.spinnaker.orca.RetryableTask;
 import com.netflix.spinnaker.orca.TaskResult;
 import com.netflix.spinnaker.orca.clouddriver.KatoService;
@@ -37,6 +36,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import retrofit.client.Response;
+import static com.netflix.spinnaker.orca.ExecutionStatus.SUCCEEDED;
 
 @Component
 public class CleanUpTagsTask extends AbstractCloudProviderAwareTask implements RetryableTask {
@@ -62,7 +62,7 @@ public class CleanUpTagsTask extends AbstractCloudProviderAwareTask implements R
   public TaskResult execute(Stage stage) {
     try {
       StageData.Source source = sourceResolver.getSource(stage);
-      String serverGroupName =  Optional.ofNullable(source.getServerGroupName()).orElse(source.getAsgName());
+      String serverGroupName = Optional.ofNullable(source.getServerGroupName()).orElse(source.getAsgName());
       String cloudProvider = getCloudProvider(stage);
 
       Response serverGroupResponse = oortService.getServerGroupFromCluster(
@@ -87,14 +87,14 @@ public TaskResult execute(Stage stage) {
 
       List<String> tagsToDelete = tags.stream()
         .flatMap(entityTag -> ((List<Map>) entityTag.get("tags")).stream())
+        .filter(tag -> "astrid_rules".equals(tag.get("namespace")))
         .filter(hasNonMatchingImageId(imageId))
         .map(t -> (String) t.get("name"))
         .collect(Collectors.toList());
 
-
       log.info("found tags to delete {}", tagsToDelete);
       if (tagsToDelete.isEmpty()) {
-        return new TaskResult(ExecutionStatus.SUCCEEDED);
+        return new TaskResult(SUCCEEDED);
       }
 
       // All IDs should be the same; use the first one
@@ -105,20 +105,27 @@ public TaskResult execute(Stage stage) {
         operations(entityId, tagsToDelete)
       ).toBlocking().first();
 
-      return new TaskResult(ExecutionStatus.SUCCEEDED, new HashMap<String, Object>() {{
+      return new TaskResult(SUCCEEDED, new HashMap<String, Object>() {{
         put("notification.type", "deleteentitytags");
         put("kato.last.task.id", taskId);
       }});
-
     } catch (Exception e) {
-      log.error("Failed to clean up tags for stage {} ",stage, e);
-      return new TaskResult(ExecutionStatus.FAILED_CONTINUE);
+      log.error(
+        "Failed to clean up tags for stage {} of {} {}",
+        stage.getId(),
+        stage.getExecution().getType(),
+        stage.getExecution().getId(),
+        e
+      );
+      return new TaskResult(SUCCEEDED);
     }
-
   }
 
   private Predicate<Map> hasNonMatchingImageId(String imageId) {
     return tag -> {
+      if (!"object".equals(tag.get("valueType"))) {
+        return false;
+      }
       Map value = ((Map) tag.getOrDefault("value", Collections.EMPTY_MAP));
       return value.containsKey("imageId") && !value.get("imageId").equals(imageId);
     };
diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTaskSpec.groovy
index 3b8ad9433a..ac5c7fe6de 100644
--- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTaskSpec.groovy
+++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/tasks/rollingpush/CleanUpTagsTaskSpec.groovy
@@ -33,29 +33,36 @@ class CleanUpTagsTaskSpec extends Specification {
       [
         tags: [
           [
-            name: "tagName",
-            value: [
+            namespace: "astrid_rules",
+            name     : "tagName",
+            value    : [
               imageId: "imageId"
-            ]
+            ],
+            valueType: "object"
           ],
           [
-            name: "tagName2",
-            value: [
+            namespace: "astrid_rules",
+            name     : "tagName2",
+            value    : [
               imageId: "imageId1"
-            ]
+            ],
+            valueType: "object"
           ]
         ]
       ],
       [
         tags: [
           [
-            name: "tagName3",
-            value: [
+            namespace: "astrid_rules",
+            name     : "tagName3",
+            value    : [
               imageId: "imageId1"
-            ]
+            ],
+            valueType: "object"
           ],
           [
-            name: "tagName3"
+            namespace: "astrid_rules",
+            name     : "tagName3"
           ]
         ]
       ]