diff --git a/add-ons/dns.next.json b/add-ons/dns.next.json
index 89d9993c..3e81377b 100644
--- a/add-ons/dns.next.json
+++ b/add-ons/dns.next.json
@@ -2,8 +2,8 @@
   "metadata": {
     "id": "dns.next",
     "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/raw/branch/master/add-ons/dns.next.json",
+    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/dns.next.json",
     "scoring": {
       "cutoff_score": 60,
       "criteria": {
@@ -55,8 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "2018.01",
-      "releases": ["mitaka", "newton", "ocata", "pike"],
+      "target_approval": "dns.2021.06",
+      "replaces": "dns.2020.11",
+      "releases": ["ussuri","victoria", "wallaby", "xena"],
       "status": "draft"
     }
   },
@@ -69,7 +70,7 @@
       "required_platform_components": [
         {
           "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/next.json"
+          "source": "http://opendev.org/osf/interop/next.json"
         }
       ]
     }
@@ -78,10 +79,10 @@
     "os_powered_dns": {
       "capabilities": {
         "required": [
+            "dns-record-crud",
+            "dns-zone-crud"
         ],
         "advisory": [
-          "dns-record-crud",
-          "dns-zone-crud"
         ],
         "deprecated": [
         ],
@@ -89,7 +90,7 @@
         ]
       },
       "designated_sections": {
-        "advisory": [
+        "required": [
           "designate"
         ]
       }
@@ -110,6 +111,7 @@
       "admin": false,
       "description": "Operations to create, update, and delete dns records.",
       "project": "designate",
+      "required_since": "2018.02",
       "tests": {
         "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest.test_create_all_recordset_types": {
           "idempotent_id": "d03b69a5-5052-43bc-a38a-b511b6b34304"
@@ -145,6 +147,7 @@
       "admin": false,
       "description": "Operations to create, update, and delete zones.",
       "project": "designate",
+      "required_since": "2018.02",
       "tests": {
         "designate_tempest_plugin.tests.scenario.v2.test_zones.ZonesTest.test_create_and_delete_zone": {
           "idempotent_id": "d0648f53-4114-45bd-8792-462a82f69d32"
@@ -181,7 +184,7 @@
   "test_repositories": {
     "designate-tempest-plugin": {
       "repository": "http://opendev.org/openstack/designate-tempest-plugin/",
-      "reference": "master",
+      "reference": "5da3047851aae36f09e0b52f79523426fec6a104",
       "description": "OpenStack Designate Test Plugin Repository"
     }
   }
diff --git a/add-ons/orchestration.next.json b/add-ons/orchestration.next.json
index 530b6e63..0156ce49 100644
--- a/add-ons/orchestration.next.json
+++ b/add-ons/orchestration.next.json
@@ -2,8 +2,8 @@
   "metadata": {
     "id": "orchestration.next",
     "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "http://opendev.org/openstack/interop/",
+    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "http://opendev.org/osf/interop/raw/branch/master/add-ons/orchestration.next.json",
     "scoring": {
       "cutoff_score": 60,
       "criteria": {
@@ -55,8 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "2018.01",
-      "releases": ["mitaka", "newton", "ocata", "pike"],
+      "target_approval": "orchestration.2021.06",
+      "replaces": "orchestration.2020.11",
+      "releases": ["ussuri", "victoria", "wallaby", "xena"],
       "status": "draft"
     }
   },
@@ -69,7 +70,7 @@
       "required_platform_components": [
         {
           "name": "os_powered_compute",
-          "source": "http://opendev.org/openstack/interop/next.json"
+          "source": "http://opendev.org/osf/interop/next.json"
         }
       ]
     }
@@ -78,13 +79,15 @@
     "os_powered_orchestration": {
       "capabilities": {
         "required": [
-        ],
-        "advisory": [
           "stack-create",
           "stack-delete",
           "stack-environment-parameter",
-          "stack-get-output",
+          "stack-event",
+          "stack-hook",
           "stack-list",
+          "stack-output",
+          "stack-preview",
+          "stack-list-resources",
           "stack-list-resource-types",
           "stack-list-template-functions",
           "stack-list-template-versions",
@@ -95,7 +98,12 @@
           "stack-show-resource-type",
           "stack-show-unhealthy-resource",
           "stack-signal-resource",
-          "stack-validate-template"
+          "stack-software-config",
+          "stack-tag",
+          "stack-template",
+          "stack-update"
+        ],
+        "advisory": [
         ],
         "deprecated": [
         ],
@@ -124,11 +132,12 @@
       "admin": false,
       "description": "Create new stacks.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.stacks_create_empty_stack.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.stacks_create_empty_stack.test_request": {
           "idempotent_id": "bde1b827-65fb-47ea-909f-82537e6260d3"
         },
-        "heat_tempest_plugin.tests.test_heat_api.resources_create_stack_with_resources.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_create_stack_with_resources.test_request": {
           "idempotent_id": "947be7b2-503d-41f5-9843-61be50954f13"
         },
         "heat_tempest_plugin.tests.scenario.test_base_resources.BasicResourcesTest.test_base_resources_integration": {
@@ -150,6 +159,7 @@
       "admin": false,
       "description": "Update stacks.",
       "project": "heat",
+          "required_since": "2018.11",
       "tests": {
         "heat_tempest_plugin.tests.api.test_heat_api.stacks_update_stack.test_request": {
           "idempotent_id": "6bb1ec02-dd19-4b2c-9a6d-866ce666650f"
@@ -173,14 +183,15 @@
       "admin": false,
       "description": "Delete stacks.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.stacks_delete_empty_stack.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.stacks_delete_empty_stack.test_request": {
           "idempotent_id": "7eca55fe-8300-43b6-a6b8-fb2d99b51911"
         },
-        "heat_tempest_plugin.tests.test_heat_api.environments_delete_envstack.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.environments_delete_envstack.test_request": {
           "idempotent_id": "0efde180-cc0e-4f2c-bb18-fa345e8d21ad"
         },
-        "heat_tempest_plugin.tests.test_heat_api.resources_delete_stack_with_resources.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_delete_stack_with_resources.test_request": {
           "idempotent_id": "0edc4fdc-811d-4d27-a0dd-6ec4db2bda6e"
         }
       }
@@ -200,12 +211,12 @@
       "description": "Create an environment with parameters.",
       "project": "heat",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.environments_environment_with_parameter.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.environments_environment_with_parameter.test_request": {
           "idempotent_id": "8281d088-0c80-4071-a13d-333b309be6ca"
         }
       }
     },
-    "stack-get-output": {
+    "stack-output": {
       "achievements": [
         "atomic",
         "clients",
@@ -219,9 +230,19 @@
       "admin": false,
       "description": "Get the output of a stack.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.environments_get_stack_output.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.environments_get_stack_output.test_request": {
           "idempotent_id": "f60dd8df-82d1-4228-8926-54d65ebd12e1"
+        },
+        "heat_tempest_plugin.tests.functional.test_stack_outputs.StackOutputsTest.test_outputs": {
+          "idempotent_id": "a886dd67-4506-4a37-82ae-43f0a7d83f35"
+        },
+        "heat_tempest_plugin.tests.functional.test_stack_outputs.StackOutputsTest.test_outputs_update_new_resource": {
+          "idempotent_id": "aea0e495-4c77-4033-8c43-3351e9cb7b48"
+        },
+        "heat_tempest_plugin.tests.functional.test_stack_outputs.StackOutputsTest.test_output_error_nested": {
+          "idempotent_id": "993a403c-c6e2-475d-a65d-a82b8c9e0c22"
         }
       }
     },
@@ -239,8 +260,9 @@
       "admin": false,
       "description": "List stacks.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.stacks_stack_list.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.stacks_stack_list.test_request": {
           "idempotent_id": "39c0245e-6055-41cf-9f0e-15adfe55ded6"
         }
       }
@@ -259,12 +281,19 @@
       "admin": false,
       "description": "List available resources.",
       "project": "heat",
+          "required_since": "2018.11",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resources_list_filtered_resources.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_list_filtered_resources.test_request": {
           "idempotent_id": "da07d3d2-9ccc-4fa1-9b1b-9cb3074fe9b9"
         },
-        "heat_tempest_plugin.tests.test_heat_api.resources_list_resources.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_list_resources.test_request": {
           "idempotent_id": "ec53f10d-a89a-4243-8706-629a01ea890f"
+        },
+        "heat_tempest_plugin.tests.functional.test_resources_list.ResourcesList.test_filtering_with_depend": {
+          "idempotent_id": "b65b5c82-68b0-42c9-82a0-c0e74e9ad906"
+        },
+        "heat_tempest_plugin.tests.functional.test_resources_list.ResourcesList.test_required_by": {
+          "idempotent_id": "97a65d53-b449-4a43-8283-42d43b165756"
         }
       }
     },
@@ -282,8 +311,9 @@
       "admin": false,
       "description": "List available resource types.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resourcetypes_list_resource_types.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resourcetypes_list_resource_types.test_request": {
           "idempotent_id": "5b4db88b-d171-4400-b7a7-a7dc8f597d31"
          }
       }
@@ -302,8 +332,9 @@
       "admin": false,
       "description": "List template versions.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.templates_list_template_versions.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.templates_list_template_versions.test_request": {
           "idempotent_id": "cbc28c20-e740-43ef-a01b-b1a39f4a0db3"
          }
       }
@@ -322,8 +353,9 @@
       "admin": false,
       "description": "List template functions.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.templates_list_template_functions.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.templates_list_template_functions.test_request": {
           "idempotent_id": "721ff23c-8527-480f-a090-1c915b4f8430"
         }
       }
