diff --git a/extras/mbed_edge-tag.template.json b/extras/mbed_edge-tag.template.json
index 4fff332df..edbf719e8 100644
--- a/extras/mbed_edge-tag.template.json
+++ b/extras/mbed_edge-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_giga-tag.template.json b/extras/mbed_giga-tag.template.json
index d41338a30..a63c6576f 100644
--- a/extras/mbed_giga-tag.template.json
+++ b/extras/mbed_giga-tag.template.json
@@ -22,23 +22,23 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
             },
             {
               "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_nano-tag.template.json b/extras/mbed_nano-tag.template.json
index ab2a42775..944622f48 100644
--- a/extras/mbed_nano-tag.template.json
+++ b/extras/mbed_nano-tag.template.json
@@ -26,11 +26,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_nicla-tag.template.json b/extras/mbed_nicla-tag.template.json
index e79d8bc8b..4cffeb9c5 100644
--- a/extras/mbed_nicla-tag.template.json
+++ b/extras/mbed_nicla-tag.template.json
@@ -26,11 +26,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_opta-tag.template.json b/extras/mbed_opta-tag.template.json
index 34349950e..d76b89e49 100644
--- a/extras/mbed_opta-tag.template.json
+++ b/extras/mbed_opta-tag.template.json
@@ -22,23 +22,23 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
             },
             {
               "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_portenta-tag.template.json b/extras/mbed_portenta-tag.template.json
index 904c7f28e..e73501f94 100644
--- a/extras/mbed_portenta-tag.template.json
+++ b/extras/mbed_portenta-tag.template.json
@@ -25,8 +25,8 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "adb",
+              "version": "32.0.0"
             },
             {
               "packager": "arduino",
@@ -35,18 +35,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "32.0.0",
-              "name": "adb"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_rp2040-tag.template.json b/extras/mbed_rp2040-tag.template.json
index b68f9d17c..424ffe18c 100644
--- a/extras/mbed_rp2040-tag.template.json
+++ b/extras/mbed_rp2040-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_stella-tag.template.json b/extras/mbed_stella-tag.template.json
index 3ad4d44ab..d54eef818 100644
--- a/extras/mbed_stella-tag.template.json
+++ b/extras/mbed_stella-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/package.sh b/package.sh
index 660b57d9c..ded181efc 100755
--- a/package.sh
+++ b/package.sh
@@ -80,11 +80,12 @@ CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
 SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
 FLAVOUR_TAG=${FLAVOUR^^}_
 FLAVOUR_NAME=${FLAVOUR,,}
+VERSION_NAME=${VERSION//./-}
 
 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
+sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION_NAME.json
 
 cd -