diff --git a/libwvdrmengine/oemcrypto/CHANGELOG.md b/libwvdrmengine/oemcrypto/CHANGELOG.md
index f632a19d..28a7098c 100644
--- a/libwvdrmengine/oemcrypto/CHANGELOG.md
+++ b/libwvdrmengine/oemcrypto/CHANGELOG.md
@@ -11,7 +11,7 @@ Version 17.2 for details. Since Version 17.2 changes were merged to OEMCrypto
 v18 after Version 18.3 got published, we bumped the version to 18.4 to reflect
 the updates. If your device doesn't support MediaCAS, this update can be skipped.
 
-## Other changes
+### Other changes
 
 - A fix in ODK that matches minor version with major version during session
 initialization.
@@ -24,7 +24,7 @@ minor changes. Version 18.2 was an internal version bump for the ODK that
 included changes used by the provisioning server. Since we keep the ODK and OPK
 version numbers in sync, the OPK version effectively skipped 18.2.
 
-## Cast with Provisioning 4.0
+### Cast with Provisioning 4.0
 
 The OPK now supports devices that wish to act as cast receivers while using
 Provisioning 4.0. Previously, only devices using Provisioning 2.0 or devices
@@ -35,7 +35,7 @@ The OPK changes are included in this release. The CDM changes are part of
 Android U. The provisioning server changes are live on Widevine staging servers,
 and will be pushed to production by August 2023.
 
-## OP-TEE port changes
+### OP-TEE port changes
 
 - Added CSR and DeviceInformation implementations for Provisioning 4.0.
 - Bugfix: REE->TEE message shared memory was sized based on the incoming request
@@ -44,7 +44,7 @@ did not fit in the nearest page boundary. Fixed by setting the shared memory
 size to the maximum allowed and passing in the request size as a separate
 TEE_Param.
 
-## Other changes
+### Other changes
 
 - Updated BoringSSL dependency to
 https://boringssl.googlesource.com/boringssl/+/e1b8685770d0e82e5a4a3c5d24ad1602e05f2e83
@@ -65,7 +65,7 @@ license response. The client-side value of `MAX_NUM_KEYS` must be changed in
 `odk/include/odk_target.h` to match the server's value. This is only intended
 for closed network systems.
 
-## Known issues
+### Known issues
 
 - CdmOtaKeyboxTest.BasicTest may fail due to server issues
 - The ODK renewal clock is not correctly checked for all circumstances. This
@@ -258,7 +258,7 @@ OS.
   4.0.
 - The OPK does not yet support MediaCAS functionality.
 
-## [Version 17.2][To add link]
+## [Version 17.2][v17.2]
 
 This release contains the first version of OPK to support MediaCAS, an
 end-to-end demo of OEMCrypto CAS functionality, several bug fixes in OPK and a
@@ -475,4 +475,7 @@ Public release for OEMCrypto API and ODK library version 16.4.
 [v17+test-updates+opk+mk]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v17+test-updates+opk+mk
 [v17.1]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v17.1
 [v17.1+opk-v17.1.1]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v17.1+opk-v17.1.1
+[v17.2]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v17.2
 [v18.1]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v18.1
+[v18.3]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v18.3
+[v18.4]: https://widevine-partner.googlesource.com/oemcrypto/+/refs/tags/v18.4