@@ -342,8 +374,9 @@
       "admin": false,
       "description": "Mark a resource as unhealthy.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resources_mark_resource_unhealthy.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_mark_resource_unhealthy.test_request": {
           "idempotent_id": "6031516b-3a8f-4d1b-8990-81a571b5f956"
         }
       }
@@ -362,8 +395,9 @@
       "admin": false,
       "description": "Show resource type template.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resourcetypes_resource_type_template.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resourcetypes_resource_type_template.test_request": {
           "idempotent_id": "5a2164eb-645a-4245-acd7-b222a715fc09"
         }
       }
@@ -382,8 +416,9 @@
       "admin": false,
       "description": "Show the empty stack.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.stacks_show_empty_stack.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.stacks_show_empty_stack.test_request": {
           "idempotent_id": "89b233fe-0d55-4959-9289-0b5dabe4e4c9"
         }
       }
@@ -402,8 +437,9 @@
       "admin": false,
       "description": "Show a resource.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resources_show_resource.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_show_resource.test_request": {
           "idempotent_id": "2cbcedc5-0aa7-454e-bf89-a3dd5d379dc1"
         }
       }
@@ -422,8 +458,9 @@
       "admin": false,
       "description": "Show a resource type.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resourcetypes_show_resource_type.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resourcetypes_show_resource_type.test_request": {
           "idempotent_id": "cc05d1ef-17f1-430e-bea1-0f6766f7d0b4"
         }
       }
