diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index a31a483e6..ab5a9e947 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -670,7 +670,7 @@
 
   <components>
     <!-- CMSIS-Core component -->
-    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.2.0"  condition="ARMv6_7_8-M Device" >
+    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0"  condition="ARMv6_7_8-M Device" >
       <description>CMSIS-CORE for Cortex-M, SC000, SC300, Star-MC, ARMv8-M, ARMv8.1-M</description>
       <files>
         <!-- CPU independent -->
@@ -683,7 +683,7 @@
       </files>
     </component>
 
-    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.2.0"  condition="ARMv7_8-A Device" >
+    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0"  condition="ARMv7_8-A Device" >
       <description>CMSIS-CORE for Cortex-A</description>
       <files>
         <!-- CPU independent -->
@@ -692,7 +692,7 @@
       </files>
     </component>
 
-    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.1.0"  condition="ARMv7-R Device" >
+    <component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0"  condition="ARMv7-R Device" >
       <description>CMSIS-CORE for Cortex-R</description>
       <files>
         <!-- CPU independent -->
diff --git a/CMSIS/Core/Include/cmsis_version.h b/CMSIS/Core/Include/cmsis_version.h
index 946ae7dc1..08c82f607 100644
--- a/CMSIS/Core/Include/cmsis_version.h
+++ b/CMSIS/Core/Include/cmsis_version.h
@@ -31,18 +31,18 @@
 
 /*  CMSIS-Core(M) Version definitions */
 #define __CM_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(M) main version */
-#define __CM_CMSIS_VERSION_SUB   ( 1U)                                    /*!< \brief [15:0]  CMSIS-Core(M) sub version */
+#define __CM_CMSIS_VERSION_SUB   ( 3U)                                    /*!< \brief [15:0]  CMSIS-Core(M) sub version */
 #define __CM_CMSIS_VERSION       ((__CM_CMSIS_VERSION_MAIN << 16U) | \
                                    __CM_CMSIS_VERSION_SUB           )     /*!< \brief CMSIS Core(M) version number */
 
 /*  CMSIS-Core(A) Version definitions */
 #define __CA_CMSIS_VERSION_MAIN  ( 6U)                                    /*!< \brief [31:16] CMSIS-Core(A) main version */
-#define __CA_CMSIS_VERSION_SUB   ( 1U)                                    /*!< \brief [15:0]  CMSIS-Core(A) sub version */
+#define __CA_CMSIS_VERSION_SUB   ( 3U)                                    /*!< \brief [15:0]  CMSIS-Core(A) sub version */
 #define __CA_CMSIS_VERSION       ((__CA_CMSIS_VERSION_MAIN << 16U) | \
                                    __CA_CMSIS_VERSION_SUB          )      /*!< \brief CMSIS-Core(A) version number */
 
 #define __CR_CMSIS_VERSION_MAIN (6U)                                      /*!< \brief [31:16] CMSIS-Core(R) main version   */
-#define __CR_CMSIS_VERSION_SUB  (0U)                                      /*!< \brief [15:0]  CMSIS-Core(R) sub version    */
+#define __CR_CMSIS_VERSION_SUB  (3U)                                      /*!< \brief [15:0]  CMSIS-Core(R) sub version    */
 #define __CR_CMSIS_VERSION      ((__CR_CMSIS_VERSION_MAIN << 16U) | \
                                   __CR_CMSIS_VERSION_SUB          )       /*!< \brief CMSIS-Core(R) version number         */
 
diff --git a/CMSIS/Documentation/Doxygen/Core/Core.dxy.in b/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
index 947192df1..b9524b59d 100644
--- a/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
+++ b/CMSIS/Documentation/Doxygen/Core/Core.dxy.in
@@ -47,7 +47,7 @@ PROJECT_NAME           = "CMSIS-Core (Cortex-M)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Version 6.2.0"
+PROJECT_NUMBER         = "Version 6.3.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/CMSIS/Documentation/Doxygen/Core/src/history.md b/CMSIS/Documentation/Doxygen/Core/src/history.md
index aa7767d42..87bf24126 100644
--- a/CMSIS/Documentation/Doxygen/Core/src/history.md
+++ b/CMSIS/Documentation/Doxygen/Core/src/history.md
@@ -10,6 +10,14 @@ The table below provides information about the changes delivered with specific v
       <th>Version</th>
       <th>Description</th>
     </tr>
+    <tr>
+      <td>V6.3.0</td>
+      <td>
+        <ul>
+          <li>Aligned version metadata for CMSIS-Core component to 6.3.0</li>
+        </ul>
+      </td>
+    </tr>
     <tr>
       <td>V6.2.0</td>
       <td>
diff --git a/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in b/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
index d8b5bb7ce..1d90a0041 100644
--- a/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
+++ b/CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
@@ -47,7 +47,7 @@ PROJECT_NAME           = "CMSIS-Core (Cortex-A)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Version 6.2.0"
+PROJECT_NUMBER         = "Version 6.3.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/CMSIS/Documentation/Doxygen/Core_A/src/history.md b/CMSIS/Documentation/Doxygen/Core_A/src/history.md
index 746b1aa6c..8f883fd0e 100644
--- a/CMSIS/Documentation/Doxygen/Core_A/src/history.md
+++ b/CMSIS/Documentation/Doxygen/Core_A/src/history.md
@@ -9,6 +9,14 @@ The table below provides information about the changes delivered with specific v
       <th>Version</th>
       <th>Description</th>
     </tr>
+    <tr>
+      <td>V6.3.0</td>
+      <td>
+        <ul>
+          <li>Aligned version metadata for CMSIS-Core component to 6.3.0</li>
+        </ul>
+      </td>
+    </tr>
     <tr>
       <td>V6.1.1</td>
       <td>