diff --git a/oqs-template/generate.yml-0.9.0 b/oqs-template/generate.yml-0.9.0
index 099d36ed..269388a9 100644
--- a/oqs-template/generate.yml-0.9.0
+++ b/oqs-template/generate.yml-0.9.0
@@ -1,5 +1,5 @@
 # This is the master document for ID interoperability for KEM IDs, p-hybrid KEM IDs, SIG (O)IDs
-# Next free plain KEM ID: 0x0247, p-hybrid: 0x2F47, X-hybrid: 0x2FB2
+# Next free plain KEM ID: 0x0244, p-hybrid: 0x2F44, X-hybrid: 0x2FB0
 kems:
   -
     family: 'FrodoKEM'
@@ -297,62 +297,29 @@ kems:
   -
     family: 'HQC'
     name_group: 'hqc128'
-    nid: '0x0244'
-    nid_hybrid: '0x2F44'
+    nid: '0x022C'
+    nid_hybrid: '0x2F2C'
     oqs_alg: 'OQS_KEM_alg_hqc_128'
     extra_nids:
       current:
         - hybrid_group: "x25519"
-          nid: '0x2FB0'
-      old:
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          nid: '0x022C'
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          hybrid_group: secp256_r1
-          nid: '0x2F2C'
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          hybrid_group: x25519
           nid: '0x2FAC'
   -
     family: 'HQC'
     name_group: 'hqc192'
-    nid: '0x0245'
-    nid_hybrid: '0x2F45'
+    nid: '0x022D'
+    nid_hybrid: '0x2F2D'
     oqs_alg: 'OQS_KEM_alg_hqc_192'
     extra_nids:
       current:
         - hybrid_group: "x448"
-          nid: '0x2FB1'
-      old:
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          nid: '0x022D'
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          hybrid_group: secp384_r1
-          nid: '0x2F2D'
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          hybrid_group: x448
           nid: '0x2FAD'
   -
     family: 'HQC'
     name_group: 'hqc256'
-    nid: '0x0246'
-    nid_hybrid: '0x2F46'
+    nid: '0x022E'
+    nid_hybrid: '0x2F2E'
     oqs_alg: 'OQS_KEM_alg_hqc_256'
-    extra_nids:
-      old:
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          nid: '0x022E'
-        - implementation_version: NIST Round 3 submission
-          nist-round: 3
-          hybrid_group: secp521_r1
-          nid: '0x2F2E'
 
 kem_nid_end: '0x0250'
 kem_nid_hybrid_end: '0x2FFF'