diff --git a/OSSA-2011-001.yaml b/OSSA-2011-001.yaml
index 1758f2e..9f5327d 100644
--- a/OSSA-2011-001.yaml
+++ b/OSSA-2011-001.yaml
@@ -15,7 +15,7 @@ reference: https://lists.launchpad.net/openstack/msg06105.html
 affected-products:
 
   - product: nova
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -49,8 +49,10 @@ issues:
 
 reviews:
 
-  links:
+  essex:
     - https://review.openstack.org/#/c/2283
+
+  diablo:
     - https://review.openstack.org/#/c/2284
 
   type: gerrit
diff --git a/OSSA-2012-001.yaml b/OSSA-2012-001.yaml
index 5717f13..beae76c 100644
--- a/OSSA-2012-001.yaml
+++ b/OSSA-2012-001.yaml
@@ -16,7 +16,7 @@ reference: https://lists.launchpad.net/openstack/msg06648.html
 affected-products:
 
   - product: nova
-    version: TODO
+    version: 2011.3, Essex
 
 vulnerabilities:
 
@@ -59,8 +59,10 @@ issues:
 
 reviews:
 
-  links:
+  essex:
     - https://review.openstack.org/#/c/2960
+
+  diablo:
     - https://review.openstack.org/#/c/2961
 
   type: gerrit
diff --git a/OSSA-2012-002.yaml b/OSSA-2012-002.yaml
index 44a0be2..643d8ad 100644
--- a/OSSA-2012-002.yaml
+++ b/OSSA-2012-002.yaml
@@ -16,7 +16,7 @@ reference: https://lists.launchpad.net/openstack/msg09193.html
 affected-products:
 
   - product: keystone
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -49,8 +49,10 @@ issues:
 
 reviews:
 
-  links:
+  essex:
     - https://review.openstack.org/#/c/5507
+
+  diablo:
     - https://review.openstack.org/#/c/5865
 
   type: gerrit
diff --git a/OSSA-2012-003.yaml b/OSSA-2012-003.yaml
index 1c03bb4..072749d 100644
--- a/OSSA-2012-003.yaml
+++ b/OSSA-2012-003.yaml
@@ -48,8 +48,11 @@ issues:
 
 reviews:
 
-  links:
+  essex:
     - https://review.openstack.org/#/c/5955
     - https://review.openstack.org/#/c/5957
 
+  diablo:
+    - https://review.openstack.org/#/c/5956
+
   type: gerrit
diff --git a/OSSA-2012-004.yaml b/OSSA-2012-004.yaml
index c7ad5ed..8ddb7db 100644
--- a/OSSA-2012-004.yaml
+++ b/OSSA-2012-004.yaml
@@ -14,7 +14,7 @@ reference: https://lists.launchpad.net/openstack/msg10211.html
 affected-products:
 
   - product: horizon
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -47,8 +47,10 @@ issues:
 
 reviews:
 
-  links:
+  folsom:
     - https://review.openstack.org/#/c/6618
+
+  essex:
     - https://review.openstack.org/#/c/6621
 
   type: gerrit
diff --git a/OSSA-2012-005.yaml b/OSSA-2012-005.yaml
index 281bae0..1d50613 100644
--- a/OSSA-2012-005.yaml
+++ b/OSSA-2012-005.yaml
@@ -14,7 +14,7 @@ reference: https://lists.launchpad.net/openstack/msg10268.html
 affected-products:
 
   - product: nova
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -47,10 +47,14 @@ issues:
 
 reviews:
 
-  links:
+  folsom:
     - https://review.openstack.org/#/c/6653
-    - https://review.openstack.org/#/c/6654
-    - https://review.openstack.org/#/c/6655
     - https://review.openstack.org/#/c/6656
 
+  essex:
+    - https://review.openstack.org/#/c/6654
+
+  diablo:
+    - https://review.openstack.org/#/c/6655
+
   type: gerrit
diff --git a/OSSA-2012-006.yaml b/OSSA-2012-006.yaml
index 6249e7f..7c95e52 100644
--- a/OSSA-2012-006.yaml
+++ b/OSSA-2012-006.yaml
@@ -13,7 +13,7 @@ reference: https://lists.launchpad.net/openstack/msg11263.html
 affected-products:
 
   - product: horizon
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -46,8 +46,10 @@ issues:
 
 reviews:
 
-  links:
+  folsom:
     - https://review.openstack.org/#/c/7144
+
+  essex:
     - https://review.openstack.org/#/c/7145
 
   type: gerrit
diff --git a/OSSA-2012-007.yaml b/OSSA-2012-007.yaml
index fa7c67f..7d55b8f 100644
--- a/OSSA-2012-007.yaml
+++ b/OSSA-2012-007.yaml
@@ -19,7 +19,7 @@ reference: https://lists.launchpad.net/openstack/msg12883.html
 affected-products:
 
   - product: nova
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -52,8 +52,13 @@ issues:
 
 reviews:
 
-  links:
+  folsom:
+    - https://review.openstack.org/#/c/8237
+
+  essex:
     - https://review.openstack.org/#/c/8238
+
+  diablo:
     - https://review.openstack.org/#/c/8239
 
   type: gerrit
diff --git a/OSSA-2012-008.yaml b/OSSA-2012-008.yaml
index e2d48d5..80b1fd6 100644
--- a/OSSA-2012-008.yaml
+++ b/OSSA-2012-008.yaml
@@ -20,7 +20,7 @@ reference: https://lists.launchpad.net/openstack/msg14089.html
 affected-products:
 
   - product: nova
-    version: TODO
+    version: All versions
 
 vulnerabilities:
 
@@ -73,9 +73,13 @@ issues:
 
 reviews:
 
-  links:
+  folsom:
     - https://review.openstack.org/#/c/9266
+
+  essex:
     - https://review.openstack.org/#/c/9267
+
+  diablo:
     - https://review.openstack.org/#/c/9268
 
   type: gerrit