diff --git a/pkg/api/cache.go b/pkg/api/cache.go
index 18988d28e2..554e3543e0 100644
--- a/pkg/api/cache.go
+++ b/pkg/api/cache.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"sync"
 
-	"moul.io/anonuuid"
 	"github.com/renstrom/fuzzysearch/fuzzy"
+	"moul.io/anonuuid"
 )
 
 const (
diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go
index 7a6b53a904..8e5902610e 100644
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/dustin/go-humanize"
-	"moul.io/anonuuid"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
 	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
+	"moul.io/anonuuid"
 )
 
 // ScalewayResolvedIdentifier represents a list of matching identifier for a specifier pattern
diff --git a/pkg/api/helpers_test.go b/pkg/api/helpers_test.go
index 28225ec356..e08e1e92e5 100644
--- a/pkg/api/helpers_test.go
+++ b/pkg/api/helpers_test.go
@@ -1,8 +1,9 @@
 package api
 
 import (
-	. "github.com/smartystreets/goconvey/convey"
 	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 type VolumesFromSizeCase struct {
diff --git a/pkg/commands/create_test.go b/pkg/commands/create_test.go
index 991826b037..7f6547c52d 100644
--- a/pkg/commands/create_test.go
+++ b/pkg/commands/create_test.go
@@ -24,7 +24,7 @@ func ExampleRunCreate_complex() {
 		Bootscript: "rescue",
 		Tags:       []string{"tag1", "tag2"},
 		Volumes:    []string{},
-		Image:      "ubuntu-wily",
+		Image:      "ubuntu-bionic",
 		TmpSSHKey:  false,
 	}
 	RunCreate(ctx, args)
@@ -59,11 +59,11 @@ func TestRunCreate_realAPI(t *testing.T) {
 			})
 		*/
 
-		Convey("--name=unittest-create-standard wily", func() {
+		Convey("--name=unittest-create-standard ubuntu-bionic", func() {
 			args := CreateArgs{
 				Name:           "unittest-create-standard",
-				Image:          "ubuntu-mini-xenial-25g",
-				CommercialType: "X64-2GB",
+				Image:          "ubuntu-bionic",
+				CommercialType: "DEV1-S",
 				IP:             "dynamic",
 				BootType:       "bootscript",
 			}
diff --git a/pkg/commands/history_test.go b/pkg/commands/history_test.go
index d64aed5875..d0d1e9daaf 100644
--- a/pkg/commands/history_test.go
+++ b/pkg/commands/history_test.go
@@ -34,11 +34,11 @@ func TestRunHistory_realAPI(t *testing.T) {
 		t.Skip()
 	}
 	Convey("Testing RunHistory() on real API", t, func() {
-		Convey("ubuntu-wily", func() {
+		Convey("ubuntu-bionic", func() {
 			args := HistoryArgs{
 				NoTrunc: false,
 				Quiet:   false,
-				Image:   "ubuntu-wily",
+				Image:   "ubuntu-bionic",
 				Arch:    "arm",
 			}
 
diff --git a/pkg/commands/inspect_test.go b/pkg/commands/inspect_test.go
index 39f141e997..182b53f0f3 100644
--- a/pkg/commands/inspect_test.go
+++ b/pkg/commands/inspect_test.go
@@ -36,11 +36,11 @@ func TestRunInspect_realAPI(t *testing.T) {
 		t.Skip()
 	}
 	Convey("Testing RunInspect() on real API", t, func() {
-		Convey("image:ubuntu-wily", func() {
+		Convey("image:ubuntu-bionic", func() {
 			args := InspectArgs{
 				Format:      "",
 				Browser:     false,
-				Identifiers: []string{"image:ubuntu-wily"},
+				Identifiers: []string{"image:ubuntu-bionic"},
 				Arch:        "arm",
 			}
 
@@ -54,13 +54,13 @@ func TestRunInspect_realAPI(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(len(results), ShouldEqual, 1)
 			So(strings.ToLower(results[0].Name), ShouldContainSubstring, "ubuntu")
-			So(strings.ToLower(results[0].Name), ShouldContainSubstring, "wily")
+			So(strings.ToLower(results[0].Name), ShouldContainSubstring, "bionic")
 
-			Convey("-f \"{{.Identifier}}\" image:ubuntu-wily", func() {
+			Convey("-f \"{{.Identifier}}\" image:ubuntu-bionic", func() {
 				args := InspectArgs{
 					Format:      "{{.Identifier}}",
 					Browser:     false,
-					Identifiers: []string{"image:ubuntu-wily"},
+					Identifiers: []string{"image:ubuntu-bionic"},
 					Arch:        "arm",
 				}
 
diff --git a/pkg/commands/s3.go b/pkg/commands/s3.go
index a52a7d59bb..336b869987 100644
--- a/pkg/commands/s3.go
+++ b/pkg/commands/s3.go
@@ -7,12 +7,13 @@ package commands
 import (
 	"encoding/json"
 	"fmt"
-	minio "github.com/minio/mc/cmd"
-	"github.com/scaleway/scaleway-cli/pkg/config"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
+
+	minio "github.com/minio/mc/cmd"
+	"github.com/scaleway/scaleway-cli/pkg/config"
 )
 
 type clientHost struct {
diff --git a/pkg/commands/test.go b/pkg/commands/test.go
index 9af7fe5dfb..323e06b77c 100644
--- a/pkg/commands/test.go
+++ b/pkg/commands/test.go
@@ -6,11 +6,11 @@ import (
 	"os"
 	"strings"
 
-	"moul.io/anonuuid"
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/config"
 	"github.com/scaleway/scaleway-cli/pkg/scwversion"
 	"github.com/sirupsen/logrus"
+	"moul.io/anonuuid"
 )
 
 func shouldBeAnUUID(actual interface{}, expected ...interface{}) string {