diff --git a/jkube-kit/enricher/generic/pom.xml b/jkube-kit/enricher/generic/pom.xml
index 6acce17578..494f7d7a4b 100644
--- a/jkube-kit/enricher/generic/pom.xml
+++ b/jkube-kit/enricher/generic/pom.xml
@@ -68,6 +68,12 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
+      <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>2.15.3</version>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 
 </project>
diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
index 29045a06f9..a779d3771f 100644
--- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
+++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
@@ -21,16 +21,19 @@
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import org.eclipse.jkube.kit.common.util.Base64Util;
 import org.eclipse.jkube.kit.config.resource.PlatformMode;
+import org.eclipse.jkube.kit.enricher.api.model.Configuration;
 import org.eclipse.jkube.kit.config.resource.ResourceConfig;
 import org.eclipse.jkube.kit.config.resource.SecretConfig;
 import org.eclipse.jkube.kit.enricher.api.BaseEnricher;
 import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
 import org.eclipse.jkube.kit.enricher.api.util.SecretConstants;
 import org.apache.commons.lang3.StringUtils;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Collections;
+
 
 public abstract class SecretEnricher extends BaseEnricher {
 
@@ -76,7 +79,7 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) {
         log.verbose("Adding secrets resources from plugin configuration");
         List<SecretConfig> secrets = getSecretsFromXmlConfig();
         Map<String, Integer> secretToIndexMap = new HashMap<>();
-        if (secrets == null || secrets.isEmpty()) {
+        if (secrets.isEmpty()) {
             return;
         }
 
@@ -128,11 +131,10 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) {
     }
 
     private List<SecretConfig> getSecretsFromXmlConfig() {
-        ResourceConfig resourceConfig = getConfiguration().getResource();
-        if(resourceConfig != null && resourceConfig.getSecrets() != null) {
-            return resourceConfig.getSecrets();
-        }
-        return null;
+        return Optional.ofNullable(getConfiguration())
+                .map(Configuration::getResource)
+                .map(ResourceConfig::getSecrets)
+                .orElse(Collections.emptyList());
     }
 
     private String getDockerIdFromAnnotation(Map<String, String> annotation) {
diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java
index e9161b8f54..a1254c2f42 100644
--- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java
+++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java
@@ -72,7 +72,9 @@ public TriggersAnnotationEnricher(JKubeEnricherContext buildContext) {
 
     @Override
     public void enrich(PlatformMode platformMode, KubernetesListBuilder builder) {
-
+        if(platformMode != PlatformMode.openshift){
+            return;
+        }
         builder.accept(new TypedVisitor<StatefulSetBuilder>() {
             @Override
             public void visit(StatefulSetBuilder o) {