@@ -442,8 +479,9 @@
       "admin": false,
       "description": "Show unhealthy resources.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resources_show_unhealthy_resource.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_show_unhealthy_resource.test_request": {
           "idempotent_id": "9e784490-2e88-49af-8ee7-c4c6aba2be64"
         }
       }
@@ -462,13 +500,14 @@
       "admin": false,
       "description": "Send a signal to a resource.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.resources_signal_resource.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.resources_signal_resource.test_request": {
           "idempotent_id": "c65a047c-8c7b-4b44-9f5f-bf1069751c5c"
         }
       }
     },
-    "stack-validate-template": {
+    "stack-template": {
       "achievements": [
         "atomic",
         "clients",
@@ -482,12 +521,198 @@
       "admin": false,
       "description": "Validate templates.",
       "project": "heat",
+          "required_since": "2018.02",
       "tests": {
-        "heat_tempest_plugin.tests.test_heat_api.templates_template_validate.test_request": {
+        "heat_tempest_plugin.tests.api.test_heat_api.templates_template_validate.test_request": {
           "idempotent_id": "f307139b-03d0-4006-92b7-81c86c949727"
+        },
+        "heat_tempest_plugin.tests.functional.test_templates.TemplateAPITest.test_get_stack_template": {
+          "idempotent_id": "ac6ebc41-bd6a-4df4-80e5-f4b9ae3b5506"
+        },
+        "heat_tempest_plugin.tests.functional.test_templates.TemplateAPITest.test_resource_types": {
+          "idempotent_id": "9f9a2fc0-f029-4d1f-a2eb-f019b9f75944"
+        },
+        "heat_tempest_plugin.tests.functional.test_templates.TemplateAPITest.test_show_resource_template": {
+          "idempotent_id": "fafbdcd0-eec3-4e6f-9c88-1e4835d085cf"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_basic": {
+          "idempotent_id": "b65a80c2-a507-4deb-9e7e-43181cc05211"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_override_default": {
+          "idempotent_id": "bf27371d-e202-4bae-9f13-2ef137958517"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_override_none": {
+          "idempotent_id": "0278e03d-ed50-4909-b29d-9c4267d3fcd6"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_basic_required_param": {
+          "idempotent_id": "acb1435b-f1db-4427-9121-7e3144ddb81e"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_fail_version": {
+          "idempotent_id": "7aac1feb-8256-4f70-8459-5e9780d28904"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_parameter_groups": {
+          "idempotent_id": "6a6472d2-71fa-4ebe-a2b6-20878838555b"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_nested_off": {
+          "idempotent_id": "5100cf18-f52a-47a2-880c-d540edad149f"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_nested_on": {
+          "idempotent_id": "480bcf64-25ae-49c7-b147-7cbc27d09cea"
+        },
+        "heat_tempest_plugin.tests.functional.test_template_validate.StackTemplateValidateTest.test_template_validate_nested_on_multiple": {
+          "idempotent_id": "a0bb07f0-2e10-4226-a205-a7eb04df415f"
+        },
+        "heat_tempest_plugin.tests.functional.test_unicode_template.StackUnicodeTemplateTest.test_template_validate_basic": {
+          "idempotent_id": "871cc5dd-7550-494d-8c6d-9d549a8c0305"
+        },
+        "heat_tempest_plugin.tests.functional.test_unicode_template.StackUnicodeTemplateTest.test_template_validate_override_default": {
+          "idempotent_id": "e84c76b8-a5e5-45e7-9c4b-4c160d1c385f"
+        },
+        "heat_tempest_plugin.tests.functional.test_unicode_template.StackUnicodeTemplateTest.test_stack_preview": {
+          "idempotent_id": "66338945-a3ae-4e3a-aa17-ab802ceb00b1"
+        },
+        "heat_tempest_plugin.tests.functional.test_unicode_template.StackUnicodeTemplateTest.test_create_stack": {
+          "idempotent_id": "d2c4a10c-3cb4-4efd-889d-695a0acbd04f"
+        }
+      }
+    },
+    "stack-hook": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Set and unset hook",
+      "project": "heat",
+          "required_since": "2018.11",
+      "tests": {
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_create": {
+          "idempotent_id": "f14cbe86-0392-474a-9f28-bb561745698d"
+        },
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_update_nochange": {
+          "idempotent_id": "75009076-96eb-43af-b4df-f002704737d2"
+        },
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_update_replace": {
+          "idempotent_id": "9f03d1e0-a2d2-42fc-a9c6-47db05b9c8ed"
+        },
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_update_in_place": {
+          "idempotent_id": "15c4f97d-5e06-40c6-83af-0e57d5afaff9"
+        },
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_create_nested": {
+          "idempotent_id": "7d96b5f4-4aba-493d-b098-4beea4654a2b"
+        },
+        "heat_tempest_plugin.tests.functional.test_hooks.HooksTest.test_hook_pre_create_wildcard": {
+          "idempotent_id": "cffc0783-3add-4f0c-ac66-03c90f6feeb0"
+        }
+      }
+    },
+    "stack-preview": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Preview stack",
+      "project": "heat",
+          "required_since": "2018.11",
+      "tests": {
+        "heat_tempest_plugin.tests.functional.test_preview.StackPreviewTest.test_basic_pass": {
+          "idempotent_id": "4c2c062d-4723-42c0-a113-3307dd4ceb12"
+        },
+        "heat_tempest_plugin.tests.functional.test_preview.StackPreviewTest.test_basic_fail": {
+          "idempotent_id": "54e69a54-762d-479e-a4f4-1fbf21af01c6"
+        },
+        "heat_tempest_plugin.tests.functional.test_preview.StackPreviewTest.test_nested_pass": {
+          "idempotent_id": "0449113c-ff90-4f2b-8825-27ea35c1983f"
+        },
+        "heat_tempest_plugin.tests.functional.test_preview.StackPreviewTest.test_res_group_with_nested_template:Wherej": {
+          "idempotent_id": "6ca8ddfc-106f-4ecc-83f7-fca31d0c85ca"
+        }
+      }
+    },
+    "stack-software-config": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Software config deployment",
+      "project": "heat",
+          "required_since": "2018.11",
+      "tests": {
+        "heat_tempest_plugin.tests.functional.test_software_config.ParallelDeploymentsTest.test_deployments_metadata": {
+          "idempotent_id": "8ee231ff-f80a-4a17-a860-5cda87e18ad0"
+        },
+        "heat_tempest_plugin.tests.functional.test_software_config.ParallelDeploymentsTest.test_deployments_timeout_failed": {
+          "idempotent_id": "bd539232-b999-4bec-b47d-ff4822fc8b82"
+        }
+      }
+    },
+    "stack-event": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Stack event.",
+      "project": "heat",
+          "required_since": "2018.11",
+      "tests": {
+        "heat_tempest_plugin.tests.functional.test_stack_events.StackEventsTest.test_event": {
+          "idempotent_id": "620f4f7c-74f8-48a4-a8b0-d06d0337f133"
+        }
+      }
+    },
+    "stack-tag": {
+      "achievements": [
+        "atomic",
+        "clients",
+        "complete",
+        "discover",
+        "doc",
+        "future",
+        "stable",
+        "tools"
+      ],
+      "admin": false,
+      "description": "Tag Stack.",
+      "project": "heat",
+          "required_since": "2018.11",
+      "tests": {
+        "heat_tempest_plugin.tests.functional.test_stack_tags.StackTagTest.test_stack_tag": {
+          "idempotent_id": "67332e51-b427-42d5-ad8d-fd2ec334f361"
+        },
+        "heat_tempest_plugin.tests.functional.test_stack_tags.StackTagTest.test_hidden_stack": {
+          "idempotent_id": "5ed79584-0684-4f9c-ae8e-44a8f874ec79"
         }
       }
     }
