diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
index d01fdd28e6101c4c48c8f4ec987a790721cbc628..9b2a5ea2e6a33b5cf4ec0481f37b7042ca3c2afd 100644
--- a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
+++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
@@ -593,6 +593,9 @@ public class KubernetesClientResource {
   public String deleteCR(Map<String, Object> headers, String crspec) {
 
     logger.debug("============ DELETE crspec =============" );
+    if (!checkCRIDGEClusterContext(headers)) {
+      return "SEE OTHER";
+    }
     logger.debug("{}", crspec );
    
     
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 30dc66035076e41e1d46f8297f6f4d01ce7cffe9..c531518112a7f0d3ca129618c2ea7f8e20d55640 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,6 +4,8 @@ spring:
       on-profile: "default"
   application:
     name: cridge
+  main:
+    web-application-type: none
   activemq:
     brokerUrl: tcp://localhost:61616?jms.watchTopicAdvisories=false
     user: artemis