diff --git a/magento/magento2ce/2016-07-19.yaml b/magento/product-community-edition/2016-07-19.yaml
similarity index 77%
rename from magento/magento2ce/2016-07-19.yaml
rename to magento/product-community-edition/2016-07-19.yaml
index bfe221a2b..55feddf80 100644
--- a/magento/magento2ce/2016-07-19.yaml
+++ b/magento/product-community-edition/2016-07-19.yaml
@@ -1,6 +1,6 @@
 title:     Unauthenticated crypto and weak IV in Magento\Framework\Encryption
 link:      http://www.openwall.com/lists/oss-security/2016/07/19/3
-cve:       ~
+cve:       CVE-2016-6485
 branches:
     "2.0":
         time:     2014-02-13 11:12:34
@@ -10,6 +10,6 @@ branches:
         versions: ['>=2.1', '<2.2']
     "2.2":
         time:     2014-02-13 11:12:34
-        versions: ['>=2.2', '<2.3']
-reference: composer://magento/magento2ce
+        versions: ['>=2.2', '<2.2.5']
+reference: composer://magento/product-community-edition
 composer-repository: false
diff --git a/magento/product-community-edition/2018-06-27.yaml b/magento/product-community-edition/2018-06-27.yaml
new file mode 100644
index 000000000..f4a67fab8
--- /dev/null
+++ b/magento/product-community-edition/2018-06-27.yaml
@@ -0,0 +1,12 @@
+title:     Magento 2.2.5 and 2.1.14 Security update
+link:      https://magento.com/security/patches/magento-2.2.5-and-2.1.14-security-update
+cve:       ~
+branches:
+    "2.1":
+        time:     2018-06-27 00:00:00
+        versions: ['>=2.1', '<2.1.14']
+    "2.2":
+        time:     2018-06-27 00:00:00
+        versions: ['>=2.2', '<2.2.5']
+reference: composer://magento/product-community-edition
+composer-repository: false