+
+
   },
   "designated_sections": {
     "heat": {
@@ -509,8 +734,8 @@
   },
   "test_repositories": {
     "heat": {
-      "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
-      "reference": "master",
+      "repository": "http://opendev.org/openstack/heat-tempest-plugin/",
+      "reference": "fa9f6ccd34c106bcaa50cb2f13caea2c387a6b5f",
       "description": "OpenStack Heat Tempest Test Plugin Repository"
     }
   }
diff --git a/add-ons/shared_file_system.next.json b/add-ons/shared_file_system.next.json
index 5e12b86b..655bd5fb 100644
--- a/add-ons/shared_file_system.next.json
+++ b/add-ons/shared_file_system.next.json
@@ -55,8 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "2021.04",
-      "releases": ["train", "ussuri", "victoria", "wallaby"],
+      "target_approval": "2021.06",
+      "replaces": "2020.11",
+      "releases": ["ussuri", "victoria", "wallaby", "xena"],
       "status": "draft"
     }
   },
@@ -121,6 +122,7 @@
       "admin": false,
       "description": "List supported versions of the Shared File Systems service API",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_microversions.MicroversionsTest.test_microversions_v2_no_version": {
           "idempotent_id": "id-9a8bd7fd-f9d0-4fc6-8e1c-0178d87ec7c1"
