diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1657e8b4..e6441b0c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed issues with URI when using Routing Policy [PR #1245](https://github.com/3scale/APIcast/pull/1245) [THREESCALE-6410](https://issues.redhat.com/browse/THREESCALE-6410)
+- Fixed typo on TLS jsonschema [PR #1260](https://github.com/3scale/APIcast/pull/1260) [THREESCALE-6390](https://issues.redhat.com/browse/THREESCALE-6390)
+
 
 ### Added
 
diff --git a/gateway/src/apicast/policy/tls/apicast-policy.json b/gateway/src/apicast/policy/tls/apicast-policy.json
index 3185340d2..1cc1eace8 100644
--- a/gateway/src/apicast/policy/tls/apicast-policy.json
+++ b/gateway/src/apicast/policy/tls/apicast-policy.json
@@ -17,7 +17,7 @@
           "type": "object",
           "anyOf": [
             {
-              "title": "Embedded certificate",
+              "title": "Certificate from local filesystem",
               "properties":  {
                 "certificate_path": {
                   "type": "string",
@@ -31,7 +31,7 @@
               "required": ["certificate_path", "certificate_key_path"]
             },
             {
-              "title": "Certificate from local filesystem",
+              "title": "Embedded certificate",
               "properties":  {
                 "certificate": {
                   "type": "string",