diff --git a/internal/cloudapi/v2/imagerequest.go b/internal/cloudapi/v2/imagerequest.go
index fdfaac346..d67c7583e 100644
--- a/internal/cloudapi/v2/imagerequest.go
+++ b/internal/cloudapi/v2/imagerequest.go
@@ -255,34 +255,34 @@ func getDefaultTarget(imageType ImageTypes) (UploadTypes, error) {
 	switch imageType {
 	case ImageTypesAws:
 		fallthrough
-	case ImageTypesAwsRhui:
-		fallthrough
 	case ImageTypesAwsHaRhui:
 		fallthrough
+	case ImageTypesAwsRhui:
+		fallthrough
 	case ImageTypesAwsSapRhui:
 		return UploadTypesAws, nil
 
+	case ImageTypesEdgeCommit:
+		fallthrough
+	case ImageTypesEdgeInstaller:
+		fallthrough
 	case ImageTypesGuestImage:
 		fallthrough
+	case ImageTypesImageInstaller:
+		fallthrough
+	case ImageTypesIotCommit:
+		fallthrough
+	case ImageTypesIotInstaller:
+		fallthrough
+	case ImageTypesIotRawImage:
+		fallthrough
+	case ImageTypesLiveInstaller:
+		fallthrough
 	case ImageTypesVsphere:
 		fallthrough
 	case ImageTypesVsphereOva:
 		fallthrough
 	case ImageTypesWsl:
-		fallthrough
-	case ImageTypesImageInstaller:
-		fallthrough
-	case ImageTypesEdgeInstaller:
-		fallthrough
-	case ImageTypesIotInstaller:
-		fallthrough
-	case ImageTypesLiveInstaller:
-		fallthrough
-	case ImageTypesEdgeCommit:
-		fallthrough
-	case ImageTypesIotCommit:
-		fallthrough
-	case ImageTypesIotRawImage:
 		return UploadTypesAwsS3, nil
 
 	case ImageTypesEdgeContainer:
@@ -299,10 +299,10 @@ func getDefaultTarget(imageType ImageTypes) (UploadTypes, error) {
 
 	case ImageTypesAzure:
 		fallthrough
-	case ImageTypesAzureRhui:
-		fallthrough
 	case ImageTypesAzureEap7Rhui:
 		fallthrough
+	case ImageTypesAzureRhui:
+		fallthrough
 	case ImageTypesAzureSapRhui:
 		return UploadTypesAzure, nil