@@ -141,6 +143,7 @@
       "admin": false,
       "description": "Create and delete a manila share.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares.SharesNFSTest.test_create_get_delete_share": {
           "idempotent_id": "id-21ad41fb-04cf-493c-bc2f-66c80220898b",
@@ -168,6 +171,7 @@
       "admin": false,
       "description": "Get details of a manila share at API microversion 2.1",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares_actions.SharesActionsTest.test_get_share_v2_1": {
           "idempotent_id": "id-188badb2-0ca3-44e5-abca-3029475d7f73"
@@ -188,6 +192,7 @@
       "admin": false,
       "description": "List manila shares.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares_actions.SharesActionsTest.test_list_shares": {
           "idempotent_id": "id-7d61311a-81b0-481c-abb9-cfb0b4f82e29"
@@ -211,6 +216,7 @@
       "admin": false,
       "description": "Update a manila share.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares_actions.SharesRenameTest.test_update_share": {
           "idempotent_id": "id-7661d042-8222-483c-9249-9f53931e7347"
@@ -231,6 +237,7 @@
       "admin": false,
       "description": "Increase the size of a manila share.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares_actions.SharesActionsTest.test_extend_share": {
           "idempotent_id": "id-17e6f579-e0d7-4724-a639-4974e82bb5ed"
@@ -251,6 +258,7 @@
       "admin": false,
       "description": "Decrease the size of a manila share.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_shares_actions.SharesActionsTest.test_shrink_share": {
           "idempotent_id": "id-8f64b930-9b4e-41d7-bbd6-82d9951931f3"
@@ -271,6 +279,7 @@
       "admin": false,
       "description": "Create and delete a manila share network.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest.test_create_delete_share_network": {
           "idempotent_id": "id-b998a594-f630-475d-b46f-e4143caf61fb"
@@ -291,6 +300,7 @@
       "admin": false,
       "description": "Update a manila share network.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest.test_update_share_network": {
           "idempotent_id": "id-1837fdd3-8068-4e88-bc50-9224498f84c0"
@@ -311,6 +321,7 @@
       "admin": false,
       "description": "Get manila share network details.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest.test_get_share_network": {
           "idempotent_id": "id-55990ec2-37f0-483f-9c67-76fd6f377cc1"
@@ -331,6 +342,7 @@
       "admin": false,
       "description": "List manila share networks.",
       "project": "manila",
+      "required_since": "2020.11",
       "tests": {
         "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest.test_list_share_networks": {
           "idempotent_id": "id-41c635b1-d9ef-4c05-9100-5e4b0034b523"
diff --git a/next.json b/next.json
index 29a8feda..7bb63aed 100644
--- a/next.json
+++ b/next.json
@@ -2,8 +2,8 @@
   "metadata": {
     "id": "next",
     "schema": "2.0",
-    "reference": "https://opendev.org/openstack/interop/raw/branch/master/doc/source/schema/2.0.json",
-    "source": "https://opendev.org/openstack/interop/raw/branch/master/next.json",
+    "reference": "https://opendev.org/osf/interop/raw/branch/master/doc/source/schema/2.0.json",
+    "source": "https://opendev.org/osf/interop/raw/branch/master/next.json",
     "scoring": {
       "cutoff_score": 74,
       "criteria": {
@@ -70,9 +70,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "2018.08",
-      "replaces": "2018.02",
-      "releases": ["ocata", "pike", "queens", "rocky"],
+      "target_approval": "2021.06",
+      "replaces": "2020.11",
+      "releases": ["ussuri", "victoria", "wallaby", "xena"],
       "status": "draft"
     }
   },
@@ -111,6 +111,7 @@
           "compute-list-api-versions",
           "compute-quotas-get",
           "compute-servers-create",
+          "compute-servers-create-multiple",
           "compute-servers-delete",
           "compute-servers-get",
           "compute-servers-host",
@@ -134,6 +135,7 @@
           "identity-v3-catalog",
           "identity-v3-list-projects",
           "identity-v3-tokens-create",
+          "identity-v3-tokens-delete",
           "identity-v3-tokens-validate",
           "images-v2-index",
           "images-v2-update",
@@ -157,30 +159,12 @@
           "volumes-v3-availability-zones",
           "volumes-v3-extensions",
           "volumes-v3-metadata",
-          "volumes-v3-readonly"
-        ],
-        "advisory": [
-          "volumes-v3-upload",
-          "compute-servers-create-multiple",
-          "identity-v3-tokens-delete"
+          "volumes-v3-readonly",
+          "volumes-v3-upload"
         ],
+        "advisory": [],
         "deprecated": [],
-        "removed": [
-          "volumes-v2-reserve",
-          "volumes-v3-reserve",
-          "volumes-v2-create-delete",
-          "volumes-v2-snapshot-create-delete",
-          "volumes-v2-get",
-          "volumes-v2-list",
-          "volumes-v2-update",
-          "volumes-v2-copy-image-to-volume",
-          "volumes-v2-clone",
-          "volumes-v2-availability-zones",
-          "volumes-v2-extensions",
-          "volumes-v2-metadata",
-          "volumes-v2-readonly",
-          "volumes-v2-upload"
-        ]
+        "removed": []
       },
       "designated_sections": {
         "required" : [
@@ -213,10 +197,10 @@
           "objectstore-object-versioned",
           "objectstore-temp-url-get",
           "objectstore-temp-url-put",
-          "identity-v3-tokens-create"
+          "identity-v3-tokens-create",
+          "identity-v3-tokens-delete"
         ],
-        "advisory": [
-          "identity-v3-tokens-delete"],
+        "advisory": [],
         "deprecated": [],
         "removed": []
       },
@@ -405,7 +389,7 @@
       "admin": false,
       "description": "Generate, import, and delete SSH or x509 keys within Compute services",
       "project": "nova",
-      "required_since": "2018.08",
+      "required_since": "2018.11",
       "tests": {
         "tempest.api.compute.keypairs.test_keypairs_v22.KeyPairsV22TestJSON.test_keypairsv22_create_list_show_with_type": {
           "idempotent_id": "id-89d59d43-f735-441a-abcf-0601727f47b6"
@@ -502,7 +486,7 @@
       "admin": false,
       "description": "Create multiple servers in one API call",
       "project": "nova",
-      "required_since": "",
+      "required_since": "2019.06",
       "tests": {
         "tempest.api.compute.servers.test_multiple_create.MultipleCreateTestJSON.test_multiple_create": {
           "idempotent_id": "id-61e03386-89c3-449c-9bb1-a06f423fd9d1"
@@ -1192,7 +1176,7 @@
       "admin": false,
       "description": "Get service catalog",
       "project": "keystone",
-      "required_since": "2018.08",
+      "required_since": "2018.11",
       "tests": {
         "tempest.api.identity.v3.test_catalog.IdentityCatalogTest.test_catalog_standardization": {
           "idempotent_id": "id-56b57ced-22b8-4127-9b8a-565dfb0207e2"
@@ -1267,7 +1251,7 @@
       "admin": false,
       "description": "Validate and show token information",
       "project": "keystone",
-      "required_since": "2018.08",
+      "required_since": "2018.11",
       "tests": {
         "tempest.api.identity.v3.test_tokens.TokensV3Test.test_validate_token": {
           "idempotent_id": "id-a9512ac3-3909-48a4-b395-11f438e16260"
@@ -1281,7 +1265,7 @@
       "admin": false,
       "descriptin": "Delete (revoke) identity token API",
       "project": "keystone",
-      "required_since": "",
+      "required_since": "2019.06",
       "tests": {
         "tempest.api.identity.v3.test_tokens.TokensV3Test.test_token_auth_creation_existence_deletion": {
           "idempotent_id": "id-0f9f5a5f-d5cd-4a86-8a5b-c5ded151f212"
@@ -1867,7 +1851,7 @@
         "admin": false,
         "description": "",
         "project": "swift",
-        "required_since": "2018.08",
+        "required_since": "2018.11",
         "tests": {
           "tempest.api.object_storage.test_object_slo.ObjectSloTest.test_delete_large_object": {
             "idempotent_id": "id-87b6dfa1-abe9-404d-8bf0-6c3751e6aa77"
@@ -1900,7 +1884,7 @@
         "admin": false,
         "description": "",
         "project": "swift",
-        "required_since": "2018.02",
+        "required_since": "2018.11",
         "tests": {
           "tempest.api.object_storage.test_object_services.ObjectTest.test_object_upload_in_segments": {
            "idempotent_id": "id-e3e6a64a-9f50-4955-b987-6ce6767c97fb",
@@ -2862,7 +2846,7 @@
       "admin": false,
       "description": "Upload volumes with Cinder v3 API. This is being added as advisory to highlight the transitition from  v2 to v3.",
       "project": "cinder",
-      "required_since": "",
+      "required_since": "2019.06",
       "tests": {
         "tempest.api.volume.test_volumes_actions.VolumesActionsTest.test_volume_upload": {
           "idempotent_id": "id-d8f1ca95-3d5b-44a3-b8ca-909691c9532d",
@@ -3219,29 +3203,17 @@
         }
       }
     },
-    "heat": {
-      "informational": {
-        "guidance": "Not a core capability, add-on program planned.",
-        "sections": {}
-      }
-    },
     "horizon": {
       "informational": {
         "guidance": "Clients not considered core capabilities at this time",
         "sections": {}
       }
-    },
-    "ceilometer": {
-      "informational": {
-        "guidance": "Not a core capability, no position at this time",
-        "sections": {}
-      }
     }
   },
   "test_repositories": {
     "tempest": {
       "repository": "https://opendev.org/openstack/tempest/",
-      "reference": "9bd78bcd65c46623b6f04ebdc3efe18375fd296f",
+      "reference": "c8d7a01014d4b82dd9960679db5e77dc31f4d87a",
       "description": "OpenStack Integrated API and Scenario Test Repository"
     }
   }