ARM-software · athoelke · Jul 3, 2026
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,12 +1,18 @@
 # SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 # SPDX-License-Identifier: CC-BY-SA-4.0
 
-title: PSA Certified APIs
-description: The official place for the latest published documents of the PSA Certified APIs
+title: PSA API Specifications
+description: PSA API documents published by Arm
 logo: assets/img/ARM_LOGO-2025_INK_RGB.svg
 
 remote_theme: pages-themes/minimal@v0.2.0
 plugins:
 - jekyll-remote-theme # add this line to the plugins list if you already have one
 
 include: _static, _images
+
+github:
+  owner_name: GlobalPlatform
+  owner_url: https://github.com/GlobalPlatform
+  repository_url: https://github.com/GlobalPlatform/psa-api
+  repository_nwo: GlobalPlatform/psa-api
diff --git a/docs/attestation/index.md b/docs/attestation/index.md
@@ -1,5 +1,5 @@
 ---
-title: PSA Certified Attestation API
+title: PSA Attestation API
 description: The Attestation API provides a way to obtain a health-check token from a device, attesting to its components and serial numbers
 ---
 
@@ -8,18 +8,18 @@ SPDX-FileCopyrightText: Copyright 2022, 2025-2026 Arm Limited and/or its affilia
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Attestation API
+# PSA Attestation API
 
 The Attestation API provides a way to obtain a health-check token from a device, attesting to its components and serial numbers.
 
