diff --git a/.licenses/go/github.com/arduino/iot-client-go/v2.dep.yml b/.licenses/go/github.com/arduino/iot-client-go/v2.dep.yml
index ed76f3c6..43ef0bb2 100644
--- a/.licenses/go/github.com/arduino/iot-client-go/v2.dep.yml
+++ b/.licenses/go/github.com/arduino/iot-client-go/v2.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: github.com/arduino/iot-client-go/v2
-version: v2.0.2
+version: v2.0.3
 type: go
 summary: 
 homepage: https://pkg.go.dev/github.com/arduino/iot-client-go/v2
diff --git a/README.md b/README.md
index 1554809d..f78f4058 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,8 @@ Here are the FQBNs of the Arduino boards that can be provisioned with this comma
 * `arduino:samd:mkrnb1500`
 * `arduino:mbed_opta:opta`
 * `arduino:mbed_giga:giga`
+* `arduino:esp32:nano_nora`
+* `arduino:renesas_uno:unor4wifi`
 
 If the device supports more than one connectivity type (Eg: WiFi and Ethernet) the --connection flag can be used to set the desired connectivity
 
@@ -327,10 +329,17 @@ Note that the binary file (`.bin`) should be compiled using an arduino core that
 arduino-cloud-cli ota upload --device-id <deviceID> --file <sketch-file.ino.bin>
 ```
 
-The default OTA upload should complete in 10 minutes. Use `--deferred` flag to extend this time to one week (see an example sketch [here](https://github.com/arduino-libraries/ArduinoIoTCloud/blob/ab0af75a5666f875929029ac6df59e04789269c5/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino)):
+This schedule a new OTA. Its ID is printed as output.
+It is possible to check status for scheduled/executed OTAs using status command.
 
 ```bash
