diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/KnativeSettings.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/KnativeSettings.java
index 7f9a960a43..5d3b967187 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/KnativeSettings.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/KnativeSettings.java
@@ -68,7 +68,7 @@ public class KnativeSettings {
 
     private static final String AUTO_REMOVE_RESOURCES_PROPERTY = KNATIVE_PROPERTY_PREFIX + "auto.remove.resources";
     private static final String AUTO_REMOVE_RESOURCES_ENV = KNATIVE_ENV_PREFIX + "AUTO_REMOVE_RESOURCES";
-    private static final String AUTO_REMOVE_RESOURCES_DEFAULT = "true";
+    private static final String AUTO_REMOVE_RESOURCES_DEFAULT = "false";
 
     private static final String VERIFY_BROKER_RESPONSE_PROPERTY = KNATIVE_PROPERTY_PREFIX + "verify.broker.resources";
     private static final String VERIFY_BROKER_RESPONSE_ENV = KNATIVE_ENV_PREFIX + "VERIFY_BROKER_RESPONSE";
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/AbstractKnativeAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/AbstractKnativeAction.java
index 32be6661d9..99d65acd48 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/AbstractKnativeAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/AbstractKnativeAction.java
@@ -21,6 +21,7 @@
 import org.citrusframework.AbstractTestActionBuilder;
 import org.citrusframework.actions.AbstractTestAction;
 import org.citrusframework.context.TestContext;
+import org.citrusframework.knative.KnativeSettings;
 import org.citrusframework.kubernetes.ClusterType;
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
@@ -38,6 +39,8 @@ public abstract class AbstractKnativeAction extends AbstractTestAction implement
     private final ClusterType clusterType;
     private final String namespace;
 
+    private final boolean autoRemoveResources;
+
     public AbstractKnativeAction(String name, Builder<?, ?> builder) {
         super("knative:" + name, builder);
 
@@ -45,6 +48,7 @@ public AbstractKnativeAction(String name, Builder<?, ?> builder) {
         this.kubernetesClient = builder.kubernetesClient;
         this.namespace = builder.namespace;
         this.clusterType = builder.clusterType;
+        this.autoRemoveResources = builder.autoRemoveResources;
     }
 
     @Override
@@ -66,6 +70,11 @@ public ClusterType clusterType(TestContext context) {
         return KnativeAction.super.clusterType(context);
     }
 
+    @Override
+    public boolean isAutoRemoveResources() {
+        return autoRemoveResources;
+    }
+
     @Override
     public String getNamespace() {
         return namespace;
@@ -84,6 +93,8 @@ public static abstract class Builder<T extends KnativeAction, B extends Builder<
 
         protected ReferenceResolver referenceResolver;
 
+        private boolean autoRemoveResources = KnativeSettings.isAutoRemoveResources();
+
         /**
          * Use a custom Kubernetes client.
          */
@@ -116,6 +127,11 @@ public B clusterType(ClusterType clusterType) {
             return self;
         }
 
+        public B autoRemoveResources(boolean enabled) {
+            this.autoRemoveResources = enabled;
+            return self;
+        }
+
         public B withReferenceResolver(ReferenceResolver referenceResolver) {
             this.referenceResolver = referenceResolver;
             return self;
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
index a51117bbdc..45ca1f30a6 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
@@ -50,6 +50,12 @@ public interface KnativeAction extends TestAction {
      */
     String getNamespace();
 
+    /**
+     * Should remove Knative resources automatically after test.
+     * @return
+     */
+    boolean isAutoRemoveResources();
+
     /**
      * Resolves namespace name from given test context using the stored test variable.
      * Fallback to the namespace given in Knative environment settings when no test variable is present.
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateBrokerAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateBrokerAction.java
index f9daa84672..ed2f40ad8e 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateBrokerAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateBrokerAction.java
@@ -28,6 +28,8 @@
 import org.citrusframework.knative.actions.AbstractKnativeAction;
 import org.citrusframework.kubernetes.KubernetesSettings;
 
+import static org.citrusframework.knative.actions.KnativeActionBuilder.knative;
+
 public class CreateBrokerAction extends AbstractKnativeAction {
 
     private final String brokerName;
@@ -100,6 +102,12 @@ private void createBroker(TestContext context) {
                 .resource(broker)
                 .createOr(Updatable::update);
 
+        if (isAutoRemoveResources()) {
+            context.doFinally(knative().client(getKubernetesClient()).client(getKnativeClient())
+                    .brokers()
+                    .delete(resolvedBrokerName));
+        }
+
         logger.info(String.format("Successfully created Knative broker '%s' in namespace %s", resolvedBrokerName, brokerNamespace));
     }
 
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateTriggerAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateTriggerAction.java
index 5c7ddcfaae..09c054631e 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateTriggerAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/eventing/CreateTriggerAction.java
@@ -29,6 +29,8 @@
 import org.citrusframework.knative.actions.AbstractKnativeAction;
 import org.citrusframework.kubernetes.KubernetesSettings;
 
+import static org.citrusframework.knative.actions.KnativeActionBuilder.knative;
+
 public class CreateTriggerAction extends AbstractKnativeAction {
 
     private final String triggerName;
@@ -50,6 +52,7 @@ public CreateTriggerAction(Builder builder) {
 
     @Override
     public void doExecute(TestContext context) {
+        String resolvedTriggerName = context.replaceDynamicContentInString(triggerName);
         TriggerSpecBuilder triggerSpec = new TriggerSpecBuilder()
                 .withBroker(brokerName(brokerName, context));
 
@@ -61,7 +64,7 @@ public void doExecute(TestContext context) {
                 .withApiVersion(String.format("%s/%s", KnativeSupport.knativeEventingGroup(), KnativeSupport.knativeApiVersion()))
                 .withNewMetadata()
                     .withNamespace(namespace(context))
-                    .withName(context.replaceDynamicContentInString(triggerName))
+                    .withName(context.replaceDynamicContentInString(resolvedTriggerName))
                     .withLabels(KnativeSettings.getDefaultLabels())
                 .endMetadata()
                 .withSpec(triggerSpec.build())
@@ -71,6 +74,12 @@ public void doExecute(TestContext context) {
                 .inNamespace(namespace(context))
                 .resource(trigger)
                 .createOr(Updatable::update);
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(knative().client(getKubernetesClient()).client(getKnativeClient())
+                    .trigger()
+                    .delete(resolvedTriggerName));
+        }
     }
 
     private void addFilterOnAttributes(TriggerSpecBuilder triggerSpec, TestContext context) {
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateChannelAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateChannelAction.java
index a6d07c82c6..135779e839 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateChannelAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateChannelAction.java
@@ -25,6 +25,8 @@
 import org.citrusframework.knative.actions.AbstractKnativeAction;
 import org.citrusframework.kubernetes.KubernetesSettings;
 
+import static org.citrusframework.knative.actions.KnativeActionBuilder.knative;
+
 public class CreateChannelAction extends AbstractKnativeAction {
 
     private final String channelName;
@@ -37,11 +39,12 @@ public CreateChannelAction(Builder builder) {
 
     @Override
     public void doExecute(TestContext context) {
+        String resolvedChannelName = context.replaceDynamicContentInString(channelName);
         Channel channel = new ChannelBuilder()
             .withApiVersion(String.format("%s/%s", KnativeSupport.knativeMessagingGroup(), KnativeSupport.knativeApiVersion()))
             .withNewMetadata()
                 .withNamespace(namespace(context))
-                .withName(context.replaceDynamicContentInString(channelName))
+                .withName(context.replaceDynamicContentInString(resolvedChannelName))
                 .withLabels(KnativeSettings.getDefaultLabels())
             .endMetadata()
             .build();
@@ -50,6 +53,12 @@ public void doExecute(TestContext context) {
                 .inNamespace(namespace(context))
                 .resource(channel)
                 .createOr(Updatable::update);
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(knative().client(getKubernetesClient()).client(getKnativeClient())
+                    .channels()
+                    .delete(resolvedChannelName));
+        }
     }
 
     @Override
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java
index feb7d08be2..186c4edb79 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java
@@ -26,6 +26,8 @@
 import org.citrusframework.knative.actions.AbstractKnativeAction;
 import org.citrusframework.kubernetes.KubernetesSettings;
 
+import static org.citrusframework.knative.actions.KnativeActionBuilder.knative;
+
 public class CreateSubscriptionAction extends AbstractKnativeAction {
 
     private final String subscriptionName;
@@ -69,6 +71,12 @@ public void doExecute(TestContext context) {
                 .inNamespace(namespace(context))
                 .resource(subscription)
                 .createOr(Updatable::update);
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(knative().client(getKubernetesClient()).client(getKnativeClient())
+                    .subscriptions()
+                    .delete(subscriptionName));
+        }
     }
 
     @Override
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateBroker.java
index 11cc8f2a86..84cc8468cc 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateBroker.java
@@ -65,6 +65,12 @@ public CreateBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateChannel.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateChannel.java
index 6d9fe4ad51..431020537f 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateChannel.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateChannel.java
@@ -65,6 +65,12 @@ public CreateChannel inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateChannel autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateSubscription.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateSubscription.java
index 84fccea149..62f80bd78b 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateSubscription.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateSubscription.java
@@ -75,6 +75,12 @@ public CreateSubscription inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateSubscription autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateTrigger.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateTrigger.java
index ecd73bf708..88a516aba0 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateTrigger.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/CreateTrigger.java
@@ -92,6 +92,12 @@ public CreateTrigger inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateTrigger autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteBroker.java
index d10208967e..abc4c46baa 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteBroker.java
@@ -65,6 +65,12 @@ public DeleteBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteChannel.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteChannel.java
index c674a9316a..742414b15a 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteChannel.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteChannel.java
@@ -59,6 +59,12 @@ public DeleteChannel client(KnativeClient client) {
         return this;
     }
 
+    @Override
+    public DeleteChannel autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteChannel inNamespace(String namespace) {
         this.delegate.inNamespace(namespace);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteResource.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteResource.java
index a69bbe8f56..180ef98dbe 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteResource.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteResource.java
@@ -75,6 +75,12 @@ public DeleteResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteSubscription.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteSubscription.java
index c413f1f01e..acc52f14fd 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteSubscription.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteSubscription.java
@@ -65,6 +65,12 @@ public DeleteSubscription inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteSubscription autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteTrigger.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteTrigger.java
index 858e4165b4..66b70dd552 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteTrigger.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/DeleteTrigger.java
@@ -65,6 +65,12 @@ public DeleteTrigger inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteTrigger autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/ReceiveEvent.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/ReceiveEvent.java
index b6febca06f..e518126985 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/ReceiveEvent.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/ReceiveEvent.java
@@ -91,6 +91,12 @@ public ReceiveEvent inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public ReceiveEvent autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public ReceiveEventAction build() {
         return delegate.build();
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/SendEvent.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/SendEvent.java
index a08b8275f5..19d8d4d771 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/SendEvent.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/SendEvent.java
@@ -95,6 +95,12 @@ public SendEvent inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public SendEvent autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public SendEventAction build() {
         return delegate.build();
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/VerifyBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/VerifyBroker.java
index e52e73c3fb..b7ef9141ef 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/VerifyBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/xml/VerifyBroker.java
@@ -65,6 +65,12 @@ public VerifyBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateBroker.java
index 5e7d850070..bfb83e8146 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateBroker.java
@@ -61,6 +61,12 @@ public CreateBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateChannel.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateChannel.java
index 3cc53bf03a..58c0407b58 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateChannel.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateChannel.java
@@ -61,6 +61,12 @@ public CreateChannel inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateChannel autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateSubscription.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateSubscription.java
index 38f416ff03..5fe38f72eb 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateSubscription.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateSubscription.java
@@ -69,6 +69,12 @@ public CreateSubscription inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateSubscription autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateTrigger.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateTrigger.java
index 0e60f49019..f07015c6b1 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateTrigger.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/CreateTrigger.java
@@ -80,6 +80,12 @@ public CreateTrigger inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateTrigger autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateTriggerAction build() {
         return delegate.build();
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteBroker.java
index 31a303c88a..5446542672 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteBroker.java
@@ -61,6 +61,12 @@ public DeleteBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteChannel.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteChannel.java
index bffcaeb82b..7303d1f4f9 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteChannel.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteChannel.java
@@ -61,6 +61,12 @@ public DeleteChannel inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteChannel autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteResource.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteResource.java
index 7471118c55..0e6a107722 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteResource.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteResource.java
@@ -69,6 +69,12 @@ public DeleteResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteSubscription.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteSubscription.java
index 67c4ccfcc1..fe56c00895 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteSubscription.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteSubscription.java
@@ -61,6 +61,12 @@ public DeleteSubscription inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteSubscription autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteTrigger.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteTrigger.java
index 610eeb544d..450664eb9a 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteTrigger.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/DeleteTrigger.java
@@ -61,6 +61,12 @@ public DeleteTrigger inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteTrigger autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/ReceiveEvent.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/ReceiveEvent.java
index 8a4e2be95b..2bc85c7a32 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/ReceiveEvent.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/ReceiveEvent.java
@@ -80,6 +80,12 @@ public ReceiveEvent inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public ReceiveEvent autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public ReceiveEventAction build() {
         return delegate.build();
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/SendEvent.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/SendEvent.java
index 7de2cabbc3..10215b44ed 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/SendEvent.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/SendEvent.java
@@ -84,6 +84,12 @@ public SendEvent inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public SendEvent autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public SendEventAction build() {
         return delegate.build();
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/VerifyBroker.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/VerifyBroker.java
index fb3c898f6f..6888928a15 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/VerifyBroker.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/yaml/VerifyBroker.java
@@ -61,6 +61,12 @@ public VerifyBroker inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyBroker autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/KubernetesSettings.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/KubernetesSettings.java
index c6b39b0bb3..b19e4e07bd 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/KubernetesSettings.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/KubernetesSettings.java
@@ -37,7 +37,7 @@ public class KubernetesSettings {
 
     private static final String AUTO_REMOVE_RESOURCES_PROPERTY = KUBERNETES_PROPERTY_PREFIX + "auto.remove.resources";
     private static final String AUTO_REMOVE_RESOURCES_ENV = KUBERNETES_ENV_PREFIX + "AUTO_REMOVE_RESOURCES";
-    private static final String AUTO_REMOVE_RESOURCES_DEFAULT = "true";
+    private static final String AUTO_REMOVE_RESOURCES_DEFAULT = "false";
 
     private static final String ENABLED_PROPERTY = KUBERNETES_PROPERTY_PREFIX + "enabled";
     private static final String ENABLED_ENV = KUBERNETES_ENV_PREFIX + "ENABLED";
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/AbstractKubernetesAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/AbstractKubernetesAction.java
index 4289a8d12a..7c446c09dd 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/AbstractKubernetesAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/AbstractKubernetesAction.java
@@ -20,6 +20,7 @@
 import org.citrusframework.AbstractTestActionBuilder;
 import org.citrusframework.actions.AbstractTestAction;
 import org.citrusframework.kubernetes.KubernetesActor;
+import org.citrusframework.kubernetes.KubernetesSettings;
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.slf4j.Logger;
@@ -37,11 +38,14 @@ public abstract class AbstractKubernetesAction extends AbstractTestAction implem
 
     private final String namespace;
 
+    private final boolean autoRemoveResources;
+
     public AbstractKubernetesAction(String name, Builder<?, ?> builder) {
         super("k8s:" + name, builder);
 
         this.kubernetesClient = builder.kubernetesClient;
         this.namespace = builder.namespace;
+        this.autoRemoveResources = builder.autoRemoveResources;
         this.setActor(builder.getActor());
     }
 
@@ -55,6 +59,11 @@ public String getNamespace() {
         return namespace;
     }
 
+    @Override
+    public boolean isAutoRemoveResources() {
+        return autoRemoveResources;
+    }
+
     /**
      * Action builder.
      */
@@ -62,6 +71,7 @@ public static abstract class Builder<T extends KubernetesAction, B extends Build
 
         private KubernetesClient kubernetesClient;
         private String namespace;
+        private boolean autoRemoveResources = KubernetesSettings.isAutoRemoveResources();
         private ReferenceResolver referenceResolver;
 
         /**
@@ -80,6 +90,11 @@ public B inNamespace(String namespace) {
             return self;
         }
 
+        public B autoRemoveResources(boolean enabled) {
+            this.autoRemoveResources = enabled;
+            return self;
+        }
+
         public B withReferenceResolver(ReferenceResolver referenceResolver) {
             this.referenceResolver = referenceResolver;
             return self;
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
index 4ca353584c..4a20a183b1 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
@@ -33,6 +33,8 @@
 import org.citrusframework.spi.Resource;
 import org.citrusframework.util.FileUtils;
 
+import static org.citrusframework.kubernetes.actions.KubernetesActionBuilder.kubernetes;
+
 public class CreateConfigMapAction extends AbstractKubernetesAction implements KubernetesAction {
 
     private final String configMapName;
@@ -77,6 +79,12 @@ public void doExecute(TestContext context) {
                 .inNamespace(namespace(context))
                 .resource(configMap)
                 .createOr(Updatable::update);
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(kubernetes().client(getKubernetesClient())
+                    .configMaps()
+                    .delete(configMapName));
+        }
     }
 
     /**
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateCustomResourceAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateCustomResourceAction.java
index da2dde992f..f5870dd93a 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateCustomResourceAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateCustomResourceAction.java
@@ -33,6 +33,8 @@
 import org.citrusframework.spi.Resources;
 import org.citrusframework.util.FileUtils;
 
+import static org.citrusframework.kubernetes.actions.KubernetesActionBuilder.kubernetes;
+
 public class CreateCustomResourceAction extends AbstractKubernetesAction implements KubernetesAction {
 
     private final String type;
@@ -69,11 +71,18 @@ public void doExecute(TestContext context) {
         }
 
         if (resourceType != null) {
-            getKubernetesClient()
+            HasMetadata resource = getKubernetesClient()
                     .resources(resourceType)
                     .inNamespace(namespace(context))
                     .load(new ByteArrayInputStream(resolvedResource.getBytes(StandardCharsets.UTF_8)))
                     .createOr(Updatable::update);
+
+            if (isAutoRemoveResources()) {
+                context.doFinally(kubernetes().client(getKubernetesClient())
+                        .customResources()
+                        .delete(resource.getMetadata().getName())
+                        .resourceType(resourceType));
+            }
         } else {
             GenericKubernetesResource resource = getKubernetesClient()
                     .genericKubernetesResources(KubernetesSupport.crdContext(context.replaceDynamicContentInString(type),
@@ -87,6 +96,16 @@ public void doExecute(TestContext context) {
             if (resource.get("messages") != null) {
                 throw new CitrusRuntimeException(String.format("Failed to create custom resource - %s", resource.get("messages")));
             }
+
+            if (isAutoRemoveResources()) {
+                context.doFinally(kubernetes().client(getKubernetesClient())
+                        .customResources()
+                        .delete(resource.getMetadata().getName())
+                        .type(type)
+                        .group(group)
+                        .kind(kind)
+                        .version(version));
+            }
         }
     }
 
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
index e26b3c59a1..dee5c27239 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
@@ -33,6 +33,8 @@
 import org.citrusframework.spi.Resource;
 import org.citrusframework.util.FileUtils;
 
+import static org.citrusframework.kubernetes.actions.KubernetesActionBuilder.kubernetes;
+
 public class CreateSecretAction extends AbstractKubernetesAction implements KubernetesAction {
 
     private final String secretName;
@@ -74,10 +76,17 @@ public void doExecute(TestContext context) {
                 .withData(data)
                 .build();
 
-        getKubernetesClient().secrets()
+        Secret created = getKubernetesClient().secrets()
                 .inNamespace(namespace(context))
                 .resource(secret)
                 .createOr(Updatable::update);
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(kubernetes().client(getKubernetesClient())
+                    .secrets()
+                    .delete(created.getMetadata().getName())
+                    .inNamespace(getNamespace()));
+        }
     }
 
     /**
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateServiceAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateServiceAction.java
index 24eff71863..a7333f8b53 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateServiceAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateServiceAction.java
@@ -38,6 +38,8 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
+import static org.citrusframework.kubernetes.actions.KubernetesActionBuilder.kubernetes;
+
 public class CreateServiceAction extends AbstractKubernetesAction {
 
     private final String serviceName;
@@ -95,6 +97,12 @@ public void doExecute(TestContext context) {
         if (created.getSpec().getClusterIP() != null) {
             context.setVariable(KubernetesVariableNames.SERVICE_CLUSTER_IP.value(), created.getSpec().getClusterIP());
         }
+
+        if (isAutoRemoveResources()) {
+            context.doFinally(kubernetes().client(getKubernetesClient())
+                    .services()
+                    .delete(created.getMetadata().getName()));
+        }
     }
 
     /**
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/DeleteCustomResourceAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/DeleteCustomResourceAction.java
index 61485b2ff5..f6c03bc706 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/DeleteCustomResourceAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/DeleteCustomResourceAction.java
@@ -18,6 +18,7 @@
 
 import java.util.Locale;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.Version;
@@ -28,7 +29,7 @@ public class DeleteCustomResourceAction extends AbstractKubernetesAction {
 
     private final String resourceName;
     private final String type;
-    private final Class<? extends CustomResource<?, ?>> resourceType;
+    private final Class<? extends HasMetadata> resourceType;
     private final String version;
     private final String kind;
     private final String group;
@@ -71,7 +72,7 @@ public void doExecute(TestContext context) {
     public static class Builder extends AbstractKubernetesAction.Builder<DeleteCustomResourceAction, Builder> {
 
         private String resourceName;
-        private Class<? extends CustomResource<?, ?>> resourceType;
+        private Class<? extends HasMetadata> resourceType;
         private String type;
         private String version;
         private String kind;
@@ -82,7 +83,7 @@ public Builder resourceName(String name) {
             return this;
         }
 
-        public Builder resourceType(Class<CustomResource<?, ?>> resourceType) {
+        public Builder resourceType(Class<? extends HasMetadata> resourceType) {
             this.resourceType = resourceType;
             return this;
         }
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesAction.java
index e3be327bb9..a0da9a66a9 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesAction.java
@@ -39,6 +39,12 @@ public interface KubernetesAction extends TestAction {
      */
     String getNamespace();
 
+    /**
+     * Should remove Knative resources automatically after test.
+     * @return
+     */
+    boolean isAutoRemoveResources();
+
     /**
      * Resolves namespace name from given test context using the stored test variable.
      * Fallback to the namespace given in Kubernetes environment settings when no test variable is present.
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateAnnotations.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateAnnotations.java
index b7d0b937f2..9ceb8a41cd 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateAnnotations.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateAnnotations.java
@@ -75,6 +75,12 @@ public CreateAnnotations inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateAnnotations autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateAnnotationsAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateConfigMap.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateConfigMap.java
index dd6eaeab07..f116353c42 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateConfigMap.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateConfigMap.java
@@ -78,6 +78,12 @@ public CreateConfigMap inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateConfigMap autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateConfigMapAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateCustomResource.java
index 9f2eaee707..31be307fe4 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateCustomResource.java
@@ -93,6 +93,12 @@ public CreateCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateLabels.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateLabels.java
index 978bde378c..f4b04d8658 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateLabels.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateLabels.java
@@ -75,6 +75,12 @@ public CreateLabels inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateLabels autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateLabelsAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateResource.java
index 57bf901253..41060cdd74 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateResource.java
@@ -63,6 +63,12 @@ public CreateResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateSecret.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateSecret.java
index 0d498871af..1c513a81b5 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateSecret.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateSecret.java
@@ -78,6 +78,12 @@ public CreateSecret inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateSecret autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateSecretAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateService.java
index 282f2ed173..0b9532460d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/CreateService.java
@@ -94,6 +94,12 @@ public CreateService inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateService autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public void setReferenceResolver(ReferenceResolver referenceResolver) {
         this.delegate.setReferenceResolver(referenceResolver);
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteConfigMap.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteConfigMap.java
index 01d0badbfe..e20da4ec80 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteConfigMap.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteConfigMap.java
@@ -57,6 +57,12 @@ public DeleteConfigMap inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteConfigMap autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteConfigMapAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteCustomResource.java
index f41b05e696..5060fda9b2 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteCustomResource.java
@@ -87,6 +87,12 @@ public DeleteCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteResource.java
index cc08d838ae..d9e0fd4609 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteResource.java
@@ -63,6 +63,12 @@ public DeleteResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteSecret.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteSecret.java
index 9f9e321220..48cdcd988b 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteSecret.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteSecret.java
@@ -57,6 +57,12 @@ public DeleteSecret inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteSecret autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteSecretAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteService.java
index 3a1b048630..fd058a8c7f 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/DeleteService.java
@@ -57,6 +57,12 @@ public DeleteService inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteService autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteServiceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyCustomResource.java
index e334aa16d5..3170e54f29 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyCustomResource.java
@@ -108,6 +108,12 @@ public VerifyCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public VerifyCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyPod.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyPod.java
index d786200c13..9f844ff536 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyPod.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/VerifyPod.java
@@ -101,6 +101,12 @@ public VerifyPod inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyPod autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public VerifyPodAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/WatchPodLogs.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/WatchPodLogs.java
index f739a8a664..35dd9e200b 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/WatchPodLogs.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/xml/WatchPodLogs.java
@@ -81,6 +81,12 @@ public WatchPodLogs inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public WatchPodLogs autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public WatchPodLogsAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateAnnotations.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateAnnotations.java
index 20f6d583dd..bd9399934f 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateAnnotations.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateAnnotations.java
@@ -64,6 +64,12 @@ public CreateAnnotations inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateAnnotations autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateAnnotationsAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateConfigMap.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateConfigMap.java
index 552f1610bb..4862bc5827 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateConfigMap.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateConfigMap.java
@@ -67,6 +67,12 @@ public CreateConfigMap inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateConfigMap autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateConfigMapAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateCustomResource.java
index fc04d93deb..31b08d781f 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateCustomResource.java
@@ -82,6 +82,12 @@ public CreateCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateLabels.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateLabels.java
index 3e0338951f..e422418ea2 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateLabels.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateLabels.java
@@ -63,6 +63,12 @@ public CreateLabels inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateLabels autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateLabelsAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateResource.java
index 1b451db052..57efb81e1c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateResource.java
@@ -57,6 +57,12 @@ public CreateResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateSecret.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateSecret.java
index 2421d56e62..5884a76b23 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateSecret.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateSecret.java
@@ -67,6 +67,12 @@ public CreateSecret inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateSecret autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateSecretAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateService.java
index a2d83474d6..7f375b5e0c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/CreateService.java
@@ -86,6 +86,12 @@ public CreateService inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public CreateService autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public CreateServiceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteConfigMap.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteConfigMap.java
index 5af99bc838..bdf6f3ad58 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteConfigMap.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteConfigMap.java
@@ -53,6 +53,12 @@ public DeleteConfigMap inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteConfigMap autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteConfigMapAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteCustomResource.java
index 052e7f210b..d927d7d92b 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteCustomResource.java
@@ -78,6 +78,12 @@ public DeleteCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteResource.java
index ca28ca4fc8..e38b64a76d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteResource.java
@@ -57,6 +57,12 @@ public DeleteResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteSecret.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteSecret.java
index 4ae03f358a..47daeddc00 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteSecret.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteSecret.java
@@ -53,6 +53,12 @@ public DeleteSecret inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteSecret autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteSecretAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteService.java
index 252a1762dd..fb2cb94c9d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/DeleteService.java
@@ -53,6 +53,12 @@ public DeleteService inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public DeleteService autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public DeleteServiceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyCustomResource.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyCustomResource.java
index f956f7a2dc..9b2d684249 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyCustomResource.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyCustomResource.java
@@ -95,6 +95,12 @@ public VerifyCustomResource inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyCustomResource autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public VerifyCustomResourceAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyPod.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyPod.java
index bcf153d1e4..3c3b302341 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyPod.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/VerifyPod.java
@@ -84,6 +84,12 @@ public VerifyPod inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public VerifyPod autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public VerifyPodAction doBuild() {
         return delegate.build();
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/WatchPodLogs.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/WatchPodLogs.java
index 3495241f1c..bcbdc3c794 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/WatchPodLogs.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/yaml/WatchPodLogs.java
@@ -68,6 +68,12 @@ public WatchPodLogs inNamespace(String namespace) {
         return this;
     }
 
+    @Override
+    public WatchPodLogs autoRemoveResources(boolean enabled) {
+        this.delegate.autoRemoveResources(enabled);
+        return this;
+    }
+
     @Override
     public WatchPodLogsAction doBuild() {
         return delegate.build();
diff --git a/core/citrus-api/src/main/java/org/citrusframework/context/TestContext.java b/core/citrus-api/src/main/java/org/citrusframework/context/TestContext.java
index e4c0c2ff0e..0bf62b1b7d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/context/TestContext.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/context/TestContext.java
@@ -16,6 +16,17 @@
 
 package org.citrusframework.context;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
 import org.citrusframework.CitrusSettings;
 import org.citrusframework.TestAction;
 import org.citrusframework.TestActionBuilder;
@@ -58,17 +69,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
 /**
  * Class holding and managing test variables. The test context also provides utility methods
  * for replacing dynamic content(variables and functions) in message payloads and headers.
@@ -137,6 +137,12 @@ public class TestContext implements ReferenceResolverAware, TestActionListenerAw
      */
     private List<AfterTest> afterTest = new ArrayList<>();
 
+    /**
+     * Further chain of test actions to be executed in any case (success, error)
+     * Usually used to clean up resources in any case of test result.
+     */
+    private final List<TestActionBuilder<?>> finalActions = new ArrayList<>();
+
     /**
      * List of message listeners to be informed on inbound and outbound message exchange
      */
@@ -662,6 +668,14 @@ public void setAfterTest(List<AfterTest> afterTest) {
         this.afterTest = afterTest;
     }
 
+    /**
+     * Optains the final actions.
+     * @return
+     */
+    public List<TestActionBuilder<?>> getFinalActions() {
+        return finalActions;
+    }
+
     /**
      * Obtains the segmentVariableExtractorRegistry
      *
@@ -916,6 +930,10 @@ public boolean isSuccess(TestResult testResult) {
                         .orElse(false);
     }
 
+    public void doFinally(TestActionBuilder<?> action) {
+        this.finalActions.add(action);
+    }
+
     /**
      * Empty test case implementation used as test result when tests fail before execution.
      */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
index 53467d9e0f..8d2f69e8b0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
@@ -16,20 +16,13 @@
 
 package org.citrusframework;
 
-import static java.lang.String.format;
-import static java.util.Objects.isNull;
-import static java.util.Objects.nonNull;
-import static org.citrusframework.TestResult.failed;
-import static org.citrusframework.TestResult.skipped;
-import static org.citrusframework.TestResult.success;
-import static org.citrusframework.util.TestUtils.waitForCompletion;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.time.StopWatch;
 import org.citrusframework.container.AbstractActionContainer;
 import org.citrusframework.container.AfterTest;
@@ -41,6 +34,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.lang.String.format;
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+import static org.citrusframework.TestResult.failed;
+import static org.citrusframework.TestResult.skipped;
+import static org.citrusframework.TestResult.success;
+import static org.citrusframework.util.TestUtils.waitForCompletion;
+
 /**
  * Default test case implementation holding a list of test actions to execute. Test case also holds variable definitions and
  * performs the test lifecycle such as start, finish, before and after test.
@@ -297,6 +298,18 @@ private void executeFinalActions(TestContext context) {
             }
         }
 
+        /* test context may also have some actions to run finally */
+        for (final TestActionBuilder<?> actionBuilder : context.getFinalActions()) {
+            TestAction action = actionBuilder.build();
+            if (!action.isDisabled(context)) {
+                context.getTestActionListeners().onTestActionStart(this, action);
+                action.execute(context);
+                context.getTestActionListeners().onTestActionFinish(this, action);
+            } else {
+                context.getTestActionListeners().onTestActionSkipped(this, action);
+            }
+        }
+
         if (testResult.isSuccess() && context.hasExceptions()) {
             CitrusRuntimeException contextException = context.getExceptions().remove(0);
             testResult = getTestResultInstanceProvider(context).createFailed(this, contextException);
@@ -413,7 +426,7 @@ public String toString() {
 
         stringBuilder.append("] ");
 
-        return super.toString() + stringBuilder.toString();
+        return super.toString() + stringBuilder;
     }
 
     @Override