-See the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [PSA API][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
 [psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
+[psa-api-gh]:       https://github.com/globalplatform/psa-api
 [psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
 
 ## Specifications
@@ -43,4 +43,4 @@ Version | | | Publication
 [1-0-1-pdf]:            1.0/IHI0085-PSA_Attestation_API-1.0.1.pdf
 [1-0-0-pdf]:            1.0/IHI0085-PSA_Attestation_API-1.0.0.pdf
 
-*Copyright 2022, 2025-2026, Arm Limited and/or its affiliates*
+*Copyright 2022, 2025-2026 Arm Limited and/or its affiliates*
diff --git a/docs/crypto-driver/index.md b/docs/crypto-driver/index.md
@@ -1,24 +1,24 @@
 ---
-title: PSA Certified Crypto Driver Interface
-description: The Crypto Driver Interface provides a set of interfaces for developing hardware and optimized software drivers for an implementation of the PSA Certified Crypto API.
+title: PSA Crypto Driver Interface
+description: The Crypto Driver Interface provides a set of interfaces for developing hardware and optimized software drivers for an implementation of the PSA Crypto API
 ---
 
 <!--
-SPDX-FileCopyrightText: Copyright 2025 Arm Limited and/or its affiliates
+SPDX-FileCopyrightText: Copyright 2025-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Crypto Driver Interface
+# PSA Crypto Driver Interface
 
-The Crypto Driver Interface provides a set of interfaces for developing hardware and optimized software drivers for an implementation of the PSA Certified Crypto API.
+The Crypto Driver Interface provides a set of interfaces for developing hardware and optimized software drivers for an implementation of the PSA Crypto API.
 
-See the [Crypto API][crypto-api] page for the Crypto API, and the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [Crypto API][crypto-api] page for the Crypto API, and the [PSA API][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
 [crypto-api]:       ../crypto/
 [psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
+[psa-api-gh]:       https://github.com/globalplatform/psa-api
 
 ## Specifications
 
@@ -29,4 +29,4 @@ Version | | | Publication
 [1-0-alpha-1-html]:        1.0/
 [1-0-alpha-1-pdf]:       1.0/111106-PSA_Certified_Crypto_Driver_Interface-1.0-alp.1.pdf
 
-*Copyright 2025, Arm Limited and/or its affiliates*
+*Copyright 2025-2026 Arm Limited and/or its affiliates*
diff --git a/docs/crypto/index.md b/docs/crypto/index.md
@@ -1,5 +1,5 @@
 ---
-title: PSA Certified Crypto API
+title: PSA Crypto API
 description: The Crypto API provides symmetric and asymmetric cryptography, hash, RNG, and key storage services with support for different key lifetime policies
 ---
 
@@ -8,18 +8,18 @@ SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Crypto API
+# PSA Crypto API
 
 The Crypto API provides symmetric and asymmetric cryptography, hash, RNG, and key storage services with support for different key lifetime policies.
 
-See the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [PSA APIs][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
 [psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
+[psa-api-gh]:       https://github.com/globalplatform/psa-api
 [psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
 
 ## Specifications
@@ -100,4 +100,4 @@ PAKE | 1.1 Beta 0 | | [&darr; PDF][pake-beta-0-pdf] | February 2022
 [pqc-beta-1-pdf]:       1.3/ext-pqc/AES0119-PSA_Certified_Crypto_API-1.3_PQC_Extension-bet.1.pdf
 [pqc-beta-0-pdf]:       1.3/ext-pqc/AES0119-PSA_Certified_Crypto_API-1.3_PQC_Extension-bet.0.pdf
 
-*Copyright 2022-2026, Arm Limited and/or its affiliates*
+*Copyright 2022-2026 Arm Limited and/or its affiliates*
diff --git a/docs/fwu/index.md b/docs/fwu/index.md
@@ -1,25 +1,25 @@
 ---
-title: PSA Certified Firmware Update API
+title: PSA Firmware Update API
 description: The Firmware Update API defines a standard firmware interface for installing firmware updates
 ---
 
 <!--
-SPDX-FileCopyrightText: Copyright 2022-2023, 2025 Arm Limited and/or its affiliates
+SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Firmware Update API
+# PSA Firmware Update API
 
 The Firmware Update API defines a standard firmware interface for installing firmware updates.
 
-See the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [PSA API][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
 [psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
+[psa-api-gh]:       https://github.com/globalplatform/psa-api
 [psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
 
 ## Specifications
@@ -39,4 +39,4 @@ Version | | | Publication
 [0-7-html]:           0.7/
 [0-7-beta-pdf]:       0.7/IHI0093-PSA_FWU_API-0.7-beta0.pdf
 
-*Copyright 2022-2023, 2025, Arm Limited and/or its affiliates*
+*Copyright 2022-2026 Arm Limited and/or its affiliates*
diff --git a/docs/index.md b/docs/index.md
@@ -1,28 +1,28 @@
 ---
-title: PSA Certified APIs
-description: The official place for the latest published documents of the PSA Certified APIs
+title: PSA API Specifications
+description: PSA API documents published by Arm
 ---
 
 <!--
 SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified APIs
+# PSA API Specifications
 
-This is the official place for the latest published documents of the PSA Certified APIs.
+This website hosts the PSA API documents that are published by Arm.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+PSA API development is now governed by [GlobalPlatform](https://globalplatform.org).
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the GlobalPlatform [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
-[psa-api-gh]:       https://github.com/arm-software/psa-api
+[psa-api-gh]:       https://github.com/globalplatform/psa-api
 [psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
 
-
 ## Specifications
 
-The following specifications are part of the PSA Certified APIs:
+The following specifications are part of the PSA APIs:
 
 Specification | | | | |
 -|-|-|-|-
@@ -68,18 +68,18 @@ Crypto Driver Interface | 1.0 Alpha 1 | [HTML][driver-html] | [&darr; PDF][drive
 
 ## Feedback
 
-If you have questions or comments on any of the specifications, or suggestions for enhancements, please [raise a new issue][psa-api-issue] in the PSA Certified APIs GitHub project.
+If you have questions or comments on any of the specifications, or suggestions for enhancements, please [raise a new issue][psa-api-issue] in the PSA API GitHub project.
 
 Please indicate which specification the issue applies to. This can be done by:
 
 * Providing a link to the section of the specification on this website.
 * Providing the document name, full version, and section or page number in the PDF.
 
-[psa-api-issue]:    https://github.com/arm-software/psa-api/issues/new
+[psa-api-issue]:    https://github.com/globalplatform/psa-api/issues/new
 
 ## License
 
-The latest versions of the PSA Certified APIs that are hosted on this website are licensed under the Creative Commons [Attribution–Share Alike 4.0 International license][CC-BY-SA-4.0] and [Apache License, Version 2.0][APACHE-2.0]. Some earlier versions of the specifications are licensed under a non-confidential license from Arm.
+The latest versions of the PSA APIs that are hosted on this website are licensed under the Creative Commons [Attribution–Share Alike 4.0 International license][CC-BY-SA-4.0] and [Apache License, Version 2.0][APACHE-2.0]. Some earlier versions of the specifications are licensed under a non-confidential license from Arm.
 
 Refer to individual documents for license details.
 
@@ -88,4 +88,4 @@ Refer to individual documents for license details.
 
 ----
 
-*Copyright 2022-2026, Arm Limited and/or its affiliates*
+*Copyright 2022-2026 Arm Limited and/or its affiliates*
diff --git a/docs/status-code/index.md b/docs/status-code/index.md
@@ -1,26 +1,22 @@
 ---
-title: PSA Certified Status code API
-description: The Status code API provides common status and error codes for the PSA Certified API
+title: PSA Status code API
+description: The Status code API provides common status and error codes for the PSA APIs
 ---
 
 <!--
-SPDX-FileCopyrightText: Copyright 2022, 2024-2026 Arm Limited and/or its affiliates
+SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Status code API
+# PSA Status code API
 
-The Status code API provides common status and error codes for the PSA Certified APIs.
+The Status code API provides common status and error codes for the PSA APIs.
 
-See the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [PSA API][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
-
-[psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
-[psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
 ## Specifications
 
@@ -43,4 +39,4 @@ Prior to version 1.0.1, the PSA status codes were defined as part of the *PSA Fi
 
 [ffm-1-0-pdf]:          https://developer.arm.com/documentation/den0063/a
 
-*Copyright 2022, 2024-2026 Arm Limited and/or its affiliates*
+*Copyright 2022-2026 Arm Limited and/or its affiliates*
diff --git a/docs/storage/index.md b/docs/storage/index.md
@@ -1,26 +1,22 @@
 ---
-title: PSA Certified Secure Storage API
+title: PSA Secure Storage API
 description: The Secure Storage API supports data protection services on the device, providing integrity and confidentiality protection
 ---
 
 <!--
-SPDX-FileCopyrightText: Copyright 2022-2025 Arm Limited and/or its affiliates
+SPDX-FileCopyrightText: Copyright 2022-2026 Arm Limited and/or its affiliates
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
-# PSA Certified<br />Secure Storage API
+# PSA Secure Storage API
 
 The Secure Storage API supports data protection services on the device, providing integrity and confidentiality protection.
 
-See the [PSA Certified APIs][psa-api] page for other PSA Certified APIs.
+See the [PSA API][psa-api] page for other PSA APIs.
 
-Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA Certified APIs GitHub project][psa-api-gh].
+Specification source files, updates, and discussions, as well as reference headers and example code, can be found in the associated [PSA API GitHub project][psa-api-gh].
 
-Test suites to verify a correct implementation can be found in the [PSA Certified APIs Test suites][psa-api-ats].
-
-[psa-api]:          ../
-[psa-api-gh]:       https://github.com/arm-software/psa-api
-[psa-api-ats]:      https://github.com/ARM-software/psa-arch-tests/tree/main/api-tests/dev_apis
+Test suites to verify a correct implementation can be found in the [PSA API Test suites][psa-api-ats].
 
 ## Specifications
 
@@ -39,4 +35,4 @@ Version | | | Publication
 [1-0-1-pdf]:            1.0/IHI0087-PSA_Certified_Secure_Storage_API-1.0.1.pdf
 [1-0-0-pdf]:            1.0/IHI0087-PSA_Storage_API-1.0.0.pdf
 
-*Copyright 2022-2025, Arm Limited and/or its affiliates*
+*Copyright 2022-2026 Arm Limited and/or its affiliates*