diff --git a/assemblies/pentaho-war/pom.xml b/assemblies/pentaho-war/pom.xml
index 50a94546bcc..073d297d873 100644
--- a/assemblies/pentaho-war/pom.xml
+++ b/assemblies/pentaho-war/pom.xml
@@ -848,9 +848,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>com.konloch</groupId>
+      <artifactId>safeyaml</artifactId>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index a6ec3259ac2..f11415167b1 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -1825,9 +1825,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>com.konloch</groupId>
+      <artifactId>safeyaml</artifactId>
+      <version>${safeyaml.version}</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/repository/pom.xml b/repository/pom.xml
index 09b901f6202..48ca19845e2 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -197,9 +197,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>com.konloch</groupId>
+      <artifactId>safeyaml</artifactId>
+      <version>${safeyaml.version}</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>