diff --git a/core/pom.xml b/core/pom.xml
index e0b9bbe186..825d8a865f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -48,6 +48,11 @@
       <artifactId>kubernetes-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>docker-maven-plugin</artifactId>
diff --git a/core/src/main/java/io/fabric8/maven/core/util/ResourceFileType.java b/core/src/main/java/io/fabric8/maven/core/util/ResourceFileType.java
index 4772749608..b0046321b8 100644
--- a/core/src/main/java/io/fabric8/maven/core/util/ResourceFileType.java
+++ b/core/src/main/java/io/fabric8/maven/core/util/ResourceFileType.java
@@ -18,8 +18,10 @@
 
 import java.io.File;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 
 /**
  * Type of resources supported
@@ -39,7 +41,8 @@ public ObjectMapper getObjectMapper() {
     yaml("yml","yml") {
         @Override
         public ObjectMapper getObjectMapper() {
-            return new ObjectMapper(new YAMLFactory());
+            return new ObjectMapper(new YAMLFactory()
+                                        .configure(YAMLGenerator.Feature.MINIMIZE_QUOTES, true));
         }
     };
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 743ff0eafb..cf59db525c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,20 @@
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-api</artifactId>
         <version>${version.fabric8}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-yaml</artifactId>
+        <version>2.8.4</version>
+      </dependency>
+
       <dependency>
         <groupId>io.fabric8</groupId>
         <artifactId>fabric8-project-utils</artifactId>