diff --git a/README.md b/README.md
index 31bc437..cb96927 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,14 @@
 # BoardManagerFiles
 Storage for Arduino Boards Manager JSON and package files for the [STM32](https://github.com/stm32duino/Arduino_Core_STM32) and [STM8](https://github.com/stm32duino/Arduino_Core_STM8) cores support.
 
-**Warning**: release versioning has been changed from date versioning to semantic one. See [Release Versioning change](https://github.com/stm32duino/wiki/wiki/Release-Versioning-change)
-
 For more information see the [Wiki](https://github.com/stm32duino/wiki/wiki/). Mainly the [Getting Started page](https://github.com/stm32duino/wiki/wiki/Getting-Started).
 
 ## Troubleshooting
 
 If you have any issue to download/use a package, you could [file an issue on Github](https://github.com/stm32duino/BoardManagerFiles/issues/new).
 
-Or submit a topic on the [stm32duino forum](http://stm32duino.com):
+Or submit a topic on the [stm32duino forum](https://www.stm32duino.com/):
 
- * questions on the [STM32 Core](http://stm32duino.com/viewforum.php?f=48)
+ * questions on the [STM32 Core](https://www.stm32duino.com/viewforum.php?f=35)
 
- * bugs/enhancements on the [STM core: Bugs and enhancements](http://stm32duino.com/viewforum.php?f=49)
+ * bugs/enhancements on the [STM core: Bugs and enhancements](https://www.stm32duino.com/viewforum.php?f=38)
diff --git a/STM32/package_stm_index.json b/STM32/package_stm_index.json
index bda4cd4..f179c6a 100644
--- a/STM32/package_stm_index.json
+++ b/STM32/package_stm_index.json
@@ -4,28 +4,22 @@
       "name": "STM32",
       "websiteURL": "http://www.st.com/en/microcontrollers.html",
       "maintainer": "STMicroelectronics",
-      "email": "",
+      "email": "stmduino@st.com",
       "help": {
         "online": "http://www.stm32duino.com/"
       },
       "platforms": [
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "0.1.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.5.12.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.5.12.tar.bz2",
           "archiveFileName": "STM32-2017.5.12.tar.bz2",
           "checksum": "SHA-256:10b403b6b437c183d9a0a74a08ebe425766f6c3425474b1f800f6eca337075a6",
           "size": "19788680",
           "boards": [
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L476RG"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"}
+            {"name": "[DEPRECATED] Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -46,22 +40,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "0.1.1",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.6.2.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.6.2.tar.bz2",
           "archiveFileName": "STM32-2017.6.2.tar.bz2",
           "checksum": "SHA-256:f01dac293fbbcf93edc52a2a3ea189e0df878acb31e71e171aee1663aba449a3",
           "size": "20345714",
           "boards": [
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L476RG"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -82,26 +70,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "0.2.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.7.13.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.7.13.tar.bz2",
           "archiveFileName": "STM32-2017.7.13.tar.bz2",
           "checksum": "SHA-256:229ac1f5a7617c94375cf577582a5fef77962d0e476b2642a55485897be8c465",
           "size": "20812534",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L432KC"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -122,29 +100,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "0.2.1",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.8.4.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.8.4.tar.bz2",
           "archiveFileName": "STM32-2017.8.4.tar.bz2",
           "checksum": "SHA-256:f74b17a2d376e063e48271307e855f76f49ae3c20a123c2861b713bbdb3da793",
           "size": "20818236",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L432KC"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -165,30 +130,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.0.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.8.31.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.8.31.tar.bz2",
           "archiveFileName": "STM32-2017.8.31.tar.bz2",
           "checksum": "SHA-256:7ee7e7b14a5336f0206879a69e02eec196a8dbc7a61723185ff517121f7394f6",
           "size": "15699530",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L432KC"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -209,31 +160,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.0.1",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.9.22.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.9.22.tar.bz2",
           "archiveFileName": "STM32-2017.9.22.tar.bz2",
           "checksum": "SHA-256:9211cdbb540a90143a7603519c8e9ae8ef18e61836d647fd7ef67278983b8688",
           "size": "15703585",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L432KC"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -254,34 +190,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.1.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2017.11.24.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2017.11.24.tar.bz2",
           "archiveFileName": "STM32-2017.11.24.tar.bz2",
           "checksum": "SHA-256:eeb346af520d23ee3f89022ff24d715340a6d1b1209b0982d92fe3e71dc11d48",
           "size": "16542818",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -302,36 +220,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.1.1",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-2018.1.18.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-2018.1.18.tar.bz2",
           "archiveFileName": "STM32-2018.1.18.tar.bz2",
           "checksum": "SHA-256:9a1b631421ce3742146b73e3afe4a2856514fd4cb156c6c304547352f692ce84",
           "size": "16273768",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -352,38 +250,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.2.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-1.2.0.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-1.2.0.tar.bz2",
           "archiveFileName": "STM32-1.2.0.tar.bz2",
           "checksum": "SHA-256:8db457da70d1a5f3b43030a6ebb05e6f7de2fa7628922a4c08270b576d49771e",
           "size": "16555125",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "BluePill F103C8"},
-            {"name": "Maple Mini F103CB"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -404,41 +280,16 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.3.0",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/packages/STM32-1.3.0.tar.bz2",
+          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/packages/STM32-1.3.0.tar.bz2",
           "archiveFileName": "STM32-1.3.0.tar.bz2",
           "checksum": "SHA-256:c9a601c202ab850e48b0c6eaceb817bc14b3dbf6c0af89da0a4c7f785447b08b",
           "size": "16627675",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "BluePill F103C8"},
-            {"name": "Maple Mini F103CB"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -459,7 +310,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.4.0",
           "category": "Contributed",
@@ -468,40 +319,7 @@
           "checksum": "SHA-256:59dfde3fbed67207148b10df5624813b48cf4c0681c4f9f2cae22edbb2bf8446",
           "size": "16981955",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "BluePill F103C8"},
-            {"name": "Black F407VE"},
-            {"name": "Blue F407VE mini"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "RAK811 LoRa Tracker"},
-            {"name": "RemRam v1"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -522,7 +340,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.5.0",
           "category": "Contributed",
@@ -531,61 +349,7 @@
           "checksum": "SHA-256:09e2d0f2aa35e189331ac2ac13faca7ed926ff257a05f6520797ae2c57e5c78a",
           "size": "18972644",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103C8 (128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103C8 (128k)"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMROE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "RAK811 LoRa Tracker"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -606,7 +370,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.6.0",
           "category": "Contributed",
@@ -615,68 +379,7 @@
           "checksum": "SHA-256:540226e3f850ce1a805acfc6621493592e12584a50dcb3a07dcdb0e35301a261",
           "size": "22038021",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo H743ZI2"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo G071RB"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "P-Nucleo WB55RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103C8 (128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103C8 (128k)"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMROE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "Sparky V1"},
-            {"name": "RAK811 LoRa Tracker (16kb RAM)"},
-            {"name": "RAK811 LoRa Tracker (32kb RAM)"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "STEVAL-3DP001V1"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"},
-            {"name": "VAkE v1.0"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -697,7 +400,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.6.1",
           "category": "Contributed",
@@ -706,69 +409,7 @@
           "checksum": "SHA-256:a25ff69e6c77f575d23cf749fca8c97dcca2832acc9207078447d8dd2fee6498",
           "size": "22037454",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo H743ZI2"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo G071RB"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "P-Nucleo WB55RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103C8 (128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103C8 (128k)"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "RobotDyn BlackPill F303CC"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMROE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "Sparky V1"},
-            {"name": "RAK811 LoRa Tracker (16kb RAM)"},
-            {"name": "RAK811 LoRa Tracker (32kb RAM)"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "STEVAL-3DP001V1"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"},
-            {"name": "VAkE v1.0"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -789,7 +430,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.7.0",
           "category": "Contributed",
@@ -798,85 +439,7 @@
           "checksum": "SHA-256:1b76000f794fe0d2d90600d522a09f42640520ce18549053fa9763f6a90fbf84",
           "size": "23982361",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo H743ZI2"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo G071RB"},
-            {"name": "Nucleo G431RB"},
-            {"name": "Nucleo G474RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L476RG"},
-            {"name": "P-Nucleo WB55RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "Nucleo G431KB"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "SensorTile.box"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "STM32F030F4 Demo board (16Mhz)"},
-            {"name": "STM32F030F4 Demo board (internal RC oscillator)"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103C8 (128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103C8 (128k)"},
-            {"name": "Generic F103R8T6 (Blue Button)"},
-            {"name": "Generic F103RBT6 (Blue Button)"},
-            {"name": "Generic F103RCT6 (Blue Button)"},
-            {"name": "Generic F103RET6 (Blue Button)"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "RobotDyn BlackPill F303CC"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMORE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "BlackPill F401CC"},
-            {"name": "Core board F401RCT6"},
-            {"name": "Sparky V1"},
-            {"name": "RAK811 LoRa Tracker (16kb RAM)"},
-            {"name": "RAK811 LoRa Tracker (32kb RAM)"},
-            {"name": "RHF76 052"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "STEVAL-3DP001V1"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"},
-            {"name": "VAkE v1.0"},
-            {"name": "Afro Flight Rev5 (8MHz)"},
-            {"name": "Afro Flight Rev5 (12MHz)"},
-            {"name": "MKR Sharky"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -897,7 +460,7 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.8.0",
           "category": "Contributed",
@@ -906,99 +469,7 @@
           "checksum": "SHA-256:756d39fab2ca5c0bf857b64153a265dd7ef2c151464bd248d6ca94ee05ca8fe7",
           "size": "29132822",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo H743ZI2"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo G071RB"},
-            {"name": "Nucleo G431RB"},
-            {"name": "Nucleo G474RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L452RE-P"},
-            {"name": "Nucleo L476RG"},
-            {"name": "P-Nucleo WB55RG"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "Nucleo G431KB"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "SensorTile.box"},
-            {"name": "STM32MP157A-DK1"},
-            {"name": "STM32MP157C-DK2"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "STM32F030F4 Demo board (16Mhz)"},
-            {"name": "STM32F030F4 Demo board (internal RC oscillator)"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103C8 (128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103C8 (128k)"},
-            {"name": "Generic F103R8T6 (Blue Button)"},
-            {"name": "Generic F103RBT6 (Blue Button)"},
-            {"name": "Generic F103RCT6 (Blue Button)"},
-            {"name": "Generic F103RET6 (Blue Button)"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "RobotDyn BlackPill F303CC"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMORE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "BlackPill F401CC"},
-            {"name": "Core board F401RCT6"},
-            {"name": "Adafruit Feather STM32F405"},
-            {"name": "Generic F401RE"},
-            {"name": "Generic F401RD"},
-            {"name": "Generic F401RC"},
-            {"name": "Generic F401RB"},
-            {"name": "ThunderPack"},
-            {"name": "PX-HER0"},
-            {"name": "Wraith V1 ESC"},
-            {"name": "RAK811 LoRa Tracker (16kb RAM)"},
-            {"name": "RAK811 LoRa Tracker (32kb RAM)"},
-            {"name": "RHF76 052"},
-            {"name": "Elektor LoRa Node Core F072"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "STEVAL-3DP001V1"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "PRNTR v2"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"},
-            {"name": "Malyan M300"},
-            {"name": "VAkE v1.0"},
-            {"name": "Afro Flight Rev5 (8MHz)"},
-            {"name": "Afro Flight Rev5 (12MHz)"},
-            {"name": "Sparky V1 F303 FC"},
-            {"name": "MKR Sharky"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -1019,181 +490,17 @@
           ]
         },
         {
-          "name": "STM32 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM32 Cores",
           "architecture": "stm32",
           "version": "1.9.0",
+          "deprecated": true,
           "category": "Contributed",
           "url": "https://github.com/stm32duino/Arduino_Core_STM32/releases/download/1.9.0/STM32-1.9.0.tar.bz2",
           "archiveFileName": "STM32-1.9.0.tar.bz2",
           "checksum": "SHA-256:f957056523f2f3937fcbab4a7d57ec6fa513228d66b3fc10b81c74a615691c73",
           "size": "33617865",
           "boards": [
-            {"name": "Nucleo F207ZG"},
-            {"name": "Nucleo F429ZI"},
-            {"name": "Nucleo F746ZG"},
-            {"name": "Nucleo F756ZG"},
-            {"name": "Nucleo F767ZI"},
-            {"name": "Nucleo H743ZI"},
-            {"name": "Nucleo H743ZI2"},
-            {"name": "Nucleo L496ZG"},
-            {"name": "Nucleo L496ZG-P"},
-            {"name": "Nucleo L4R5ZI"},
-            {"name": "Nucleo L4R5ZI-P"},
-            {"name": "Nucleo F030R8"},
-            {"name": "Nucleo F072RB"},
-            {"name": "Nucleo F091RC"},
-            {"name": "Nucleo F103RB"},
-            {"name": "Nucleo F302R8"},
-            {"name": "Nucleo F303RE"},
-            {"name": "Nucleo F401RE"},
-            {"name": "Nucleo F411RE"},
-            {"name": "Nucleo F446RE"},
-            {"name": "Nucleo G071RB"},
-            {"name": "Nucleo G431RB"},
-            {"name": "Nucleo G474RE"},
-            {"name": "Nucleo L053R8"},
-            {"name": "Nucleo L073RZ"},
-            {"name": "Nucleo L152RE"},
-            {"name": "Nucleo L433RC-P"},
-            {"name": "Nucleo L452RE"},
-            {"name": "Nucleo L452RE-P"},
-            {"name": "Nucleo L476RG"},
-            {"name": "P-Nucleo WB55RG"},
-            {"name": "Nucleo F031K6"},
-            {"name": "Nucleo L031K6"},
-            {"name": "Nucleo L412KB"},
-            {"name": "Nucleo L432KC"},
-            {"name": "Nucleo F303K8"},
-            {"name": "Nucleo G431KB"},
-            {"name": "STM32F030R8-DISCVL"},
-            {"name": "STM32F072B-DISCOVERY"},
-            {"name": "STM32F100RB-DISCVL"},
-            {"name": "STM32F407G-DISC1"},
-            {"name": "STM32F413H-DISCO"},
-            {"name": "STM32F746G-DISCOVERY"},
-            {"name": "STM32G0316-DISCO"},
-            {"name": "STM32L475VG-DISCOVERY-IOT"},
-            {"name": "Discovery L072CZ-LRWAN1"},
-            {"name": "SensorTile.box"},
-            {"name": "STM32MP157A-DK1"},
-            {"name": "STM32MP157C-DK2"},
-            {"name": "STM32F030F4 Demo board"},
-            {"name": "STM32F030F4 Demo board (16Mhz)"},
-            {"name": "STM32F030F4 Demo board (internal RC oscillator)"},
-            {"name": "BluePill F103C6 (32K)"},
-            {"name": "BluePill F103C8"},
-            {"name": "BluePill F103CB (or C8 with 128k)"},
-            {"name": "BlackPill F103C8"},
-            {"name": "BlackPill F103CB (or C8 with 128k)"},
-            {"name": "Generic F103C4"},
-            {"name": "Generic F103C6"},
-            {"name": "Generic F103C8"},
-            {"name": "Generic F103CB"},
-            {"name": "Generic F103R4"},
-            {"name": "Generic F103R6"},
-            {"name": "Generic F103R8"},
-            {"name": "Generic F103RB"},
-            {"name": "Generic F103RC"},
-            {"name": "Generic F103RD"},
-            {"name": "Generic F103RE"},
-            {"name": "Generic F103RF"},
-            {"name": "Generic F103RG"},
-            {"name": "Generic F103T4"},
-            {"name": "Generic F103T6"},
-            {"name": "Generic F103T8"},
-            {"name": "Generic F103TB"},
-            {"name": "Generic F103V8"},
-            {"name": "Generic F103VB"},
-            {"name": "Generic F103VC"},
-            {"name": "Generic F103VD"},
-            {"name": "Generic F103VE"},
-            {"name": "Generic F103VF"},
-            {"name": "Generic F103VG"},
-            {"name": "Generic F103ZC"},
-            {"name": "Generic F103ZD"},
-            {"name": "Generic F103ZE"},
-            {"name": "Generic F103ZF"},
-            {"name": "Generic F103ZG"},
-            {"name": "VCCGND F103ZET6 Mini"},
-            {"name": "VCCGND F103ZET6"},
-            {"name": "HY-TinySTM103TB"},
-            {"name": "Maple Mini F103CB"},
-            {"name": "RobotDyn BlackPill F303CC"},
-            {"name": "Black F407VE"},
-            {"name": "Black F407VG"},
-            {"name": "Black F407ZE"},
-            {"name": "Black F407ZG"},
-            {"name": "Blue F407VE mini"},
-            {"name": "DIYMORE STM32F407VGT"},
-            {"name": "FK407M1 STM32F407VET"},
-            {"name": "BlackPill F401CC"},
-            {"name": "BlackPill F411CE"},
-            {"name": "Core board F401RCT6"},
-            {"name": "Adafruit Feather STM32F405"},
-            {"name": "ThunderPack v1.1+"},
-            {"name": "Generic F446RE"},
-            {"name": "Generic F446RC"},
-            {"name": "Generic F423RH"},
-            {"name": "Generic F423CH"},
-            {"name": "Generic F417VG"},
-            {"name": "Generic F417VE"},
-            {"name": "Generic F415RG"},
-            {"name": "Generic F413RH"},
-            {"name": "Generic F413RG"},
-            {"name": "Generic F413CH"},
-            {"name": "Generic F413CG"},
-            {"name": "Generic F412RG"},
-            {"name": "Generic F412RE"},
-            {"name": "Generic F412CG"},
-            {"name": "Generic F412CE"},
-            {"name": "Generic F411RE"},
-            {"name": "Generic F411RC"},
-            {"name": "Generic F411CE"},
-            {"name": "Generic F411CC"},
-            {"name": "Generic F410RB"},
-            {"name": "Generic F410R8"},
-            {"name": "Generic F410CB"},
-            {"name": "Generic F410C8"},
-            {"name": "Generic F407VG"},
-            {"name": "Generic F407VE"},
-            {"name": "Generic F405RG"},
-            {"name": "Generic F401RE"},
-            {"name": "Generic F401RD"},
-            {"name": "Generic F401RC"},
-            {"name": "Generic F401RB"},
-            {"name": "Generic F401CE"},
-            {"name": "Generic F401CD"},
-            {"name": "Generic F401CC"},
-            {"name": "Generic F401CB"},
-            {"name": "Daisy Seed"},
-            {"name": "ThunderPack v1.0"},
-            {"name": "PX-HER0"},
-            {"name": "Wraith V1 ESC"},
-            {"name": "RAK811 LoRa Tracker (16kb RAM)"},
-            {"name": "RAK811 LoRa Tracker (32kb RAM)"},
-            {"name": "RHF76 052"},
-            {"name": "Elektor LoRa Node Core F072C8 (64kB)"},
-            {"name": "Elektor LoRa Node Core F072CB (128kB)"},
-            {"name": "Armed V1"},
-            {"name": "RemRam v1"},
-            {"name": "RUMBA32"},
-            {"name": "STEVAL-3DP001V1"},
-            {"name": "PRNTR F407 v1"},
-            {"name": "PRNTR v2"},
-            {"name": "EExtruder F030 V1"},
-            {"name": "Malyan M200 V1"},
-            {"name": "Malyan M200 V2"},
-            {"name": "Malyan M300"},
-            {"name": "VAkE v1.0"},
-            {"name": "FYSETC_S6"},
-            {"name": "Afro Flight Rev5 (8MHz)"},
-            {"name": "Afro Flight Rev5 (12MHz)"},
-            {"name": "Sparky V1 F303 FC"},
-            {"name": "PYBSTICK26 Duino"},
-            {"name": "PYBSTICK26 Lite"},
-            {"name": "PYBSTICK26 STD-Programmez"},
-            {"name": "PYBSTICK26 Pro"},
-            {"name": "MKR Sharky"}
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
@@ -1480,28 +787,28 @@
               "size": "7919425",
               "checksum": "SHA-256:e73aac594b92d36e9c243d401229b10b636060697d037219dbb4c517f3f9a6f3",
               "archiveFileName": "STM32Tools-2017.5.12.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
               "host": "i686-linux-gnu"
             },
             {
               "size": "7919425",
               "checksum": "SHA-256:e73aac594b92d36e9c243d401229b10b636060697d037219dbb4c517f3f9a6f3",
               "archiveFileName": "STM32Tools-2017.5.12.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
               "host": "x86_64-pc-linux-gnu"
             },
             {
               "size": "7919425",
               "checksum": "SHA-256:e73aac594b92d36e9c243d401229b10b636060697d037219dbb4c517f3f9a6f3",
               "archiveFileName": "STM32Tools-2017.5.12.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
               "host": "i686-mingw32"
             },
             {
               "size": "7919425",
               "checksum": "SHA-256:e73aac594b92d36e9c243d401229b10b636060697d037219dbb4c517f3f9a6f3",
               "archiveFileName": "STM32Tools-2017.5.12.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.5.12.tar.bz2",
               "host": "i386-apple-darwin11"
             }
           ]
@@ -1512,28 +819,28 @@
           "systems": [
             {
               "host": "i686-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
               "archiveFileName": "STM32Tools-2017.7.13.tar.bz2",
               "checksum": "SHA-256:3cbdc522db8f64eff887d56d70bfefd5ed7db5f5376d8a88879b7c1172a8335b",
               "size": "7929231"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
               "archiveFileName": "STM32Tools-2017.7.13.tar.bz2",
               "checksum": "SHA-256:3cbdc522db8f64eff887d56d70bfefd5ed7db5f5376d8a88879b7c1172a8335b",
               "size": "7929231"
             },
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
               "archiveFileName": "STM32Tools-2017.7.13.tar.bz2",
               "checksum": "SHA-256:3cbdc522db8f64eff887d56d70bfefd5ed7db5f5376d8a88879b7c1172a8335b",
               "size": "7929231"
             },
             {
               "host": "i386-apple-darwin11",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.7.13.tar.bz2",
               "archiveFileName": "STM32Tools-2017.7.13.tar.bz2",
               "checksum": "SHA-256:3cbdc522db8f64eff887d56d70bfefd5ed7db5f5376d8a88879b7c1172a8335b",
               "size": "7929231"
@@ -1548,28 +855,28 @@
               "size": "7929806",
               "checksum": "SHA-256:2711544bf4d10ce7511e501cc442527fc9169f04311ba081c997b243a53a8adb",
               "archiveFileName": "STM32Tools-2017.8.31.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
               "host": "i686-linux-gnu"
             },
             {
               "size": "7929806",
               "checksum": "SHA-256:2711544bf4d10ce7511e501cc442527fc9169f04311ba081c997b243a53a8adb",
               "archiveFileName": "STM32Tools-2017.8.31.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
               "host": "x86_64-pc-linux-gnu"
             },
             {
               "size": "7929806",
               "checksum": "SHA-256:2711544bf4d10ce7511e501cc442527fc9169f04311ba081c997b243a53a8adb",
               "archiveFileName": "STM32Tools-2017.8.31.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
               "host": "i686-mingw32"
             },
             {
               "size": "7929806",
               "checksum": "SHA-256:2711544bf4d10ce7511e501cc442527fc9169f04311ba081c997b243a53a8adb",
               "archiveFileName": "STM32Tools-2017.8.31.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.8.31.tar.bz2",
               "host": "i386-apple-darwin11"
             }
           ]
@@ -1582,28 +889,28 @@
               "size": "7929670",
               "checksum": "SHA-256:91dfc620f46b42707bba4a633ee8e332a1e2d7743a3204b130f9bc74b0933322",
               "archiveFileName": "STM32Tools-2017.9.22.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
               "host": "i686-linux-gnu"
             },
             {
               "size": "7929670",
               "checksum": "SHA-256:91dfc620f46b42707bba4a633ee8e332a1e2d7743a3204b130f9bc74b0933322",
               "archiveFileName": "STM32Tools-2017.9.22.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
               "host": "x86_64-pc-linux-gnu"
             },
             {
               "size": "7929670",
               "checksum": "SHA-256:91dfc620f46b42707bba4a633ee8e332a1e2d7743a3204b130f9bc74b0933322",
               "archiveFileName": "STM32Tools-2017.9.22.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
               "host": "i686-mingw32"
             },
             {
               "size": "7929670",
               "checksum": "SHA-256:91dfc620f46b42707bba4a633ee8e332a1e2d7743a3204b130f9bc74b0933322",
               "archiveFileName": "STM32Tools-2017.9.22.tar.bz2",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-2017.9.22.tar.bz2",
               "host": "i386-apple-darwin11"
             }
           ]
@@ -1614,28 +921,28 @@
           "systems": [
             {
               "host": "i686-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.0.2.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.0.2.tar.bz2",
               "archiveFileName": "STM32Tools-1.0.2.tar.bz2",
               "checksum": "SHA-256:0594450845a3645d5f9bb00d3f5bca8cb3dc855b04bbf78c960a4b8ed23bdf6a",
               "size": "8137349"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.0.2.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.0.2.tar.bz2",
               "archiveFileName": "STM32Tools-1.0.2.tar.bz2",
               "checksum": "SHA-256:0594450845a3645d5f9bb00d3f5bca8cb3dc855b04bbf78c960a4b8ed23bdf6a",
               "size": "8137349"
             },
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.0.2.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.0.2.tar.bz2",
               "archiveFileName": "STM32Tools-1.0.2.tar.bz2",
               "checksum": "SHA-256:0594450845a3645d5f9bb00d3f5bca8cb3dc855b04bbf78c960a4b8ed23bdf6a",
               "size": "8137349"
             },
             {
               "host": "i386-apple-darwin11",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.0.2.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.0.2.tar.bz2",
               "archiveFileName": "STM32Tools-1.0.2.tar.bz2",
               "checksum": "SHA-256:0594450845a3645d5f9bb00d3f5bca8cb3dc855b04bbf78c960a4b8ed23bdf6a",
               "size": "8137349"
@@ -1649,28 +956,28 @@
           [
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.1.0-windows.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.1.0-windows.tar.bz2",
               "archiveFileName": "STM32Tools-1.1.0-windows.tar.bz2",
               "checksum": "SHA-256:2996fb32f778def2f21eafcedf6f32945e0487b43e4cf23462192147ad3ff3a7",
               "size": "6171696"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.1.0-mac.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.1.0-mac.tar.bz2",
               "archiveFileName": "STM32Tools-1.1.0-mac.tar.bz2",
               "checksum": "SHA-256:5ee517a888bce7788f3cba65d20aa64d2ea97d8161f09e8c28adeb6755f9c073",
               "size": "779406"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.1.0-linux.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.1.0-linux.tar.bz2",
               "archiveFileName": "STM32Tools-1.1.0-linux.tar.bz2",
               "checksum": "SHA-256:fe51763fba6ade899f178afa05eca8e95852e41226cef5203125ddfb7db4b078",
               "size": "1445336"
             },
             {
               "host": "i686-pc-linux-gnu",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/tools/STM32Tools-1.1.0-linux.tar.bz2",
+              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/main/STM32/tools/STM32Tools-1.1.0-linux.tar.bz2",
               "archiveFileName": "STM32Tools-1.1.0-linux.tar.bz2",
               "checksum": "SHA-256:fe51763fba6ade899f178afa05eca8e95852e41226cef5203125ddfb7db4b078",
               "size": "1445336"
diff --git a/STM32/src/Arduino_Core_STM32 b/STM32/src/Arduino_Core_STM32
index 17fd01f..fa6e5cb 160000
--- a/STM32/src/Arduino_Core_STM32
+++ b/STM32/src/Arduino_Core_STM32
@@ -1 +1 @@
-Subproject commit 17fd01f9ff569cc55de975da6a5742a8aab6d004
+Subproject commit fa6e5cba3548e0fd2f254ff503e610a7a3118cfe
diff --git a/STM32/src/Arduino_Tools b/STM32/src/Arduino_Tools
index aa4efdd..a3a2683 160000
--- a/STM32/src/Arduino_Tools
+++ b/STM32/src/Arduino_Tools
@@ -1 +1 @@
-Subproject commit aa4efddbce6064992c20f687dd9c76c3d5bc20ee
+Subproject commit a3a26835a309e6067d30e49cc3efe1cbf74348c3
diff --git a/STM32/src/Makefile b/STM32/src/Makefile
index a7fe8ca..02a756b 100644
--- a/STM32/src/Makefile
+++ b/STM32/src/Makefile
@@ -44,7 +44,6 @@ core: clean print_info
 	@echo ----------------------------------------------------------
 	@echo "Packaging $@..."
 	@git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch  > $(PACKAGE_FOLDER)/package_version.txt
-	@sed -i 's/{runtime.hardware.path}\/tools/{runtime.tools.STM32Tools.path}\/tools/g' $(PACKAGE_FOLDER)/platform.txt
 	@tar --mtime='$(PACKAGE_DATE)' \
 		--exclude=.git \
 		--exclude=.gitattributes \
@@ -54,7 +53,7 @@ core: clean print_info
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
 	@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
 	@git --git-dir=$(PACKAGE_FOLDER)/.git checkout .
-	$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) PACKAGE_FOLDER="$(PACKAGE_FOLDER)" --no-builtin-rules postpackaging_core -C .
+	$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) PACKAGE_FOLDER=$(PACKAGE_FOLDER) --no-builtin-rules postpackaging_core -C .
 	@echo ----------------------------------------------------------
 
 tools: PACKAGE_NAME := STM32Tools
@@ -73,7 +72,7 @@ tools: clean print_info
 		--exclude=linux \
 		--exclude=linux64 \
 		--exclude=macosx \
-		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
+		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.tar.bz2" "$(PACKAGE_FOLDER)"
 	@tar --mtime='$(PACKAGE_DATE)' \
 		--exclude=.git \
@@ -82,7 +81,7 @@ tools: clean print_info
 		--exclude=.gitignore \
 		--exclude=macosx \
 		--exclude=win \
-		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
+		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-linux.tar.bz2" "$(PACKAGE_FOLDER)"
 	@tar --mtime='$(PACKAGE_DATE)' \
 		--exclude=.git \
@@ -92,7 +91,7 @@ tools: clean print_info
 		--exclude=linux \
 		--exclude=linux64 \
 		--exclude=win \
-		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
+		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-mac.tar.bz2" "$(PACKAGE_FOLDER)"
 	@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
 	$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging_tools -C .
@@ -120,7 +119,7 @@ postpackaging_core:
 	@echo "PACKAGE_CHKSUM      = $(PACKAGE_CHKSUM)"
 	@echo "PACKAGE_SIZE        = $(PACKAGE_SIZE)"
 	@echo "PACKAGE_FILENAME    = $(PACKAGE_FILENAME)"
-	@BOARDS_LIST=`grep -E ".+\.menu\.pnum\.[^\.]+=" $(PACKAGE_FOLDER)/boards.txt | cut -d'=' -f2 | awk '{print "            {\"name\": \""$$0"\"},"}'`; \
+	@BOARDS_LIST=`grep -E "^[^\.]+\.name=" $(PACKAGE_FOLDER)/boards.txt | cut -d'=' -f2 | awk '{print "            {\"name\": \""$$0"\"},"}'`; \
 	BOARDS_LIST=$${BOARDS_LIST::-1}; \
 	cat templates/package_core_index.json | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ | sed -e "s/%%BOARDSLIST%%/$${BOARDS_LIST//$$'\n'/\\n}/" > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
 	@mv $(PACKAGE_FILENAME) $(CORE_PATH)/
diff --git a/STM32/src/templates/package_core_index.json b/STM32/src/templates/package_core_index.json
index b60afc5..3d31a74 100644
--- a/STM32/src/templates/package_core_index.json
+++ b/STM32/src/templates/package_core_index.json
@@ -1,5 +1,5 @@
         {
-          "name": "STM32 Cores",
+          "name": "STM32 MCU based boards",
           "architecture": "stm32",
           "version": "%%VERSION%%",
           "category": "Contributed",
@@ -12,19 +12,19 @@
           ],
           "toolsDependencies": [
             {
-              "packager": "STM32",
+              "packager": "STMicroelectronics",
               "name": "xpack-arm-none-eabi-gcc",
-              "version": "9.2.1-1.1"
+              "version": "10.2.1-1.1"
             },
             {
-              "packager": "STM32",
+              "packager": "STMicroelectronics",
               "name": "STM32Tools",
-              "version": "1.4.0"
+              "version": "2.1.0"
             },
             {
-              "packager": "STM32",
+              "packager": "STMicroelectronics",
               "name": "CMSIS",
-              "version": "5.5.1"
+              "version": "5.7.0"
             }
           ]
         }
diff --git a/STM8/package_stm8_index.json b/STM8/package_stm8_index.json
index 7434241..2b4850c 100644
--- a/STM8/package_stm8_index.json
+++ b/STM8/package_stm8_index.json
@@ -10,17 +10,17 @@
       },
       "platforms": [
 	    {
-          "name": "STM8 Cores",
+          "name": "[DEPRECATED - Please use new package index] STM8 Cores",
           "architecture": "stm8",
           "version": "0.1.0",
+          "deprecated": true,
           "category": "Contributed",
           "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM8/packages/STM8-0.1.0.tar.bz2",
           "archiveFileName": "STM8-0.1.0.tar.bz2",
           "checksum": "SHA-256:4828751959f0e02fbccd5fc741d75b4ed2e70ee019fe0a7d2495e4e52a0aa263",
           "size": "9552880",
           "boards": [
-            {"name": "Nucleo_8S208RB"},
-            {"name": "Nucleo_8L152R8"}
+            {"name": "[DEPRECATED] Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/master/package_stmicroelectronics_index.json"}
           ],
           "toolsDependencies": [
             {
diff --git a/STM8/src/Arduino_Core_STM8 b/STM8/src/Arduino_Core_STM8
index 92e18ed..1f8e719 160000
--- a/STM8/src/Arduino_Core_STM8
+++ b/STM8/src/Arduino_Core_STM8
@@ -1 +1 @@
-Subproject commit 92e18ede7e021a1fb7483c8b9dbfaa4c38790645
+Subproject commit 1f8e719610499dc7b47f5c4dbdb104a4b9a04d7b
diff --git a/STM8/src/Arduino_Tools_STM8 b/STM8/src/Arduino_Tools_STM8
index c47d83e..7344fce 160000
--- a/STM8/src/Arduino_Tools_STM8
+++ b/STM8/src/Arduino_Tools_STM8
@@ -1 +1 @@
-Subproject commit c47d83ef190995109d6e5b088dd0c20fe4b4cad5
+Subproject commit 7344fceac9fd37da0c1b15ca8271e7ff16258213
diff --git a/STM8/src/Makefile b/STM8/src/Makefile
index 592f0e2..4dd4e01 100644
--- a/STM8/src/Makefile
+++ b/STM8/src/Makefile
@@ -58,7 +58,7 @@ tools: clean print_info
 		--exclude=.gitattributes \
 		--exclude=.github \
 		--exclude=.gitignore \
-		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
+		--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.tar.bz2" "$(PACKAGE_FOLDER)"
 	@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
 	"$(MAKE)" PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging_tools -C .
diff --git a/STM8/src/templates/package_core_index.json b/STM8/src/templates/package_core_index.json
index 63c553e..a8e3462 100644
--- a/STM8/src/templates/package_core_index.json
+++ b/STM8/src/templates/package_core_index.json
@@ -1,9 +1,9 @@
         {
-          "name": "STM8 Cores",
+          "name": "STM8 MCU based boards",
           "architecture": "stm8",
           "version": "%%VERSION%%",
           "category": "Contributed",
-          "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM8/packages/%%FILENAME%%",
+          "url": "https://github.com/stm32duino/Arduino_Core_STM8/releases/download/%%VERSION%%/%%FILENAME%%",
           "archiveFileName": "%%FILENAME%%",
           "checksum": "SHA-256:%%CHECKSUM%%",
           "size": "%%SIZE%%",
@@ -19,7 +19,7 @@
             {
               "packager": "STM8",
               "name": "STM8Tools",
-              "version": "1.0.2"
+              "version": "1.0.0"
             }
           ]
         }
diff --git a/STM8/src/templates/package_tools_index.json b/STM8/src/templates/package_tools_index.json
index 44b09c0..e1d8274 100644
--- a/STM8/src/templates/package_tools_index.json
+++ b/STM8/src/templates/package_tools_index.json
@@ -5,7 +5,7 @@
           [
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM8/tools/%%FILENAMEWIN%%",
+              "url": "https://github.com/stm32duino/Arduino_Tools_STM8/releases/download/%%VERSION%%/%%FILENAMEWIN%%",
               "archiveFileName": "%%FILENAMEWIN%%",
               "checksum": "SHA-256:%%CHECKSUMWIN%%",
               "size": "%%SIZEWIN%%"
diff --git a/package_stmicroelectronics_index.json b/package_stmicroelectronics_index.json
new file mode 100644
index 0000000..baad623
--- /dev/null
+++ b/package_stmicroelectronics_index.json
@@ -0,0 +1,349 @@
+{
+  "packages": [
+    {
+      "name": "STMicroelectronics",
+      "websiteURL": "https://github.com/stm32duino",
+      "maintainer": "STMicroelectronics",
+      "email": "stmduino@st.com",
+      "help": {
+        "online": "http://www.stm32duino.com/"
+      },
+      "platforms": [
+        {
+          "name": "[DEPRECATED - Please use new package index on main branch] STM32 MCU based boards",
+          "architecture": "stm32",
+          "version": "2.0.0",
+          "deprecated": true,
+          "category": "Contributed",
+          "url": "https://github.com/stm32duino/Arduino_Core_STM32/releases/download/2.0.0/STM32-2.0.0.tar.bz2",
+          "archiveFileName": "STM32-2.0.0.tar.bz2",
+          "checksum": "SHA-256:31e7a98afdc595335acbd111b39563350eb63bd0bcd005aebbe6fe1f8bad26fe",
+          "size": "38496810",
+          "boards": [
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "STMicroelectronics",
+              "name": "xpack-arm-none-eabi-gcc",
+              "version": "9.3.1-1.3"
+            },
+            {
+              "packager": "STMicroelectronics",
+              "name": "STM32Tools",
+              "version": "2.0.0"
+            },
+            {
+              "packager": "STMicroelectronics",
+              "name": "CMSIS",
+              "version": "5.7.0"
+            }
+          ]
+        },
+        {
+          "name": "[DEPRECATED - Please use new package index on main branch] STM32 MCU based boards",
+          "architecture": "stm32",
+          "version": "2.1.0",
+          "deprecated": true,
+          "category": "Contributed",
+          "url": "https://github.com/stm32duino/Arduino_Core_STM32/releases/download/2.1.0/STM32-2.1.0.tar.bz2",
+          "archiveFileName": "STM32-2.1.0.tar.bz2",
+          "checksum": "SHA-256:154f781f890443385b3cf68a606cae4a67cb42c7ee7b3cda7171f333cbcb4745",
+          "size": "41172157",
+          "boards": [
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "STMicroelectronics",
+              "name": "xpack-arm-none-eabi-gcc",
+              "version": "10.2.1-1.1"
+            },
+            {
+              "packager": "STMicroelectronics",
+              "name": "STM32Tools",
+              "version": "2.1.0"
+            },
+            {
+              "packager": "STMicroelectronics",
+              "name": "CMSIS",
+              "version": "5.7.0"
+            }
+          ]
+        },
+        {
+          "name": "[DEPRECATED - Please use new package index on main branch] STM8 MCU based boards",
+          "architecture": "stm8",
+          "version": "1.0.0",
+          "deprecated": true,
+          "category": "Contributed",
+          "url": "https://github.com/stm32duino/Arduino_Core_STM8/releases/download/1.0.0/STM8-1.0.0.tar.bz2",
+          "archiveFileName": "STM8-1.0.0.tar.bz2",
+          "checksum": "SHA-256:f38055bfd8199feea66f02a3a25405d07aa3635f57b2adf15e93112b2d556584",
+          "size": "374456",
+          "boards": [
+            {"name": "DEPRECATED - Please use new package index: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json"}
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "STMicroelectronics",
+              "name": "cxppstm8",
+              "version": "4.1.3"
+            },
+            {
+              "packager": "STMicroelectronics",
+              "name": "STM8Tools",
+              "version": "1.0.0"
+            }
+          ]
+        }
+      ],
+      "tools": [
+        {
+          "name": "xpack-arm-none-eabi-gcc",
+          "version": "9.3.1-1.3",
+          "systems":
+          [
+            {
+              "host": "arm-linux-gnueabihf",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-arm.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-arm.tar.gz",
+              "checksum": "SHA-256:0e6720296f291141cd757d90e6bf60867a1232de9abc52b0cde28af12eeb94f2",
+              "size": "147111321"
+            },
+            {
+              "host": "aarch64-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-arm64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-arm64.tar.gz",
+              "checksum": "SHA-256:9a9e96b9ac3634d7632d35aa0d8138f8468d4f3f4d752374a95420ff7c8e4476",
+              "size": "150584175"
+            },
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-win32-x32.zip",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-win32-x32.zip",
+              "checksum": "SHA-256:7432cfff045dc421d2ba177c3777ec1e82d4febe5f5f51fb2e90ff07d27cd466",
+              "size": "148593506"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-darwin-x64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-darwin-x64.tar.gz",
+              "checksum": "SHA-256:f22f0d49c27f844dcfe629a6a33878d767b6945acd7508d9578b20b17b106f4c",
+              "size": "148641073"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-x64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-x64.tar.gz",
+              "checksum": "SHA-256:9045d261b000d921887fc801427542eed2df1616f63a2969a2640f8be2593686",
+              "size": "151422620"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v9.3.1-1.3/xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-x32.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-9.3.1-1.3-linux-x32.tar.gz",
+              "checksum": "SHA-256:1950c7b0b4e35bacec32450158ec192ac469189a5fb27c2fd7c01e9603e50e64",
+              "size": "154309058"
+            }
+          ]
+        },
+        {
+          "name": "xpack-arm-none-eabi-gcc",
+          "version": "10.2.1-1.1",
+          "systems":
+          [
+            {
+              "host": "arm-linux-gnueabihf",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-arm.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-arm.tar.gz",
+              "checksum": "SHA-256:b726faccb8a3c426012592145d9d49a9b998a950613a4848bf8d899a8929ae34",
+              "size": "182652907"
+            },
+            {
+              "host": "aarch64-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-arm64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-arm64.tar.gz",
+              "checksum": "SHA-256:88b4f581a14b0dc2ee2313f4342f38996a4c8f3e4d09d9f70a6c4a4b9ea360e7",
+              "size": "187490794"
+            },
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-win32-ia32.zip",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-win32-ia32.zip",
+              "checksum": "SHA-256:5b4576c8280a6788bd1abe54c8172e03f9947ddd776960d2043b33955389e739",
+              "size": "190155753"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-darwin-x64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-darwin-x64.tar.gz",
+              "checksum": "SHA-256:061615d3e35d026cfa3ef8999f2bdaef2181b56e61029f58c8e0f1054bba046b",
+              "size": "183654470"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-x64.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-x64.tar.gz",
+              "checksum": "SHA-256:840e90b527d30143b8d8e5eb894218858ed14226bdc8664686f0848592b6e474",
+              "size": "188707051"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-ia32.tar.gz",
+              "archiveFileName": "xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-ia32.tar.gz",
+              "checksum": "SHA-256:8adaca8af367a54d1acd2b274cfdc18384b87fbe0ba613322ea3ead20677a132",
+              "size": "192497639"
+            }
+          ]
+        },
+        {
+          "name": "CMSIS",
+          "version": "5.7.0",
+          "systems":
+          [
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            },
+            {
+              "host": "arm-linux-gnueabihf",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            },
+            {
+              "host": "all",
+              "url": "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/5.7.0/CMSIS-5.7.0.tar.bz2",
+              "archiveFileName": "CMSIS-5.7.0.tar.bz2",
+              "checksum": "SHA-256:0b04b0f214e483bcc360cda985cddc0de8031714019ceabcda4770d510b82bfe",
+              "size": "26151901"
+            }
+          ]
+        },
+        {
+          "name": "STM32Tools",
+          "version": "2.0.0",
+          "systems":
+          [
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.0.0/STM32Tools-2.0.0-windows.tar.bz2",
+              "archiveFileName": "STM32Tools-2.0.0-windows.tar.bz2",
+              "checksum": "SHA-256:6316ffd1667344952bc5e16ff60783f9b4211d1eb54fc0d0c28e836b1490b717",
+              "size": "2486087"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.0.0/STM32Tools-2.0.0-mac.tar.bz2",
+              "archiveFileName": "STM32Tools-2.0.0-mac.tar.bz2",
+              "checksum": "SHA-256:2612be87206d2ba6f7cf797c194dbc070139defc884b881c1957a8d148c2114c",
+              "size": "486398"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.0.0/STM32Tools-2.0.0-linux.tar.bz2",
+              "archiveFileName": "STM32Tools-2.0.0-linux.tar.bz2",
+              "checksum": "SHA-256:850186554df1d56f5f5336d6310551b734b2ff97c92677ca0ece11f134b72d0f",
+              "size": "479795"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.0.0/STM32Tools-2.0.0-linux.tar.bz2",
+              "archiveFileName": "STM32Tools-2.0.0-linux.tar.bz2",
+              "checksum": "SHA-256:850186554df1d56f5f5336d6310551b734b2ff97c92677ca0ece11f134b72d0f",
+              "size": "479795"
+            }
+          ]
+        },
+        {
+          "name": "STM32Tools",
+          "version": "2.1.0",
+          "systems":
+          [
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.1.0/STM32Tools-2.1.0-windows.tar.bz2",
+              "archiveFileName": "STM32Tools-2.1.0-windows.tar.bz2",
+              "checksum": "SHA-256:d4d4b4fe0500ae1a1906c5e552b967277fd0e2df457f102b8c363c89f77cb6f2",
+              "size": "2559277"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.1.0/STM32Tools-2.1.0-mac.tar.bz2",
+              "archiveFileName": "STM32Tools-2.1.0-mac.tar.bz2",
+              "checksum": "SHA-256:475357fc7006fc003c320aa7a6cce7d8dbb81adc3b66929fc8a0a360bd3bb348",
+              "size": "447015"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.1.0/STM32Tools-2.1.0-linux.tar.bz2",
+              "archiveFileName": "STM32Tools-2.1.0-linux.tar.bz2",
+              "checksum": "SHA-256:06677d45ef42410590ae0b03fdf58f6a1f338726df4911fabc13822f4542ca2f",
+              "size": "479203"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "https://github.com/stm32duino/Arduino_Tools/releases/download/2.1.0/STM32Tools-2.1.0-linux.tar.bz2",
+              "archiveFileName": "STM32Tools-2.1.0-linux.tar.bz2",
+              "checksum": "SHA-256:06677d45ef42410590ae0b03fdf58f6a1f338726df4911fabc13822f4542ca2f",
+              "size": "479203"
+            }
+          ]
+        },
+        {
+          "name": "cxppstm8",
+          "version": "4.1.3",
+          "systems": [
+            {
+              "host": "i686-mingw32",
+              "url": "http://cosmicsoftware.com/Arduino/4.1.3/Cxppstm8.zip",
+              "archiveFileName": "Cxppstm8.zip",
+              "checksum": "SHA-256:1277e2ba80e744845ee55bb9088b206e324d401439ddd2956c13a4f418832dfe",
+              "size": "32363283"
+            }
+          ]
+        },
+        {
+          "name": "STM8Tools",
+          "version": "1.0.0",
+          "systems":
+          [
+            {
+              "host": "i686-mingw32",
+              "url": "https://github.com/stm32duino/Arduino_Tools_STM8/releases/download/1.0.0/STM8Tools-1.0.0-windows.tar.bz2",
+              "archiveFileName": "STM8Tools-1.0.0-windows.tar.bz2",
+              "checksum": "SHA-256:e8e8c8c23b41ae02e3363a54acfd0c716813b8ef64db490af1555993c81dcd0a",
+              "size": "6864757"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}