-arduino-cloud-cli ota upload --device-id <deviceID> --file <sketch-file.ino.bin> --deferred
+arduino-cloud-cli ota status --ota-id <otaID>
+```
+
+or by device
+
+```bash
+arduino-cloud-cli ota status --device-id <deviceID>
 ```
 
 ### Mass upload
@@ -383,3 +392,39 @@ Create a dashboard: dashboards can be created only starting from a template. Sup
 ```bash
 arduino-cloud-cli dashboard create --name <dashboardName> --template <template.(json|yaml)> --override <thing-0>=<actualThingID>,<thing-1>=<otherActualThingID>
 ```
+
+## Custom templates
+
+### List custom templates
+
+Use following command to list available custom templates
+
+```bash
+arduino-cloud-cli template list
+```
+
+### Export custom template
+
+Given list command, it is possible to get custom template ID. Given its ID, use following command to export it as '.tino' archive:
+
+```bash
+arduino-cloud-cli template export -t <templateID>
+```
+
+it is possible to specify output directory with '-d' flag
+
+### Import custom template
+
+To import a custom template, use command:
+
+```bash
+arduino-cloud-cli template import -f <template .tino archive>
+```
+
+### Template apply
+
+It is possible to apply a given template to a device. Apply will generate required resources. Configure device connectivity using '-n' option (see --help for further details).
+
+```bash
+arduino-cloud-cli template apply -d <deviceID> -t <templateID> -p "<name prefix>" -n SECRET_SSID=<ssid>,SECRET_OPTIONAL_PASS=<pwd>
+```
\ No newline at end of file
diff --git a/cli/cli.go b/cli/cli.go
index 4ddeb0ea..3f2e4169 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -29,6 +29,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/cli/dashboard"
 	"github.com/arduino/arduino-cloud-cli/cli/device"
 	"github.com/arduino/arduino-cloud-cli/cli/ota"
+	"github.com/arduino/arduino-cloud-cli/cli/template"
 	"github.com/arduino/arduino-cloud-cli/cli/thing"
 	"github.com/arduino/arduino-cloud-cli/cli/version"
 	"github.com/sirupsen/logrus"
@@ -65,6 +66,7 @@ func Execute() {
 	cli.AddCommand(thing.NewCommand())
 	cli.AddCommand(dashboard.NewCommand())
 	cli.AddCommand(ota.NewCommand())
+	cli.AddCommand(template.NewCommand())
 
 	if err := cli.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
diff --git a/cli/device/device.go b/cli/device/device.go
index 86e313a5..854336e3 100644
--- a/cli/device/device.go
+++ b/cli/device/device.go
@@ -31,6 +31,7 @@ func NewCommand() *cobra.Command {
 
 	deviceCommand.AddCommand(initCreateCommand())
 	deviceCommand.AddCommand(initListCommand())
+	deviceCommand.AddCommand(initShowCommand())
 	deviceCommand.AddCommand(initDeleteCommand())
 	deviceCommand.AddCommand(tag.InitCreateTagsCommand())
 	deviceCommand.AddCommand(tag.InitDeleteTagsCommand())
diff --git a/cli/device/show.go b/cli/device/show.go
new file mode 100644
index 00000000..8956135b
--- /dev/null
+++ b/cli/device/show.go
@@ -0,0 +1,102 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2024 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package device
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cli/table"
+	"github.com/arduino/arduino-cloud-cli/command/device"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+type showFlags struct {
+	deviceId string
+}
+
+func initShowCommand() *cobra.Command {
+	flags := &showFlags{}
+	showCommand := &cobra.Command{
+		Use:   "show",
+		Short: "Show device properties",
+		Long:  "Show device properties on Arduino IoT Cloud",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := runShowCommand(flags); err != nil {
+				feedback.Errorf("Error during device show: %v", err)
+				os.Exit(errorcodes.ErrGeneric)
+			}
+		},
+	}
+	showCommand.Flags().StringVarP(&flags.deviceId, "device-id", "d", "", "device ID")
+
+	showCommand.MarkFlagRequired("device-id")
+
+	return showCommand
+}
+
+func runShowCommand(flags *showFlags) error {
+	logrus.Info("Show device")
+
+	cred, err := config.RetrieveCredentials()
+	if err != nil {
+		return fmt.Errorf("retrieving credentials: %w", err)
+	}
+
+	dev, _, err := device.Show(context.TODO(), flags.deviceId, cred)
+	if err != nil {
+		return err
+	}
+
+	feedback.PrintResult(showResult{dev})
+	return nil
+}
+
+type showResult struct {
+	device *device.DeviceInfo
+}
+
+func (r showResult) Data() interface{} {
+	return r.device
+}
+
+func (r showResult) String() string {
+	if r.device == nil {
+		return "No device found."
+	}
+	t := table.New()
+	t.SetHeader("Name", "ID", "Board", "FQBN", "SerialNumber", "Status", "Connection type", "Thing", "Tags")
+	t.AddRow(
+		r.device.Name,
+		r.device.ID,
+		r.device.Board,
+		r.device.FQBN,
+		r.device.Serial,
+		dereferenceString(r.device.Status),
+		dereferenceString(r.device.ConnectionType),
+		dereferenceString(r.device.ThingID),
+		strings.Join(r.device.Tags, ","),
+	)
+	return t.Render()
+}
diff --git a/cli/template/apply.go b/cli/template/apply.go
new file mode 100644
index 00000000..0b90d42d
--- /dev/null
+++ b/cli/template/apply.go
@@ -0,0 +1,96 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2024 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/template"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/spf13/cobra"
+)
+
+type applyFlags struct {
+	templateId     string
+	templatePrefix string
+	deviceId       string
+	netCredentials string
+	applyOta       bool
+}
+
+func initTemplateApplyCommand() *cobra.Command {
+	flags := &applyFlags{}
+	applyCommand := &cobra.Command{
+		Use:   "apply",
+		Short: "Apply custom template",
+		Long:  "Given a template, apply it and create all the resources defined in it",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := runTemplateApplyCommand(flags); err != nil {
+				feedback.Errorf("Error during template apply: %v", err)
+				os.Exit(errorcodes.ErrGeneric)
+			}
+		},
+	}
+
+	applyCommand.Flags().StringVarP(&flags.templateId, "template-id", "t", "", "Template ID")
+	applyCommand.Flags().StringVarP(&flags.templatePrefix, "prefix", "p", "", "Prefix to apply to the name of created resources")
+	applyCommand.Flags().StringVarP(&flags.deviceId, "device-id", "d", "", "Device ID")
+	applyCommand.Flags().StringVarP(&flags.netCredentials, "network-credentials", "n", "", "Comma separated network credentials used to configure device with format <key>=<value>. Supported values: SECRET_SSID | SECRET_OPTIONAL_PASS | SECRET_DEVICE_KEY")
+
+	applyCommand.MarkFlagRequired("template-id")
+	applyCommand.MarkFlagRequired("prefix")
+	applyCommand.MarkFlagRequired("device-id")
+
+	flags.applyOta = false
+
+	return applyCommand
+}
+
+func runTemplateApplyCommand(flags *applyFlags) error {
+	cred, err := config.RetrieveCredentials()
+	if err != nil {
+		return fmt.Errorf("retrieving credentials: %w", err)
+	}
+
+	deviceNetCredentials, err := parseCredentials(flags.netCredentials)
+	if err != nil {
+		return fmt.Errorf("parsing network credentials: %w", err)
+	}
+
+	return template.ApplyCustomTemplates(cred, flags.templateId, flags.deviceId, flags.templatePrefix, deviceNetCredentials, flags.applyOta)
+}
+
+func parseCredentials(credentials string) (map[string]string, error) {
+	credentialsMap := make(map[string]string)
+	if credentials == "" {
+		return credentialsMap, nil
+	}
+	credentialsArray := strings.Split(credentials, ",")
+	for _, credential := range credentialsArray {
+		credentialArray := strings.Split(credential, "=")
+		if len(credentialArray) != 2 {
+			return nil, fmt.Errorf("invalid network credential: %s", credential)
+		}
+		credentialsMap[credentialArray[0]] = credentialArray[1]
+	}
+	return credentialsMap, nil
+}
diff --git a/cli/template/export.go b/cli/template/export.go
new file mode 100644
index 00000000..e5effe55
--- /dev/null
+++ b/cli/template/export.go
@@ -0,0 +1,64 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/template"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/spf13/cobra"
+)
+
+type exportFlags struct {
+	templateId string
+	path       string
+}
+
+func initTemplateExportCommand() *cobra.Command {
+	flags := &exportFlags{}
+	uploadCommand := &cobra.Command{
+		Use:   "export",
+		Short: "Export template",
+		Long:  "Export template to a file",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := runTemplateExportCommand(flags); err != nil {
+				feedback.Errorf("Error during template export: %v", err)
+				os.Exit(errorcodes.ErrGeneric)
+			}
+		},
+	}
+
+	uploadCommand.Flags().StringVarP(&flags.templateId, "template-id", "t", "", "Template id")
+	uploadCommand.Flags().StringVarP(&flags.path, "directory", "d", "", "Output directory")
+
+	uploadCommand.MarkFlagRequired("template-id")
+
+	return uploadCommand
+}
+
+func runTemplateExportCommand(flags *exportFlags) error {
+	cred, err := config.RetrieveCredentials()
+	if err != nil {
+		return fmt.Errorf("retrieving credentials: %w", err)
+	}
+	return template.ExportCustomTemplate(cred, flags.templateId, flags.path)
+}
diff --git a/cli/template/import.go b/cli/template/import.go
new file mode 100644
index 00000000..89ac96e1
--- /dev/null
+++ b/cli/template/import.go
@@ -0,0 +1,62 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/template"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/spf13/cobra"
+)
+
+type importFlags struct {
+	templateFile string
+}
+
+func initTemplateImportCommand() *cobra.Command {
+	flags := &importFlags{}
+	downloadCommand := &cobra.Command{
+		Use:   "import",
+		Short: "Import template",
+		Long:  "Import a template from a file",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := runTemplateImportCommand(flags); err != nil {
+				feedback.Errorf("Error during template import: %v", err)
+				os.Exit(errorcodes.ErrGeneric)
+			}
+		},
+	}
+
+	downloadCommand.Flags().StringVarP(&flags.templateFile, "file", "f", "", "Template file to import")
+
+	downloadCommand.MarkFlagRequired("file")
+
+	return downloadCommand
+}
+
+func runTemplateImportCommand(flags *importFlags) error {
+	cred, err := config.RetrieveCredentials()
+	if err != nil {
+		return fmt.Errorf("retrieving credentials: %w", err)
+	}
+	return template.ImportCustomTemplate(cred, flags.templateFile)
+}
diff --git a/cli/template/list.go b/cli/template/list.go
new file mode 100644
index 00000000..9672d9db
--- /dev/null
+++ b/cli/template/list.go
@@ -0,0 +1,53 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/template"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/spf13/cobra"
+)
+
+func initTemplateListCommand() *cobra.Command {
+	listCommand := &cobra.Command{
+		Use:   "list",
+		Short: "List templates",
+		Long:  "List available templates",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := runTemplateListCommand(); err != nil {
+				feedback.Errorf("Error during template list: %v", err)
+				os.Exit(errorcodes.ErrGeneric)
+			}
+		},
+	}
+
+	return listCommand
+}
+
+func runTemplateListCommand() error {
+	cred, err := config.RetrieveCredentials()
+	if err != nil {
+		return fmt.Errorf("retrieving credentials: %w", err)
+	}
+	return template.ListCustomTemplates(cred)
+}
diff --git a/cli/template/template.go b/cli/template/template.go
new file mode 100644
index 00000000..80848a65
--- /dev/null
+++ b/cli/template/template.go
@@ -0,0 +1,37 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func NewCommand() *cobra.Command {
+	templateCommand := &cobra.Command{
+		Use:   "template",
+		Short: "Custom templates.",
+		Long:  "Commands to manage custom templates lifecycle, like import, export and apply.",
+	}
+
+	templateCommand.AddCommand(initTemplateImportCommand())
+	templateCommand.AddCommand(initTemplateExportCommand())
+	templateCommand.AddCommand(initTemplateListCommand())
+	templateCommand.AddCommand(initTemplateApplyCommand())
+
+	return templateCommand
+}
diff --git a/command/device/device.go b/command/device/device.go
index 832f1116..8c9dede1 100644
--- a/command/device/device.go
+++ b/command/device/device.go
@@ -25,13 +25,16 @@ import (
 // DeviceInfo contains the most interesting
 // parameters of an Arduino IoT Cloud device.
 type DeviceInfo struct {
-	Name   string   `json:"name"`
-	ID     string   `json:"id"`
-	Board  string   `json:"board"`
-	Serial string   `json:"serial_number"`
-	FQBN   string   `json:"fqbn"`
-	Tags   []string `json:"tags,omitempty"`
-	Status *string  `json:"status,omitempty"`
+	Name           string   `json:"name"`
+	ID             string   `json:"id"`
+	Board          string   `json:"board"`
+	Serial         string   `json:"serial_number"`
+	FQBN           string   `json:"fqbn"`
+	Tags           []string `json:"tags,omitempty"`
+	Status         *string  `json:"status,omitempty"`
+	Type           string   `json:"type,omitempty"`
+	ConnectionType *string  `json:"connection_type,omitempty"`
+	ThingID        *string  `json:"thing_id,omitempty"`
 }
 
 func getDeviceInfo(device *iotclient.ArduinoDevicev2) (*DeviceInfo, error) {
@@ -42,13 +45,18 @@ func getDeviceInfo(device *iotclient.ArduinoDevicev2) (*DeviceInfo, error) {
 	}
 
 	dev := &DeviceInfo{
-		Name:   device.Name,
-		ID:     device.Id,
-		Board:  device.Type,
-		Serial: device.Serial,
-		FQBN:   dereferenceString(device.Fqbn),
-		Tags:   tags,
-		Status: device.DeviceStatus,
+		Name:           device.Name,
+		ID:             device.Id,
+		Board:          device.Type,
+		Serial:         device.Serial,
+		FQBN:           dereferenceString(device.Fqbn),
+		Tags:           tags,
+		Status:         device.DeviceStatus,
+		Type:           device.Type,
+		ConnectionType: device.ConnectionType,
+	}
+	if device.Thing != nil {
+		dev.ThingID = &device.Thing.Id
 	}
 	return dev, nil
 }
diff --git a/command/device/show.go b/command/device/show.go
new file mode 100644
index 00000000..18d53c77
--- /dev/null
+++ b/command/device/show.go
@@ -0,0 +1,66 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2024 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package device
+
+import (
+	"context"
+
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/arduino/arduino-cloud-cli/internal/iot"
+	"github.com/sirupsen/logrus"
+)
+
+type netCredentials struct {
+	FriendlyName string `json:"friendly_name"`
+	Required     bool   `json:"required"`
+	SecretName   string `json:"secret_name"`
+	Sensitive    bool   `json:"sensitive"`
+}
+
+// List command is used to list
+// the devices of Arduino IoT Cloud.
+func Show(ctx context.Context, deviceId string, cred *config.Credentials) (*DeviceInfo, []netCredentials, error) {
+	iotClient, err := iot.NewClient(cred)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	logrus.Infof("Show device %s", deviceId)
+
+	foundDevice, err := iotClient.DeviceShow(ctx, deviceId)
+	if err != nil {
+		return nil, nil, err
+	}
+	device, err := getDeviceInfo(foundDevice)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	net := []netCredentials{}
+	if device.ConnectionType != nil {
+		netCredentialsArray, err := iotClient.DeviceNetworkCredentials(ctx, deviceId, *foundDevice.ConnectionType)
+		if err != nil {
+			return nil, net, err
+		}
+		for _, netCred := range netCredentialsArray {
+			net = append(net, netCredentials(netCred))
+		}
+	}
+
+	return device, nil, nil
+}
diff --git a/command/ota/cancel.go b/command/ota/cancel.go
index 1c12feda..3746af40 100644
--- a/command/ota/cancel.go
+++ b/command/ota/cancel.go
@@ -1,3 +1,20 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 package ota
 
 import (
diff --git a/command/ota/massupload_test.go b/command/ota/massupload_test.go
index 981b18e6..ba50d9fa 100644
--- a/command/ota/massupload_test.go
+++ b/command/ota/massupload_test.go
@@ -1,3 +1,20 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 package ota
 
 import (
diff --git a/command/ota/status.go b/command/ota/status.go
index f13ec5dd..4bb9d067 100644
--- a/command/ota/status.go
+++ b/command/ota/status.go
@@ -1,3 +1,20 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 package ota
 
 import (
diff --git a/command/template/.testdata/template_ok-rp-with-binaries.tino b/command/template/.testdata/template_ok-rp-with-binaries.tino
new file mode 100644
index 00000000..77179856
Binary files /dev/null and b/command/template/.testdata/template_ok-rp-with-binaries.tino differ
diff --git a/command/template/apply.go b/command/template/apply.go
new file mode 100644
index 00000000..8ba09e4c
--- /dev/null
+++ b/command/template/apply.go
@@ -0,0 +1,237 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2024 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"archive/zip"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/ota"
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/arduino/arduino-cloud-cli/internal/iot"
+	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
+	iotclient "github.com/arduino/iot-client-go/v2"
+	"github.com/gofrs/uuid"
+	"github.com/sirupsen/logrus"
+)
+
+var errNoBinaryFound = errors.New("no binary found in the template")
+
+func ApplyCustomTemplates(cred *config.Credentials, templateId, deviceId, prefix string, networkCredentials map[string]string, applyOta bool) error {
+
+	ctx := context.Background()
+
+	// Open clients
+	apiclient := storageapi.NewClient(cred)
+	iotClient, err := iot.NewClient(cred)
+	if err != nil {
+		return err
+	}
+
+	feedback.Printf("Applying template %s to device %s", templateId, deviceId)
+
+	templateIdUUID, err := uuid.FromString(templateId)
+	if err != nil {
+		return fmt.Errorf("invalid template id: %s", templateId)
+	}
+
+	// Get custom template and verify it is present
+	cstTemplate, err := apiclient.GetCustomTemplate(templateIdUUID)
+	if err != nil {
+		return err
+	}
+	if len(cstTemplate.ThingTemplates) <= 0 {
+		return fmt.Errorf("template %s has no thing template", templateId)
+	}
+	thingTemplateIdentifier := cstTemplate.ThingTemplates[0]
+	logrus.Debug("Main thing template - id: ", thingTemplateIdentifier.Id)
+
+	// Get device and check its connectivity
+	secrets, err := resolveDeviceNetworkConfigurations(ctx, iotClient, deviceId, networkCredentials)
+	if err != nil {
+		return err
+	}
+
+	// Apply the template
+	_, err = iotClient.TemplateApply(ctx, templateId, thingTemplateIdentifier.Id, prefix, deviceId, secrets)
+	if err != nil {
+		return err
+	}
+	feedback.Printf("Template applied successfully to device %s", deviceId)
+
+	if applyOta {
+		// Now, start OTA with binary available in the template
+		done, err := runOTAForTemplate(ctx, cred, templateId, deviceId, apiclient)
+		if err != nil {
+			return err
+		}
+		if done {
+			feedback.Printf("OTA started successfully on device %s", deviceId)
+		}
+	}
+
+	return nil
+}
+
+func resolveDeviceNetworkConfigurations(ctx context.Context, cl *iot.Client, deviceId string, networkCredentials map[string]string) (map[string]string, error) {
+	device, err := cl.DeviceShow(ctx, deviceId)
+	if err != nil {
+		return nil, err
+	}
+	if device.Type == "" || device.ConnectionType == nil {
+		logrus.Warnf("Device %s has no type or connection-type - type: %s", deviceId, device.Type)
+		return nil, nil // cannot take a decision on this device, try to proceed
+	}
+	logrus.Infof("Device %s - type: %s - connection-type: %s", deviceId, device.Type, *device.ConnectionType)
+
+	// Check if device is linked to a thing. In such case, block the operation.
+	if device.Thing != nil && device.Thing.Id != "" {
+		return nil, fmt.Errorf("device %s is already linked to a thing (thing_id: %s)", deviceId, device.Thing.Id)
+	}
+
+	credentials, err := cl.DeviceNetworkCredentials(ctx, device.Type, *device.ConnectionType)
+	if err != nil {
+		return nil, err
+	}
+
+	// Check if the provided network credentials are valid. Verify if all the required credentials are present.
+	discoveredCredentials := make(map[string]iotclient.ArduinoCredentialsv1)
+	for _, credential := range credentials {
+		discoveredCredentials[credential.GetSecretName()] = credential
+		if credential.Required {
+			if _, ok := networkCredentials[credential.GetSecretName()]; !ok {
+				return nil, fmt.Errorf("missing mandatory network credential: %s. Available: %s", credential.GetSecretName(), humanReadableCredentials(credentials))
+			}
+		}
+	}
+	// Remove any property that is not supported
+	for key := range networkCredentials {
+		if _, ok := discoveredCredentials[key]; !ok {
+			delete(networkCredentials, key)
+		}
+	}
+
+	return networkCredentials, nil
+}
+
+func humanReadableCredentials(cred []iotclient.ArduinoCredentialsv1) string {
+	var buf strings.Builder
+	for _, c := range cred {
+		if c.Required {
+			buf.WriteString(fmt.Sprintf("  - %s (required)", c.GetSecretName()))
+		} else {
+			buf.WriteString(fmt.Sprintf("  - %s", c.GetSecretName()))
+		}
+	}
+	return buf.String()
+}
+
+func runOTAForTemplate(ctx context.Context, cred *config.Credentials, templateId, deviceId string, apiclient *storageapi.StorageApiClient) (bool, error) {
+	otaTempDir, err := os.MkdirTemp("cli-template-ota", "")
+	if err != nil {
+		return false, fmt.Errorf("%s: %w", "cannot create temporary folder", err)
+	}
+	defer func() {
+		err := os.RemoveAll(otaTempDir)
+		if err != nil {
+			logrus.Warnf("Failed to remove temp directory: %v", err)
+		}
+	}()
+
+	filecreaed, err := apiclient.ExportCustomTemplate(templateId, otaTempDir)
+	if err != nil {
+		return false, err
+	}
+
+	// open the file and be ready to send it to the device
+	otaFile, err := extractBinary(filecreaed, otaTempDir)
+	if err != nil {
+		return false, err
+	}
+	if otaFile == "" {
+		feedback.Printf("No binary OTA file found in the template")
+		return false, nil
+	}
+
+	// Upload the OTA file to the device
+	err = ota.Upload(ctx, &ota.UploadParams{
+		DeviceID: deviceId,
+		File:     otaFile,
+	}, cred)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
+func extractBinary(filepath *string, tempDir string) (string, error) {
+	zipFile, err := os.Open(*filepath)
+	if err != nil {
+		return "", err
+	}
+	defer zipFile.Close()
+
+	fileInfo, err := zipFile.Stat()
+	if err != nil {
+		return "", fmt.Errorf("failed to get file info: %w", err)
+	}
+
+	zipReader, err := zip.NewReader(zipFile, fileInfo.Size())
+	if err != nil {
+		return "", fmt.Errorf("failed to open archive reader: %w", err)
+	}
+
+	var binaryFile *zip.File
+	for _, file := range zipReader.File {
+		if strings.Contains(file.Name, "resources/binaries") {
+			logrus.Debugf("binary OTA file from template: %s", file.Name)
+			binaryFile = file
+			break
+		}
+	}
+
+	if binaryFile != nil {
+		// Extract content to a temporary file
+		tempFile, err := os.CreateTemp(tempDir, "tmpl_bin_*.bin")
+		if err != nil {
+			return "", fmt.Errorf("failed to create temporary file: %w", err)
+		}
+		defer tempFile.Close()
+		inputF, err := binaryFile.Open()
+		if err != nil {
+			return "", fmt.Errorf("failed to open file in archive: %w", err)
+		}
+		defer inputF.Close()
+
+		_, err = io.Copy(tempFile, inputF)
+		if err != nil {
+			return "", fmt.Errorf("failed to copy file content: %w", err)
+		}
+
+		return tempFile.Name(), nil
+	}
+
+	return "", errNoBinaryFound
+}
diff --git a/command/template/apply_test.go b/command/template/apply_test.go
new file mode 100644
index 00000000..524ba79c
--- /dev/null
+++ b/command/template/apply_test.go
@@ -0,0 +1,15 @@
+package template
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTemplateLIsting(t *testing.T) {
+	tmpDir := t.TempDir()
+	path := ".testdata/template_ok-rp-with-binaries.tino"
+	file, err := extractBinary(&path, tmpDir)
+	assert.Nil(t, err)
+	assert.NotNil(t, file)
+}
diff --git a/command/template/export.go b/command/template/export.go
new file mode 100644
index 00000000..b6fd6f4d
--- /dev/null
+++ b/command/template/export.go
@@ -0,0 +1,46 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"fmt"
+
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/config"
+	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
+)
+
+func ExportCustomTemplate(cred *config.Credentials, templateId, path string) error {
+
+	apiclient := storageapi.NewClient(cred)
+
+	feedback.Printf("Exporting template %s", templateId)
+
+	filecreaed, err := apiclient.ExportCustomTemplate(templateId, path)
+	if err != nil {
+		return err
+	}
+
+	outf := ""
+	if filecreaed != nil {
+		outf = *filecreaed
+	}
+	feedback.Printf(fmt.Sprintf("Template %s exported to file: %s", templateId, outf))
+
+	return nil
+}
diff --git a/command/template/import.go b/command/template/import.go
new file mode 100644
index 00000000..80b6b2bf
--- /dev/null
+++ b/command/template/import.go
@@ -0,0 +1,40 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/config"
+	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
+)
+
+func ImportCustomTemplate(cred *config.Credentials, filePath string) error {
+
+	apiclient := storageapi.NewClient(cred)
+
+	feedback.Printf("Importing template %s", filePath)
+
+	templateImported, err := apiclient.ImportCustomTemplate(filePath)
+	if err != nil {
+		return err
+	}
+
+	feedback.Printf("Template '%s' (%s) imported successfully", templateImported.Name, templateImported.TemplateId)
+
+	return nil
+}
diff --git a/command/template/list.go b/command/template/list.go
new file mode 100644
index 00000000..3d6920df
--- /dev/null
+++ b/command/template/list.go
@@ -0,0 +1,42 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package template
+
+import (
+	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/config"
+	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
+)
+
+func ListCustomTemplates(cred *config.Credentials) error {
+
+	apiclient := storageapi.NewClient(cred)
+
+	templates, err := apiclient.ListCustomTemplates()
+	if err != nil {
+		return err
+	}
+
+	if templates == nil {
+		feedback.Print("No templates found")
+	} else {
+		feedback.PrintResult(templates)
+	}
+
+	return nil
+}
diff --git a/go.mod b/go.mod
index f4e84138..75b05308 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/arduino/arduino-cli v0.0.0-20221116144942-76251df9241a
 	github.com/arduino/go-paths-helper v1.7.0
 	github.com/arduino/go-win32-utils v1.0.0
-	github.com/arduino/iot-client-go/v2 v2.0.2
+	github.com/arduino/iot-client-go/v2 v2.0.3
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/google/go-cmp v0.6.0
 	github.com/howeyc/crc16 v0.0.0-20171223171357-2b2a61e366a6
diff --git a/go.sum b/go.sum
index 64155a38..c375bb31 100644
--- a/go.sum
+++ b/go.sum
@@ -76,6 +76,8 @@ github.com/arduino/go-win32-utils v1.0.0 h1:/cXB86sOJxOsCHP7sQmXGLkdValwJt56mIwO
 github.com/arduino/go-win32-utils v1.0.0/go.mod h1:0jqM7doGEAs6DaJCxxhLBUDS5OawrqF48HqXkcEie/Q=
 github.com/arduino/iot-client-go/v2 v2.0.2 h1:5Zh8ZtZ+O8WBlvXvbA8Sla18Fvaw+QdQsz0X7DK4XLU=
 github.com/arduino/iot-client-go/v2 v2.0.2/go.mod h1:kwX4B2AVEWl5ug94QbQ087xbvLFa9Co//jhbM/Z2eSQ=
+github.com/arduino/iot-client-go/v2 v2.0.3 h1:/mYkInEgr2a4s3bSFhjCzynBApPcYlpDwsuTQiyMbag=
+github.com/arduino/iot-client-go/v2 v2.0.3/go.mod h1:kwX4B2AVEWl5ug94QbQ087xbvLFa9Co//jhbM/Z2eSQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
diff --git a/internal/iot/client.go b/internal/iot/client.go
index 4025c4c5..ece0d015 100644
--- a/internal/iot/client.go
+++ b/internal/iot/client.go
@@ -195,6 +195,23 @@ func (cl *Client) DeviceShow(ctx context.Context, id string) (*iotclient.Arduino
 	return dev, nil
 }
 
+// DeviceNetworkCredentials allows to retrieve a specific device network credentials configuration options
+func (cl *Client) DeviceNetworkCredentials(ctx context.Context, deviceType, connection string) ([]iotclient.ArduinoCredentialsv1, error) {
+	ctx, err := ctxWithToken(ctx, cl.token)
+	if err != nil {
+		return nil, err
+	}
+
+	req := cl.api.NetworkCredentialsV1Api.NetworkCredentialsV1Show(ctx, deviceType)
+	req = req.Connection(connection)
+	dev, _, err := cl.api.NetworkCredentialsV1Api.NetworkCredentialsV1ShowExecute(req)
+	if err != nil {
+		err = fmt.Errorf("retrieving device network configuration, %w", errorDetail(err))
+		return nil, err
+	}
+	return dev, nil
+}
+
 // DeviceOTA performs an OTA upload request to Arduino IoT Cloud, passing
 // the ID of the device to be updated and the actual file containing the OTA firmware.
 func (cl *Client) DeviceOTA(ctx context.Context, id string, file *os.File, expireMins int) error {
@@ -516,6 +533,33 @@ func (cl *Client) DashboardDelete(ctx context.Context, id string) error {
 	return nil
 }
 
+// TemplateApply apply a given template, creating associated resources like things and dashboards.
+func (cl *Client) TemplateApply(ctx context.Context, id, thingId, prefix, deviceId string, credentials map[string]string) (*iotclient.ArduinoTemplate, error) {
+	ctx, err := ctxWithToken(ctx, cl.token)
+	if err != nil {
+		return nil, err
+	}
+
+	thingOption := make(map[string]any)
+	thingOption["device_id"] = deviceId
+	thingOption["secrets"] = credentials
+
+	req := cl.api.TemplatesApi.TemplatesApply(ctx)
+	req = req.Template(iotclient.Template{
+		PrefixName:       toStringPointer(prefix),
+		CustomTemplateId: toStringPointer(id),
+		ThingsOptions: map[string]interface{}{
+			thingId: thingOption,
+		},
+	})
+	dev, _, err := cl.api.TemplatesApi.TemplatesApplyExecute(req)
+	if err != nil {
+		err = fmt.Errorf("retrieving device, %w", errorDetail(err))
+		return nil, err
+	}
+	return dev, nil
+}
+
 func (cl *Client) setup(client, secret, organization string) error {
 	baseURL := GetArduinoAPIBaseURL()
 
diff --git a/internal/storage-api/client.go b/internal/storage-api/client.go
new file mode 100644
index 00000000..fb00a792
--- /dev/null
+++ b/internal/storage-api/client.go
@@ -0,0 +1,394 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package storageapi
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/arduino/arduino-cloud-cli/config"
+	"github.com/arduino/arduino-cloud-cli/internal/iot"
+	"github.com/gofrs/uuid"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/oauth2"
+)
+
+const TemplateFileExtension = ".tino"
+
+type StorageApiClient struct {
+	client       *http.Client
+	host         string
+	src          oauth2.TokenSource
+	organization string
+}
+
+func getArduinoAPIBaseURL() string {
+	baseURL := "https://api-media.arduino.cc"
+	if url := os.Getenv("IOT_API_MEDIA_URL"); url != "" {
+		baseURL = url
+	}
+	return baseURL
+}
+
+func NewClient(credentials *config.Credentials) *StorageApiClient {
+	host := getArduinoAPIBaseURL()
+	iothost := iot.GetArduinoAPIBaseURL()
+	tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, iothost)
+	return &StorageApiClient{
+		client:       &http.Client{},
+		src:          tokenSource,
+		host:         host,
+		organization: credentials.Organization,
+	}
+}
+
+func (c *StorageApiClient) performMultipartRequest(endpoint, method, token, filename, multipartFieldName string) (*http.Response, error) {
+	var buffer bytes.Buffer
+	writer := multipart.NewWriter(&buffer)
+
+	// Open the file
+	file, err := os.Open(filename)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	// Create a form file
+	formFile, err := writer.CreateFormFile(multipartFieldName, file.Name())
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy the file data to the form file
+	_, err = io.Copy(formFile, file)
+	if err != nil {
+		return nil, err
+	}
+	// Close the multipart writer
+	err = writer.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest(method, endpoint, &buffer)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", "Bearer "+token)
+	if c.organization != "" {
+		req.Header.Add("X-Organization", c.organization)
+	}
+	req.Header.Set("Content-Type", writer.FormDataContentType())
+	res, err := c.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (c *StorageApiClient) performBinaryGetRequest(endpoint, token string) (*http.Response, error) {
+	req, err := http.NewRequest("GET", endpoint, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", "Bearer "+token)
+	if c.organization != "" {
+		req.Header.Add("X-Organization", c.organization)
+	}
+	res, err := c.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (c *StorageApiClient) performRequest(method, endpoint, token string, body io.Reader) (*http.Response, error) {
+	req, err := http.NewRequest(method, endpoint, body)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", "Bearer "+token)
+	req.Header.Set("Content-Type", "application/json")
+	if c.organization != "" {
+		req.Header.Add("X-Organization", c.organization)
+	}
+	res, err := c.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (c *StorageApiClient) ImportCustomTemplate(templateFile string) (*ImportCustomTemplateResponse, error) {
+
+	if templateFile == "" {
+		return nil, fmt.Errorf("invalid template: no file provided")
+	}
+	if !strings.HasSuffix(templateFile, TemplateFileExtension) {
+		return nil, fmt.Errorf("invalid template: file must have extension %s", TemplateFileExtension)
+	}
+
+	userRequestToken, err := c.src.Token()
+	if err != nil {
+		if strings.Contains(err.Error(), "401") {
+			return nil, errors.New("wrong credentials")
+		}
+		return nil, fmt.Errorf("cannot retrieve a valid token: %w", err)
+	}
+
+	endpoint := c.host + "/storage/template/archive/v1/"
+	res, err := c.performMultipartRequest(endpoint, "POST", userRequestToken.AccessToken, templateFile, "template")
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+	bodyb, err := io.ReadAll(res.Body)
+
+	if res.StatusCode == 200 {
+		var importTemplResponse ImportCustomTemplateResponse
+		if err == nil && bodyb != nil {
+			err = json.Unmarshal(bodyb, &importTemplResponse)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		return &importTemplResponse, nil
+	} else if res.StatusCode == 400 {
+		return nil, fmt.Errorf("bad request: %s", string(bodyb))
+	} else if res.StatusCode == 409 {
+		return nil, fmt.Errorf("template already exists: %s", string(bodyb))
+	} else if res.StatusCode == 401 {
+		return nil, errors.New("unauthorized request")
+	} else if res.StatusCode == 403 {
+		return nil, errors.New("forbidden request")
+	} else if res.StatusCode == 500 {
+		return nil, errors.New("internal server error")
+	}
+
+	return nil, err
+}
+
+func (c *StorageApiClient) ExportCustomTemplate(templateId, path string) (*string, error) {
+
+	if templateId == "" {
+		return nil, fmt.Errorf("invalid template id: no id provided")
+	}
+
+	userRequestToken, err := c.src.Token()
+	if err != nil {
+		if strings.Contains(err.Error(), "401") {
+			return nil, errors.New("wrong credentials")
+		}
+		return nil, fmt.Errorf("cannot retrieve a valid token: %w", err)
+	}
+
+	endpoint := c.host + "/storage/template/archive/v1/" + templateId
+	res, err := c.performBinaryGetRequest(endpoint, userRequestToken.AccessToken)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	logrus.Debugf("Export API call status: %d", res.StatusCode)
+
+	if res.StatusCode == 200 || res.StatusCode == 201 {
+		outfile, fileExportPath, err := createNewLocalFile(templateId, path, res)
+		if err != nil {
+			return nil, err
+		}
+		defer outfile.Close()
+		_, err = io.Copy(outfile, res.Body)
+		if err != nil {
+			return nil, err
+		}
+		return &fileExportPath, nil
+	} else if res.StatusCode == 400 {
+		bodyb, _ := io.ReadAll(res.Body)
+		return nil, fmt.Errorf("bad request: %s", string(bodyb))
+	} else if res.StatusCode == 401 {
+		return nil, errors.New("unauthorized request")
+	} else if res.StatusCode == 403 {
+		return nil, errors.New("forbidden request")
+	} else if res.StatusCode == 500 {
+		return nil, errors.New("internal server error")
+	}
+
+	return nil, err
+}
+
+func createNewLocalFile(templateId, path string, res *http.Response) (*os.File, string, error) {
+	fileExportPath, err := composeNewLocalFileName(templateId, path, res)
+	if err != nil {
+		return nil, "", err
+	}
+	outfile, err := os.Create(fileExportPath)
+	if err != nil {
+		return nil, "", err
+	}
+	return outfile, fileExportPath, nil
+}
+
+func composeNewLocalFileName(templateId, path string, res *http.Response) (string, error) {
+	fileExportPath := extractFileNameFromHeader(res)
+	if path != "" {
+		fileExportPath = filepath.Join(path, fileExportPath)
+	}
+	originalFileExportName := fileExportPath
+	if fileExportPath == "" {
+		fileExportPath = templateId + TemplateFileExtension
+	}
+
+	i := 1
+	for ; i < 51; i++ {
+		fileE, err := os.Stat(fileExportPath)
+		if err != nil {
+			if os.IsNotExist(err) {
+				break
+			}
+		}
+		if fileE != nil {
+			newbase := strings.TrimSuffix(originalFileExportName, TemplateFileExtension)
+			newbase = newbase + "_" + strconv.Itoa(i) + TemplateFileExtension
+			fileExportPath = newbase
+		}
+	}
+	if i >= 50 {
+		return "", errors.New("cannot create a new file name. Max number of copy reached")
+	}
+
+	return fileExportPath, nil
+}
+
+func extractFileNameFromHeader(res *http.Response) string {
+	content := res.Header.Get("Content-Disposition")
+	if strings.HasPrefix(content, "attachment;") {
+		content = strings.TrimPrefix(content, "attachment;")
+		content = strings.TrimSpace(content)
+		content = strings.TrimPrefix(content, "filename=")
+		return strings.Trim(content, "\"")
+	}
+	return ""
+}
+
+type listPostRequest struct {
+	Sort string `json:"sort"`
+}
+
+func (c *StorageApiClient) ListCustomTemplates() (*TemplatesListResponse, error) {
+	userRequestToken, err := c.src.Token()
+	if err != nil {
+		if strings.Contains(err.Error(), "401") {
+			return nil, errors.New("wrong credentials")
+		}
+		return nil, fmt.Errorf("cannot retrieve a valid token: %w", err)
+	}
+
+	request := listPostRequest{
+		Sort: "asc",
+	}
+	jsonRequest, err := json.Marshal(request)
+	if err != nil {
+		return nil, err
+	}
+
+	endpoint := c.host + "/storage/template/v1/list"
+	res, err := c.performRequest("POST", endpoint, userRequestToken.AccessToken, bytes.NewReader(jsonRequest))
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	logrus.Debugf("List templates API call status: %d", res.StatusCode)
+
+	if res.StatusCode == 200 || res.StatusCode == 201 {
+		var templatesListResponse TemplatesListResponse
+		respBytes, err := io.ReadAll(res.Body)
+		if err != nil {
+			return nil, err
+		}
+		err = json.Unmarshal(respBytes, &templatesListResponse)
+		if err != nil {
+			return nil, err
+		}
+		return &templatesListResponse, nil
+	} else if res.StatusCode == 400 {
+		bodyb, _ := io.ReadAll(res.Body)
+		return nil, fmt.Errorf("bad request: %s", string(bodyb))
+	} else if res.StatusCode == 401 {
+		return nil, errors.New("unauthorized request")
+	} else if res.StatusCode == 403 {
+		return nil, errors.New("forbidden request")
+	} else if res.StatusCode == 500 {
+		return nil, errors.New("internal server error")
+	}
+
+	return nil, err
+}
+
+func (c *StorageApiClient) GetCustomTemplate(templateID uuid.UUID) (*DescribeTemplateResponse, error) {
+	userRequestToken, err := c.src.Token()
+	if err != nil {
+		if strings.Contains(err.Error(), "401") {
+			return nil, errors.New("wrong credentials")
+		}
+		return nil, fmt.Errorf("cannot retrieve a valid token: %w", err)
+	}
+
+	endpoint := c.host + fmt.Sprintf("/storage/template/v1/%s", templateID.String())
+	res, err := c.performRequest("GET", endpoint, userRequestToken.AccessToken, nil)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	logrus.Debugf("Get template %s API call status: %d", templateID.String(), res.StatusCode)
+
+	if res.StatusCode == 200 || res.StatusCode == 201 {
+		var getTemplateResponse DescribeTemplateResponse
+		respBytes, err := io.ReadAll(res.Body)
+		if err != nil {
+			return nil, err
+		}
+		err = json.Unmarshal(respBytes, &getTemplateResponse)
+		if err != nil {
+			return nil, err
+		}
+		return &getTemplateResponse, nil
+	} else if res.StatusCode == 400 {
+		bodyb, _ := io.ReadAll(res.Body)
+		return nil, fmt.Errorf("bad request: %s", string(bodyb))
+	} else if res.StatusCode == 401 {
+		return nil, errors.New("unauthorized request")
+	} else if res.StatusCode == 403 {
+		return nil, errors.New("forbidden request")
+	} else if res.StatusCode == 500 {
+		return nil, errors.New("internal server error")
+	}
+
+	return nil, err
+}
diff --git a/internal/storage-api/dto.go b/internal/storage-api/dto.go
new file mode 100644
index 00000000..f6182501
--- /dev/null
+++ b/internal/storage-api/dto.go
@@ -0,0 +1,344 @@
+// This file is part of arduino-cloud-cli.
+//
+// Copyright (C) 2021 ARDUINO SA (http://www.arduino.cc/)
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package storageapi
+
+import (
+	"time"
+
+	"github.com/arduino/arduino-cli/table"
+	"github.com/gofrs/uuid"
+)
+
+type (
+	ImportCustomTemplateResponse struct {
+		Message    string `json:"message"`
+		Name       string `json:"name"`
+		TemplateId string `json:"template_id"`
+	}
+	TemplateEntry struct {
+		TemplateId string `json:"template_id"`
+		Name       string `json:"name"`
+		CreatedAt  string `json:"created_at"`
+		UpdatedAt  string `json:"updated_at"`
+	}
+	TemplatesListResponse struct {
+		Templates []TemplateEntry `json:"templates"`
+	}
+)
+
+func (r *TemplatesListResponse) Data() interface{} {
+	return r.Templates
+}
+
+func (r *TemplatesListResponse) String() string {
+	if len(r.Templates) == 0 {
+		return ""
+	}
+	t := table.New()
+	t.SetHeader("Template ID", "Name", "Created At", "Updated At")
+
+	// Now print the table
+	for _, tem := range r.Templates {
+		line := []any{tem.TemplateId, tem.Name, formatHumanReadableTs(tem.CreatedAt), formatHumanReadableTs(tem.UpdatedAt)}
+		t.AddRow(line...)
+	}
+
+	return t.Render()
+}
+
+func formatHumanReadableTs(ts string) string {
+	if ts == "" {
+		return ""
+	}
+	parsed, err := time.Parse(time.RFC3339Nano, ts)
+	if err != nil {
+		return ts
+	}
+	return parsed.Format(time.RFC3339)
+}
+
+type DescribeTemplateResponse struct {
+	// CompatibleBoards List of devices compatible with the template
+	CompatibleBoards []string `json:"compatible_boards,omitempty"`
+
+	// CreatedAt Template creation date/time
+	CreatedAt *time.Time `json:"created_at,omitempty"`
+
+	// DashboardTemplates List of dashboard templates
+	DashboardTemplates []DashboardTemplate `json:"dashboard_templates,omitempty"`
+
+	// DeletedAt Template soft deletion date/time
+	DeletedAt *time.Time `json:"deleted_at,omitempty"`
+
+	// Description Description of the template
+	Description string `json:"description"`
+
+	// ImageLinks Optional list of images to be included in the template
+	ImageLinks []string `json:"image_links,omitempty"`
+
+	// Name Template name
+	Name string `json:"name" validate:"required,max=128"`
+
+	// OrganizationId Organization identifier
+	OrganizationId *uuid.UUID `json:"organization_id,omitempty"`
+	TemplateId     uuid.UUID  `json:"template_id" validate:"required,uuid"`
+
+	// ThingTemplates List of thing templates
+	ThingTemplates []ThingTemplate `json:"thing_templates,omitempty"`
+
+	// TriggerTemplates List of trigger templates
+	TriggerTemplates []TriggerTemplate `json:"trigger_templates,omitempty"`
+
+	// UpdatedAt Template update date/time
+	UpdatedAt *time.Time `json:"updated_at,omitempty"`
+
+	// UserId User identifier
+	UserId *uuid.UUID `json:"user_id,omitempty" validate:"uuid"`
+}
+
+type ThingTemplate struct {
+	// Id Template ID
+	Id string `json:"id"`
+
+	// Name Name
+	Name string `json:"name"`
+
+	// Tags Tags
+	Tags []Tag `json:"tags,omitempty"`
+
+	// Variables Thing variables
+	Variables []Variable `json:"variables,omitempty"`
+
+	// WebhookUri Webhook URI
+	WebhookUri *string `json:"webhook_uri,omitempty"`
+}
+
+type Variable struct {
+	// Id Id
+	Id *string `json:"id,omitempty"`
+
+	// Name Name
+	Name *string `json:"name,omitempty"`
+
+	// Permission Permission
+	Permission *string `json:"permission,omitempty"`
+
+	// Type Type
+	Type *string `json:"type,omitempty"`
+
+	// UpdateParameter Update parameter
+	UpdateParameter *float32 `json:"update_parameter,omitempty"`
+
+	// UpdateStrategy Update strategy
+	UpdateStrategy *string `json:"update_strategy,omitempty"`
+
+	// VariableName Variable name
+	VariableName *string `json:"variable_name,omitempty"`
+}
+
+type Tag struct {
+	// Key Key
+	Key string `json:"key"`
+
+	// Value Value
+	Value string `json:"value"`
+}
+
+type DashboardTemplate struct {
+	// Id Template ID
+	Id string `json:"id"`
+
+	// Name Name
+	Name string `json:"name"`
+
+	// Widgets Widgets
+	Widgets *[]Widget `json:"widgets,omitempty"`
+}
+
+type Widget struct {
+	// Height height
+	Height *float32 `json:"height,omitempty"`
+
+	// HeightMobile height mobile
+	HeightMobile *float32 `json:"height_mobile,omitempty"`
+
+	// Name Name
+	Name string `json:"name"`
+
+	// Options Widget options
+	Options map[string]interface{} `json:"options,omitempty"`
+
+	// Type Widget type
+	Type string `json:"type"`
+
+	// Variables Widget variables
+	Variables []WidgetVariable `json:"variables,omitempty"`
+
+	// Width Width
+	Width *float32 `json:"width,omitempty"`
+
+	// WidthMobile Width mobile
+	WidthMobile *float32 `json:"width_mobile,omitempty"`
+
+	// X x
+	X *float32 `json:"x,omitempty"`
+
+	// XMobile x mobile
+	XMobile *float32 `json:"x_mobile,omitempty"`
+
+	// Y y
+	Y *float32 `json:"y,omitempty"`
+
+	// YMobile y mobile
+	YMobile *float32 `json:"y_mobile,omitempty"`
+}
+
+type WidgetVariable struct {
+	// Name Name
+	Name string `json:"name"`
+
+	// Permission Permission
+	Permission *string `json:"permission,omitempty"`
+
+	// ThingId Thing ID
+	ThingId *string `json:"thing_id,omitempty"`
+
+	// Type Widget type
+	Type string `json:"type"`
+
+	// VariableId Variable ID
+	VariableId *string `json:"variable_id,omitempty"`
+}
+
+type TriggerTemplate struct {
+	// Actions Actions
+	Actions []TriggerAction `json:"actions,omitempty"`
+
+	// Active Active
+	Active *bool `json:"active,omitempty"`
+
+	// Description Description
+	Description *string `json:"description,omitempty"`
+
+	// Id Template ID
+	Id             string          `json:"id"`
+	LinkedDevice   *LinkedDevice   `json:"linked_device,omitempty"`
+	LinkedProperty *LinkedProperty `json:"linked_property,omitempty"`
+
+	// Name Name
+	Name string `json:"name"`
+}
+
+type TriggerAction struct {
+	// Description Description
+	Description *string      `json:"description,omitempty"`
+	Email       *EmailAction `json:"email,omitempty"`
+
+	// Kind Kind
+	Kind *string `json:"kind,omitempty"`
+
+	// Name Name
+	Name             string                  `json:"name"`
+	PushNotification *PushNotificationAction `json:"push_notification,omitempty"`
+}
+
+type LinkedDevice struct {
+	// DeviceConnectedDelay Device connected delay
+	DeviceConnectedDelay *float32 `json:"device_connected_delay,omitempty"`
+
+	// DeviceDisconnectedDelay Device disconnected delay
+	DeviceDisconnectedDelay *float32 `json:"device_disconnected_delay,omitempty"`
+
+	// ThingId Thing ID
+	ThingId string `json:"thing_id"`
+}
+
+// LinkedProperty defines model for LinkedProperty.
+type LinkedProperty struct {
+	// PropertyId Property ID
+	PropertyId string `json:"property_id"`
+
+	// ThingId Thing ID
+	ThingId string `json:"thing_id"`
+}
+
+// NotificationBody defines model for NotificationBody.
+type NotificationBody struct {
+	// Expression Expression
+	Expression string `json:"expression"`
+
+	// Variables Variables
+	Variables []BodyVariable `json:"variables"`
+}
+
+// PushNotificationAction defines model for PushNotificationAction.
+type PushNotificationAction struct {
+	Body     NotificationBody `json:"body"`
+	Delivery Delivery         `json:"delivery"`
+	Title    Subject          `json:"title"`
+}
+
+// Subject defines model for Subject.
+type Subject struct {
+	// Expression expression
+	Expression string `json:"expression"`
+}
+
+type BodyVariable struct {
+	// Attribute attribute
+	Attribute string `json:"attribute"`
+
+	// Entity entity
+	Entity string `json:"entity"`
+
+	// Placeholder placeholder
+	Placeholder string `json:"placeholder"`
+
+	// PropertyId property_id
+	PropertyId *string `json:"property_id,omitempty"`
+
+	// ThingId thing_id
+	ThingId *string `json:"thing_id,omitempty"`
+}
+
+type Delivery struct {
+	// Bcc BCC
+	Bcc *[]DeliveryTo `json:"bcc,omitempty"`
+
+	// Cc CC
+	Cc *[]DeliveryTo `json:"cc,omitempty"`
+
+	// To To
+	To []DeliveryTo `json:"to"`
+}
+
+// DeliveryTo defines model for DeliveryTo.
+type DeliveryTo struct {
+	// Email email
+	Email *string `json:"email,omitempty"`
+
+	// Username username
+	Username *string `json:"username,omitempty"`
+}
+
+// EmailAction defines model for EmailAction.
+type EmailAction struct {
+	Body     NotificationBody `json:"body"`
+	Delivery Delivery         `json:"delivery"`
+	Subject  Subject          `json:"subject"`
+}