diff --git a/api-catalog-package/src/main/resources/manifest.yaml b/api-catalog-package/src/main/resources/manifest.yaml
index 9ce0b22d03..6e552653b1 100644
--- a/api-catalog-package/src/main/resources/manifest.yaml
+++ b/api-catalog-package/src/main/resources/manifest.yaml
@@ -17,7 +17,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
diff --git a/apiml-common-lib-package/src/main/resources/manifest.yaml b/apiml-common-lib-package/src/main/resources/manifest.yaml
index 0d85eb2673..0d7e81a794 100644
--- a/apiml-common-lib-package/src/main/resources/manifest.yaml
+++ b/apiml-common-lib-package/src/main/resources/manifest.yaml
@@ -15,6 +15,6 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 schemas:
   configs: "apiml-common-lib-schema.json"
diff --git a/apiml-extension-loader/build.gradle b/apiml-extension-loader/build.gradle
index f775f568ef..077de2fa40 100644
--- a/apiml-extension-loader/build.gradle
+++ b/apiml-extension-loader/build.gradle
@@ -3,7 +3,10 @@ dependencies {
     compileOnly libraries.spring_boot_starter_web
 
     implementation libraries.apache_commons_lang3
-    implementation libraries.jackson_dataformat_yaml
+    implementation(libraries.jackson_dataformat_yaml) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
 
     compileOnly libraries.lombok
     annotationProcessor libraries.lombok
diff --git a/apiml-sample-extension-package/src/main/resources/manifest.yaml b/apiml-sample-extension-package/src/main/resources/manifest.yaml
index 931e78a71b..e6e8462766 100644
--- a/apiml-sample-extension-package/src/main/resources/manifest.yaml
+++ b/apiml-sample-extension-package/src/main/resources/manifest.yaml
@@ -15,7 +15,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 # The following block contains all the extensions directory path
 # (or file path) that will be included in the API ML
 gatewaySharedLibs:
diff --git a/apiml-tomcat-common/build.gradle b/apiml-tomcat-common/build.gradle
index 94de50d51c..c01642d156 100644
--- a/apiml-tomcat-common/build.gradle
+++ b/apiml-tomcat-common/build.gradle
@@ -1,5 +1,8 @@
 dependencies {
-    implementation libraries.spring_boot_starter_web
+    implementation(libraries.spring_boot_starter_web) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
     implementation libraries.zowe_attls
 
     implementation libraries.spring_aop
diff --git a/caching-service-package/src/main/resources/manifest.yaml b/caching-service-package/src/main/resources/manifest.yaml
index be311d6821..f0cd5482e9 100644
--- a/caching-service-package/src/main/resources/manifest.yaml
+++ b/caching-service-package/src/main/resources/manifest.yaml
@@ -17,7 +17,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
diff --git a/common-service-core/build.gradle b/common-service-core/build.gradle
index 32b2bacea6..54bc64f0ad 100644
--- a/common-service-core/build.gradle
+++ b/common-service-core/build.gradle
@@ -28,10 +28,15 @@ dependencies {
     compileOnly libraries.lombok
     annotationProcessor libraries.lombok
 
-    implementation(libraries.spring_boot_starter_cache)
     implementation(libraries.eh_cache)
-
-    testImplementation(libraries.spring_boot_starter_cache)
+    implementation(libraries.spring_boot_starter_cache){
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    testImplementation(libraries.spring_boot_starter_cache) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
+    testImplementation libraries.snakeyaml
     testImplementation(libraries.spring_boot_starter_test)
     testImplementation libraries.json_smart
     testImplementation(libraries.eh_cache)
diff --git a/discovery-package/src/main/resources/manifest.yaml b/discovery-package/src/main/resources/manifest.yaml
index 3214748154..ba3d3ceeed 100644
--- a/discovery-package/src/main/resources/manifest.yaml
+++ b/discovery-package/src/main/resources/manifest.yaml
@@ -17,7 +17,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
diff --git a/discovery-service/build.gradle b/discovery-service/build.gradle
index 15845e9323..cebbe6c654 100644
--- a/discovery-service/build.gradle
+++ b/discovery-service/build.gradle
@@ -79,7 +79,10 @@ dependencies {
     implementation libraries.gson
     implementation libraries.jackson_annotations
     implementation libraries.jackson_core
-    implementation libraries.jackson_dataformat_yaml
+    implementation(libraries.jackson_dataformat_yaml) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
     implementation libraries.jackson_databind
     implementation libraries.jetty_client
     implementation libraries.jetty_http
diff --git a/gateway-package/src/main/resources/manifest.yaml b/gateway-package/src/main/resources/manifest.yaml
index 9fb1f32d48..17a74251c4 100644
--- a/gateway-package/src/main/resources/manifest.yaml
+++ b/gateway-package/src/main/resources/manifest.yaml
@@ -17,7 +17,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
diff --git a/gateway-service/build.gradle b/gateway-service/build.gradle
index 991b6f0863..e5dfa0ca0c 100644
--- a/gateway-service/build.gradle
+++ b/gateway-service/build.gradle
@@ -64,6 +64,7 @@ dependencies {
     implementation project(':apiml-security-common')
     implementation project(':apiml-tomcat-common')
     implementation project(':apiml-extension-loader')
+    implementation libraries.snakeyaml
     implementation libraries.spring_boot_starter_webflux
     implementation libraries.spring_boot_starter_actuator
     implementation libraries.spring_boot_starter_web
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index dc5941e99d..9b976181f6 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -59,7 +59,7 @@ ext {
     reactorTestVersion = '3.4.9'
     restAssuredVersion = '4.4.0'
     slf4jVersion = '1.7.31'
-    snakeyamlVersion = '1.27'
+    snakeyamlVersion = '1.31'
     springFoxVersion = '2.9.2'
     springDocVersion = '1.6.9'
     spring4Version = '4.3.7.RELEASE' // Used within PJE in tests
diff --git a/metrics-service-package/src/main/resources/manifest.yaml b/metrics-service-package/src/main/resources/manifest.yaml
index 85b271f5f1..5ea3bb667c 100644
--- a/metrics-service-package/src/main/resources/manifest.yaml
+++ b/metrics-service-package/src/main/resources/manifest.yaml
@@ -17,7 +17,7 @@ build:
   branch: "{{build.branch}}"
   number: "{{build.number}}"
   commitHash: "{{build.commitHash}}"
-  timestamp: "{{build.timestamp}}"
+  timestamp: {{build.timestamp}}
 commands:
   start: bin/start.sh
   validate: bin/validate.sh
diff --git a/metrics-service/build.gradle b/metrics-service/build.gradle
index 5403eb3108..0ecf5cb1fc 100644
--- a/metrics-service/build.gradle
+++ b/metrics-service/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     implementation project(':onboarding-enabler-spring')
     implementation(project(':security-service-client-spring'))
 
+    implementation libraries.snakeyaml
     implementation libraries.jackson_annotations
     implementation libraries.jackson_core
     implementation libraries.jackson_databind
diff --git a/onboarding-enabler-java-sample-app/build.gradle b/onboarding-enabler-java-sample-app/build.gradle
index cd5ad2ae1b..3bfc3a1403 100644
--- a/onboarding-enabler-java-sample-app/build.gradle
+++ b/onboarding-enabler-java-sample-app/build.gradle
@@ -22,7 +22,10 @@ dependencies {
     implementation 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'
 
     compileOnly libraries.javax_servlet_api
-    implementation libraries.jackson_dataformat_yaml
+    implementation(libraries.jackson_dataformat_yaml) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
 
     compileOnly libraries.lombok
     annotationProcessor libraries.lombok
diff --git a/onboarding-enabler-java/build.gradle b/onboarding-enabler-java/build.gradle
index 27596409c3..e461ad52e9 100644
--- a/onboarding-enabler-java/build.gradle
+++ b/onboarding-enabler-java/build.gradle
@@ -4,12 +4,16 @@ dependencies {
     implementation libraries.jaxb_api
     implementation libraries.javax_annotation
     implementation libraries.jackson_annotations
-    implementation libraries.jackson_dataformat_yaml
+    implementation(libraries.jackson_dataformat_yaml) {
+        exclude group: "org.yaml", module: "snakeyaml"
+    }
+    implementation libraries.snakeyaml
     implementation(libraries.eureka_client) {
         exclude group: "javax.servlet", module: "servlet-api"
         exclude group: "com.google.code.gson", module: "gson"
     }
 
+    implementation libraries.snakeyaml
     compileOnly libraries.lombok
     annotationProcessor libraries.lombok