diff --git a/add-ons/guidelines/dns.next.json b/add-ons/guidelines/dns.next.json
index 45bbdac4..5747e39a 100644
--- a/add-ons/guidelines/dns.next.json
+++ b/add-ons/guidelines/dns.next.json
@@ -55,9 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "dns.2022.06",
-      "replaces": "dns.2021.11",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "target_approval": "dns.2022.11",
+      "replaces": "dns.2022.06",
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
diff --git a/add-ons/guidelines/key_manager.next.json b/add-ons/guidelines/key_manager.next.json
index 4b3163ab..aa6dc852 100644
--- a/add-ons/guidelines/key_manager.next.json
+++ b/add-ons/guidelines/key_manager.next.json
@@ -55,9 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "key_manager.2022.11",
+      "target_approval": "key_manager.2023.06",
       "replaces": "",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
@@ -221,7 +221,7 @@
   "test_repositories": {
     "barbican-tempest-plugin": {
       "repository": "https://opendev.org/openstack/barbican-tempest-plugin/",
-      "reference": "9fe096e1422c7c884b94166763b4857b5abcea30",
+      "reference": "a32eaf0dd8a4cd1825f69b97dc7ac51519ec07d7",
       "description": "OpenStack Barbican Test Plugin Repository"
     }
   }
diff --git a/add-ons/guidelines/load_balancer.next.json b/add-ons/guidelines/load_balancer.next.json
index 3fe617aa..175e28ea 100644
--- a/add-ons/guidelines/load_balancer.next.json
+++ b/add-ons/guidelines/load_balancer.next.json
@@ -55,9 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "load_balancer.2022.11",
+      "target_approval": "load_balancer.2023.06",
       "replaces": "",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
@@ -351,7 +351,7 @@
   "test_repositories": {
     "octavia-tempest-plugin": {
       "repository": "https://opendev.org/openstack/octavia-tempest-plugin/",
-      "reference": "9b0c0ff4bf9ad64e7a236eaa93909e34707887a4",
+      "reference": "5486b8af9238677d4975493a8cc1afb62f56d8bc",
       "description": "OpenStack Octavia Test Plugin Repository"
     }
   }
diff --git a/add-ons/guidelines/orchestration.next.json b/add-ons/guidelines/orchestration.next.json
index dc0c0c8b..eeea6c2b 100644
--- a/add-ons/guidelines/orchestration.next.json
+++ b/add-ons/guidelines/orchestration.next.json
@@ -55,9 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "orchestration.2022.06",
-      "replaces": "orchestration.2021.11",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "target_approval": "orchestration.2022.11",
+      "replaces": "orchestration.2022.06",
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
@@ -735,7 +735,7 @@
   "test_repositories": {
     "heat": {
       "repository": "https://opendev.org/openstack/heat-tempest-plugin/",
-      "reference": "ba43685c131d6387779ed35f5bf61fc86667a728",
+      "reference": "4196ac5992b5e63ac97dd0f990278c37b17d6c6e",
       "description": "OpenStack Heat Tempest Test Plugin Repository"
     }
   }
diff --git a/add-ons/guidelines/shared_file_system.next.json b/add-ons/guidelines/shared_file_system.next.json
index 863593f3..d6ef7cfc 100644
--- a/add-ons/guidelines/shared_file_system.next.json
+++ b/add-ons/guidelines/shared_file_system.next.json
@@ -55,9 +55,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "shared_file_system.2022.06",
-      "replaces": "shared_file_system.2021.11",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "target_approval": "shared_file_system.2022.11",
+      "replaces": "shared_file_system.2022.06",
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
@@ -393,7 +393,7 @@
   "test_repositories": {
     "manila-tempest-plugin": {
       "repository": "https://opendev.org/openstack/manila-tempest-plugin/",
-      "reference": "5203643c2423c89afc90b1c0045de422c643f85a",
+      "reference": "045dd282fa9ec6de8ee888f9ff2c96fbd22cebe1",
       "description": "OpenStack Manila Test Plugin Repository"
     }
   }
diff --git a/guidelines/next.json b/guidelines/next.json
index f237d572..3bd4e244 100644
--- a/guidelines/next.json
+++ b/guidelines/next.json
@@ -70,9 +70,9 @@
       }
     },
     "os_trademark_approval": {
-      "target_approval": "2022.06",
-      "replaces": "2021.11",
-      "releases": ["wallaby", "xena", "yoga", "zed"],
+      "target_approval": "2022.11",
+      "replaces": "2022.06",
+      "releases": ["xena", "yoga", "zed", "antelope"],
       "status": "draft"
     }
   },
@@ -3917,7 +3917,7 @@
   "test_repositories": {
     "tempest": {
       "repository": "https://opendev.org/openstack/tempest/",
-      "reference": "1d500e79156ada6bc6fdb628ed1da0efd4121f6a",
+      "reference": "bc12bd45867d752d6b4a111686ccbb88967ccf3d",
       "description": "OpenStack Integrated API and Scenario Test Repository"
     }
   }