diff --git a/extras/mbed_edge-tag.template.json b/extras/mbed_edge-tag.template.json
new file mode 100644
index 000000000..4fff332df
--- /dev/null
+++ b/extras/mbed_edge-tag.template.json
@@ -0,0 +1,53 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Edge Boards",
+          "architecture": "mbed_edge",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%EDGE_FILENAME%%",
+          "archiveFileName": "%%EDGE_FILENAME%%",
+          "checksum": "SHA-256:%%EDGE_CHECKSUM%%",
+          "size": "%%EDGE_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Edge Control"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.9.1-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.0.6",
+              "name": "rp2040tools"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_giga-tag.template.json b/extras/mbed_giga-tag.template.json
new file mode 100644
index 000000000..d41338a30
--- /dev/null
+++ b/extras/mbed_giga-tag.template.json
@@ -0,0 +1,48 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Giga Boards",
+          "architecture": "mbed_giga",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%GIGA_FILENAME%%",
+          "archiveFileName": "%%GIGA_FILENAME%%",
+          "checksum": "SHA-256:%%GIGA_CHECKSUM%%",
+          "size": "%%GIGA_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Giga"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.8.0-arduino.2",
+              "name": "imgtool"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/extras/mbed_nano-tag.template.json b/extras/mbed_nano-tag.template.json
new file mode 100644
index 000000000..ab2a42775
--- /dev/null
+++ b/extras/mbed_nano-tag.template.json
@@ -0,0 +1,59 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Nano Boards",
+          "architecture": "mbed_nano",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%NANO_FILENAME%%",
+          "archiveFileName": "%%NANO_FILENAME%%",
+          "checksum": "SHA-256:%%NANO_CHECKSUM%%",
+          "size": "%%NANO_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Nano 33 BLE"
+            },
+            {
+              "name": "Arduino Nano 33 BLE Sense"
+            },
+            {
+              "name": "Arduino Nano RP2040 Connect"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.9.1-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.0.6",
+              "name": "rp2040tools"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_nicla-tag.template.json b/extras/mbed_nicla-tag.template.json
new file mode 100644
index 000000000..e79d8bc8b
--- /dev/null
+++ b/extras/mbed_nicla-tag.template.json
@@ -0,0 +1,59 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Nicla Boards",
+          "architecture": "mbed_nicla",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%NICLA_FILENAME%%",
+          "archiveFileName": "%%NICLA_FILENAME%%",
+          "checksum": "SHA-256:%%NICLA_CHECKSUM%%",
+          "size": "%%NICLA_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Nicla Sense ME"
+            },
+            {
+              "name": "Nicla Voice"
+            },
+            {
+              "name": "Nicla Vision"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.9.1-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.0.6",
+              "name": "rp2040tools"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_opta-tag.template.json b/extras/mbed_opta-tag.template.json
new file mode 100644
index 000000000..34349950e
--- /dev/null
+++ b/extras/mbed_opta-tag.template.json
@@ -0,0 +1,48 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Opta Boards",
+          "architecture": "mbed_opta",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%OPTA_FILENAME%%",
+          "archiveFileName": "%%OPTA_FILENAME%%",
+          "checksum": "SHA-256:%%OPTA_CHECKSUM%%",
+          "size": "%%OPTA_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Finder Opta"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.8.0-arduino.2",
+              "name": "imgtool"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_portenta-tag.template.json b/extras/mbed_portenta-tag.template.json
new file mode 100644
index 000000000..904c7f28e
--- /dev/null
+++ b/extras/mbed_portenta-tag.template.json
@@ -0,0 +1,56 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Portenta Boards",
+          "architecture": "mbed_portenta",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%PORTENTA_FILENAME%%",
+          "archiveFileName": "%%PORTENTA_FILENAME%%",
+          "checksum": "SHA-256:%%PORTENTA_CHECKSUM%%",
+          "size": "%%PORTENTA_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Portenta H7"
+            },
+            {
+              "name": "Arduino Portenta X8"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.8.0-arduino.2",
+              "name": "imgtool"
+            },
+            {
+              "packager": "arduino",
+              "version": "32.0.0",
+              "name": "adb"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_rp2040-tag.template.json b/extras/mbed_rp2040-tag.template.json
new file mode 100644
index 000000000..b68f9d17c
--- /dev/null
+++ b/extras/mbed_rp2040-tag.template.json
@@ -0,0 +1,53 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS RP2040 Boards",
+          "architecture": "mbed_rp2040",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%RP2040_FILENAME%%",
+          "archiveFileName": "%%RP2040_FILENAME%%",
+          "checksum": "SHA-256:%%RP2040_CHECKSUM%%",
+          "size": "%%RP2040_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Raspberry Pi Pico"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.9.1-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.0.6",
+              "name": "rp2040tools"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/mbed_stella-tag.template.json b/extras/mbed_stella-tag.template.json
new file mode 100644
index 000000000..3ad4d44ab
--- /dev/null
+++ b/extras/mbed_stella-tag.template.json
@@ -0,0 +1,53 @@
+{
+  "packages": [
+    {
+      "platforms": [
+        {
+          "name": "Arduino Mbed OS Stella Boards",
+          "architecture": "mbed_stella",
+          "version": "%%VERSION%%",
+          "category": "Arduino",
+          "url": "http://downloads.arduino.cc/cores/staging/%%STELLA_FILENAME%%",
+          "archiveFileName": "%%STELLA_FILENAME%%",
+          "checksum": "SHA-256:%%STELLA_CHECKSUM%%",
+          "size": "%%STELLA_SIZE%%",
+          "help": {
+            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
+          },
+          "boards": [
+            {
+              "name": "Arduino Stella"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
+            },
+            {
+              "packager": "arduino",
+              "name": "bossac",
+              "version": "1.9.1-arduino2"
+            },
+            {
+              "packager": "arduino",
+              "version": "0.10.0-arduino1",
+              "name": "dfu-util"
+            },
+            {
+              "packager": "arduino",
+              "version": "1.0.6",
+              "name": "rp2040tools"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/extras/package_index.json.NewTag.template b/extras/package_index.json.NewTag.template
deleted file mode 100644
index df360e171..000000000
--- a/extras/package_index.json.NewTag.template
+++ /dev/null
@@ -1,408 +0,0 @@
-{
-  "packages": [
-    {
-      "name": "arduino",
-      "maintainer": "Arduino",
-      "websiteURL": "http://www.arduino.cc/",
-      "email": "packages@arduino.cc",
-      "help": {
-        "online": "http://www.arduino.cc/en/Reference/HomePage"
-      },
-      "platforms": [
-        {
-          "name": "[DEPRECATED - Please install standalone packages] Arduino Mbed OS Boards",
-          "architecture": "mbed",
-          "version": "%%VERSION%%",
-          "deprecated": true,
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%FILENAME%%",
-          "archiveFileName": "%%FILENAME%%",
-          "checksum": "SHA-256:%%CHECKSUM%%",
-          "size": "%%SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Nano 33 BLE"
-            },
-            {
-              "name": "Arduino Nano 33 BLE Sense"
-            },
-            {
-              "name": "Arduino Nano RP2040 Connect"
-            },
-            {
-              "name": "Arduino Portenta H7"
-            },
-            {
-              "name": "Arduino Edge Control"
-            },
-            {
-              "name": "Raspberry Pi Pico"
-            },
-            {
-              "name": "Nicla Sense ME"
-            },
-            {
-              "name": "Arduino Nicla Vision"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.9.1-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Edge Boards",
-          "architecture": "mbed_edge",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%EDGE_FILENAME%%",
-          "archiveFileName": "%%EDGE_FILENAME%%",
-          "checksum": "SHA-256:%%EDGE_CHECKSUM%%",
-          "size": "%%EDGE_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Edge Control"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.9.1-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Nano Boards",
-          "architecture": "mbed_nano",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%NANO_FILENAME%%",
-          "archiveFileName": "%%NANO_FILENAME%%",
-          "checksum": "SHA-256:%%NANO_CHECKSUM%%",
-          "size": "%%NANO_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Nano 33 BLE"
-            },
-            {
-              "name": "Arduino Nano 33 BLE Sense"
-            },
-            {
-              "name": "Arduino Nano RP2040 Connect"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.9.1-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Portenta Boards",
-          "architecture": "mbed_portenta",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%PORTENTA_FILENAME%%",
-          "archiveFileName": "%%PORTENTA_FILENAME%%",
-          "checksum": "SHA-256:%%PORTENTA_CHECKSUM%%",
-          "size": "%%PORTENTA_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Portenta H7"
-            },
-            {
-              "name": "Arduino Portenta X8"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
-            },
-            {
-              "packager": "arduino",
-              "version": "32.0.0",
-              "name": "adb"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS RP2040 Boards",
-          "architecture": "mbed_rp2040",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%RP2040_FILENAME%%",
-          "archiveFileName": "%%RP2040_FILENAME%%",
-          "checksum": "SHA-256:%%RP2040_CHECKSUM%%",
-          "size": "%%RP2040_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Raspberry Pi Pico"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.9.1-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Nicla Boards",
-          "architecture": "mbed_nicla",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%NICLA_FILENAME%%",
-          "archiveFileName": "%%NICLA_FILENAME%%",
-          "checksum": "SHA-256:%%NICLA_CHECKSUM%%",
-          "size": "%%NICLA_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Nicla Sense ME"
-            },
-            {
-              "name": "Nicla Voice"
-            },
-            {
-              "name": "Nicla Vision"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.9.1-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Opta Boards",
-          "architecture": "mbed_opta",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%OPTA_FILENAME%%",
-          "archiveFileName": "%%OPTA_FILENAME%%",
-          "checksum": "SHA-256:%%OPTA_CHECKSUM%%",
-          "size": "%%OPTA_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Finder Opta"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
-            }
-          ]
-        },
-        {
-          "name": "Arduino Mbed OS Giga Boards",
-          "architecture": "mbed_giga",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/cores/staging/%%GIGA_FILENAME%%",
-          "archiveFileName": "%%GIGA_FILENAME%%",
-          "checksum": "SHA-256:%%GIGA_CHECKSUM%%",
-          "size": "%%GIGA_SIZE%%",
-          "help": {
-            "online": "https://github.com/arduino/ArduinoCore-mbed/issues"
-          },
-          "boards": [
-            {
-              "name": "Arduino Giga"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
-            },
-            {
-              "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
-            },
-            {
-              "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
-            }
-          ]
-        }
-      ],
-      "tools": []
-    }
-  ]
-}
diff --git a/package.sh b/package.sh
index 3d89d8155..660b57d9c 100755
--- a/package.sh
+++ b/package.sh
@@ -73,10 +73,18 @@ BASE_FOLDER=`basename $PWD`
 #Package! (remove .git, patches folders)
 cd ..
 tar --exclude='*.git*' --exclude='*patches*' -cjhf ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 $BASE_FOLDER
-if [ x$FLAVOUR == x ]; then
-mv ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 ArduinoCore-mbed-$VERSION.tar.bz2
-echo FILENAME=ArduinoCore-mbed-$VERSION.tar.bz2 > /tmp/env
-else
-echo FILENAME=ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 > /tmp/env
-fi
+
+# Create JSON file for the package
+FILENAME=ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2
+CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
+SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
+FLAVOUR_TAG=${FLAVOUR^^}_
+FLAVOUR_NAME=${FLAVOUR,,}
+
+cat ArduinoCore-mbed/extras/mbed_$FLAVOUR_NAME-tag.template.json |
+sed "s/%%VERSION%%/${VERSION}/" |
+sed "s/%%${FLAVOUR_TAG}FILENAME%%/${FILENAME}/" |
+sed "s/%%${FLAVOUR_TAG}CHECKSUM%%/${CHKSUM}/" |
+sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION.json
+
 cd -
diff --git a/package_full.sh b/package_full.sh
index 6e1405428..476f1c425 100755
--- a/package_full.sh
+++ b/package_full.sh
@@ -3,8 +3,6 @@ export VERSION="4.3.1"
 
 FLAVOURS=`ls *.variables`
 
-cp extras/package_index.json.NewTag.template /tmp/json
-
 for flavour in $FLAVOURS; do
 
 # Hack, clean everything from known positions and restart
@@ -17,32 +15,4 @@ git clone git@github.com:arduino/ArduinoCore-API.git ../api/
 ln -s ../../../api/api cores/arduino/api
 ./package.sh $flavour
 
-echo "Creating json"
-
-source /tmp/env
-CHKSUM=`sha256sum ../$FILENAME | awk '{ print $1 }'`
-SIZE=`wc -c ../$FILENAME | awk '{ print $1 }'`
-source ${flavour}
-
-FLAVOUR=${FLAVOUR^^}
-
-if [ x$FLAVOUR != x ]; then
-FLAVOUR=${FLAVOUR}_
-fi
-
-echo FILENAME=$FILENAME
-echo CHKSUM=$CHKSUM
-echo SIZE=$SIZE
-echo VERSION=$VERSION
-echo FLAVOUR=$FLAVOUR
-
-cat /tmp/json |
-sed "s/%%VERSION%%/${VERSION}/" |
-sed "s/%%${FLAVOUR}FILENAME%%/${FILENAME}/" |
-sed "s/%%${FLAVOUR}CHECKSUM%%/${CHKSUM}/" |
-sed "s/%%${FLAVOUR}SIZE%%/${SIZE}/" > /tmp/json2
-mv /tmp/json2 /tmp/json
-
 done
-
-cp /tmp/json package_${CORE_NAME}_${VERSION}_index.json