diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go
index e392401e8..ebdb8dbc5 100644
--- a/internal/cloudapi/v2/openapi.v2.gen.go
+++ b/internal/cloudapi/v2/openapi.v2.gen.go
@@ -201,12 +201,15 @@ type ImageTypes string
 
 // List of ImageTypes
 const (
-	ImageTypes_aws            ImageTypes = "aws"
-	ImageTypes_azure          ImageTypes = "azure"
-	ImageTypes_edge_commit    ImageTypes = "edge-commit"
-	ImageTypes_edge_container ImageTypes = "edge-container"
-	ImageTypes_edge_installer ImageTypes = "edge-installer"
-	ImageTypes_gcp            ImageTypes = "gcp"
+	ImageTypes_aws             ImageTypes = "aws"
+	ImageTypes_azure           ImageTypes = "azure"
+	ImageTypes_edge_commit     ImageTypes = "edge-commit"
+	ImageTypes_edge_container  ImageTypes = "edge-container"
+	ImageTypes_edge_installer  ImageTypes = "edge-installer"
+	ImageTypes_gcp             ImageTypes = "gcp"
+	ImageTypes_guest_image     ImageTypes = "guest-image"
+	ImageTypes_image_installer ImageTypes = "image-installer"
+	ImageTypes_vsphere         ImageTypes = "vsphere"
 )
 
 // List defines model for List.
@@ -477,64 +480,65 @@ func RegisterHandlers(router EchoRouter, si ServerInterface) {
 var swaggerSpec = []string{
 
 	"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",
-	"kvWgY+dsdhcL5J/WNsmZ3wxnhjND5rsXsjRjFKgU3uS7l2GOU5DA7bcFqP8jECEnmSSMehPvE14AIjSC",
-	"e8/34B6nWQK16Xc4ycGbeH1vvfY9otZ8y4GvPN+jOFUjeqbviTCGFKslcpWp34XkhC70MkEeHLw/5ukM",
-	"OGJzRCSkAhGKAIcxsgSraAoCJZpebysePfcxPOtiUJM++XV6djr4nCUMRxcampGfswy4JIY/h4XG/L1A",
-	"5U08yIMlCBn0Pb/JwvdEjDncLomMb3EYstxuSbn6i9cfDEfjw1dHx73+wLvxPa0DB9ySOOYcrzRtijMR",
-	"M3lrBK5iSldBMdpGtfY9Dt9ywiFSAKxMbqw35Wo2+w1CqfhWNTWVWOYOReGU1BHhlAS98GjYe3U8fPVq",
-	"PD4eR6OZS2NPVHFDGMW3pLEF/HT4vLvs1ucO5tsUl/PE7TtVFmqSk/5DzmGHcCTFCyhNpuGJOAXlhzIG",
-	"lGsyECG9oIPOJUpzIdEMUE7Jt1yFCz1xQe6AIg6C5TwEtOAszzrX9HyOFBNEBGIpkRIiNOcs1UuULCCk",
-	"jzDimEYsRYwCmmEBEWIUYfT58/lbRMQ1XQAFjiVEnWu6iQXGwjUwlwklLMTS7mBdwPd2BC1j4KCxaCpI",
-	"xCxPIi1cITemEVJ7KSRwzf/fbIkkQwkREuEkQQUbMbmmsZSZmHS7EQtFJyUhZ4LNZSdkaRdokItumJAu",
-	"VtvTtb710x2B5Wv9UxAmJEiwBCH/gR8K57tVjG5LJgcNBShrhFxtrduLzHbc6u14fKfrW7eHapp7ccXy",
-	"ENNLS+ad5uiKhfmshHBLojao87cKUnXafwBmBOPoaDYIAzwbjILRqD8MjnvhODjsD4a9QzjqHcPAhU4C",
-	"xVQ+gkuBMJP2Q2XNZU5ohIgsvEW7KPrEuMTJPnZT2IwkdxBEhEMoGV915zmNcApU4kS0RoOYLQPJAsU6",
-	"MJAbShqHr2A+nh0G/XA4D0YR7gX4cDAIerPeYW8wPI5eRa92BrqNxtp727LAilfuiFzbImM9cO0TCRp4",
-	"KwRcEE5V0iTgXBsATpKLuTf58t37Lw5zb+L9o7tJqro2behe6MWXMAcONARv7bdAR3Ww/cEQ1HEfwNHx",
-	"LOgPomGAR+PDYDQ4PByPR6Ner9fzfG/OeIqlN/HyXCtzh2CRQ6CbjUgfQOIIS/ycgjEhOcBtyNKUSKfL",
-	"/BBjEf9YeM4sJ4lEdrrD/TIcfsULQ7uZmuoRE3cJDZM8InSBPp79cnniVfKlx+SxNEpFtLKp9WP6uzTH",
-	"Vdskw1xIlpIHXJ61j4E4rc9e+15ElAJmuWylGzyGJDhyKcpYMd9AeozluZpcwG+aTY17k3BF/I1DPptX",
-	"aFaipLtTBAvB7dGWzhYXaG1RHUrV7ipZecaEXHAQT8zIK1Fwl1zT6ty17+XCFmh7GfRnAXwfK/a9M84Z",
-	"f87NC1kETm2oSbhyuDuSEiyMYh6PZ5pDOb1B2L3NWsr3xHjEfpLq2Q7bLNS/1z4Y7bo2omanmpQb+bvT",
-	"Tzsy9lkefgW5PYfDFME9EVJFxenVyce3J5dv0VQyrqJmmGAh0BtNotPMoO2XwHLYGm3c1cJVDCbFlwzl",
-	"AtCccZsTZYxLm0HrojJCKpTkEtAZXRBq06bONb0qUyhNqFFgqFLUpk3vTj+hjDOlNh8tYxLGqrDIBUTX",
-	"tOB7MbW0TBKm2RssHaSqESaRyCAkc6Kw2crjmh6EJszxAGckuM57vWGojl39CQ6QUUbBDmFRSfwU6qdU",
-	"JpvKsq1KJaIZr+SXpUxLkiRKNaVyJavqV5VWVp+6N1KqEqvvJNLUiwysg6YAqEg9w4TlUWfB2CIBnXgK",
-	"Yzo6J+2W9Yct6apK9DXENE8kCSzyYjoKEyZASAVTTTK54DX9wZYahXkawyyX/ajUHMZMAEU4lyzFkoQ4",
-	"SVZNJUP+hG5LowZUeQSbF3rRcqNiusKrqdQt2WW+2jw71/QMh3FhJFrrIaMSE1XGFpriRRZk2SCFvIN+",
-	"0QhMricQ5jC5pggF6ECdBZPvkGKSkGh9MEEnFOlvCEcRB6FMEEvEIeMgVDza8AoVCdQQq4P+xTiy2vPR",
-	"AU5ICP+039WeH3QsZwH8joRwYtY9EYNhbUls452uAiZj7W3ZP3GWiYzJzsIuKtZUIen64anasPIXzQiF",
-	"q6GCKCVUOHUQsRQTOvlu/lcMtXuiaU4kIPMr+iHjJMV89WObeZIYhrqLok51s/tY2rVNjWxc7wAxjg4a",
-	"mNxe97hpEmHWmOCgDBVhurqmhX7r3vRFJx+TllWouq5uD/tunud7ZtvaavZ8zyq4+uMT0qxt7Ut7iLlK",
-	"u/KMfb7a0vfscXTbLPGwCIFGmMpgxjGJgmFvOO4PdxZxFXL+rlK1lta3e688jImEUOa8Ic790eHt4Wj7",
-	"OW9+3iMfv1ploCsYUwbuWnMxvVKztMQZE0Qy3sy2Hlt+WSxauZJuc9rfsmyvIqyea7Xax1XV1bTSgN5i",
-	"e1NsyzYTe3K184u+49gIuB+Bmp03xSsqpTpWw0gZCs1TPS0PQxBKyDkmiVFFBlSV3drPSGI/GmTmc9Eq",
-	"Vd9uHBZWsZsKK7xUbBZh5vmebnWpuBQtICg7BfabPlKBFz8QKiROEuBOXkUhUN+Br4S665LijssOECph",
-	"Ycqr4r6pPSKZxIlrqKFyzdQvL8fMnZRZ7G+tC3zPeozjamLebhR0j7rGs7tKNy733nqr0GbcqP9aCGIL",
-	"oR1C3MrdovV2C8svdKU5uJTS7OI4I58TBGRsy0gR8x2pegJYuMcEWaTReNsQxUXk3XKSOQbugAuyT21s",
-	"g5GGvVm2gesbJZQYla9X4me7uMQCrHVsjKosDSLa4RDF2HSklRcCld2ICNlVhne0sTxFh4kuE91a+5In",
-	"LnNMQeKE0K9urilRRbXozCFiHNtzscP4olus+0nF4tdmPBgOVKU2OFRyvy5PuJ0QNJPEBoo6iBKDGu6E",
-	"QCUTmv9PVsuvjwJ17uG0whmrfw9H5heN7w0WcDHdAwuPRVrZ+RljCWDaznTUNJdfTBttp4ZThJLcmfbJ",
-	"V1i174kh5CADNVRBmmEhloxHLrhqq2+dNtM2mT2kJ1SQRdy4F5c8B7+lEN9jfIGp7ebV+Q96o95w4Exu",
-	"VH4KvA252q7rKO1WkO/M12pI/KaWa0wrKquI69rJVieIUdijleV6u7D2d65pXoTvWtJqVe3k0b6P1j2v",
-	"x5Nx9nvELzKf/aXfc0WzhniC7MUKJfomi9sv2+I5pdtSqn3SdYPA5uvudNAvDpVqLltd18rX8FJ0xLCR",
-	"uLkQ6jb1M/aedVFZLxw27qwHna9wmiVDKw4KEQcQDcbj/jE6OTk5OR1+fMCn/eT/3p73P16djdVv5x/5",
-	"u/854x/+l/z3hw+fl/m/8eXJz+nle3b+cDkffHs7iN6OH3pvru67h/cuEO3qUlXdu9+TbKkCb/T7JQhz",
-	"TuRqqjRoVPQGMDdKn+lP/yrC78+/XhXPoXRQNfNKuip+m0dRhM5Zu202tW0dyfRdnm2vmjTcdB1Ex/O9",
-	"hIRATdpk32GdZDiMAQ06Pc8mouVJv1wuO1gP6+PVrhXd9+enZx+nZ8Gg0+vEMk30HhKplXYxfaPZ28sp",
-	"jnT/EuGMVPKhiTewNxJUDUy8YafX6es8XMZaTV3b9dXhhwlHe/2UA5aAMKKwRHa2jzKmUiCCk2SFQkaF",
-	"7buzORJwBxwXutDqsY1o/ZrNNEIJRxGoJbapWr3dOI+8ifeJCWlF84wdgJBvWLQyVy86AdMelWUJMU3T",
-	"7m/2VmXz1O3Ra8j6pea6bm/q4DXvRzKm9kJRG/T6z839PDKMGyo3gyjGAgmJuYRIbeOo13s2/vbCps37",
-	"nJqGsN3p4o2S4d//4/mf5FIZyVegiAhEDBrDffjHc/9McS5jxsmDuVrIgKu8DZXGaZCM/gwkXylb0nIf",
-	"jBLGf4YJfKZwn0EoIUKg5iAWhjlXblGNtfoYK6Lsl5v1je+JPE2xqq6KoFEEF7WuiDSi+51Ea32KuW7z",
-	"3oE0NyX6UNb3esge/ohxTTEBBc2S07c92lLCJI9AoGUMMgauJlNmaBU61CkGRBC14807kPVrfr/2XviL",
-	"+y1USdiAlQwt9P2hfoerYuzmGa59DFSNL9VHuc/+NOamFbx6zx28yu5ay4LqevnLYlcROF7C1kvY2its",
-	"XTUCz/b4pXswRfft0UBWTDQU54QSETfCFyC4x6FEKuNUXk0YRRxkzilEKAJVBQnEaPXNcPEg2VyhPhLO",
-	"yi7hS0DbGdA27+La1nVV3criqYV5811s5Uuce4lzf48414pNyqBxxZBVvNPERSW+tULM5rVZK7i4JNtM",
-	"6ep7oG2to8o8fVH0h7r+RgaXtZvXtmyOrDJe3OyvcTNj6H8/J8OlAeEkQRkTgswSKK1p42a7iyJMTZuJ",
-	"huVfrBhkm8d8sxXSR6fbUffLAEq6v/fUH/7JZ3i5lS8++uKjT/FRs7ZKWvtl2TTdfv5d2Cluq66DteS0",
-	"tyJCkdKBffP4d8wcHhVnXV42mjhT73bjjHTUchET+ydeOCNdXc0EuqUOPCjeInfvBl5Tig/23SGL8tA8",
-	"ljW8dD7RZiUkXsDvYjiVeEHoos3miXS0rmnx/NFb36z/PwAA//+/BXmXoz4AAA==",
+	"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",
+	"AAA=",
 }
 
 // GetSwagger returns the Swagger specification corresponding to the generated code
diff --git a/internal/cloudapi/v2/openapi.v2.yml b/internal/cloudapi/v2/openapi.v2.yml
index 5e16715f4..3df3c8dfa 100644
--- a/internal/cloudapi/v2/openapi.v2.yml
+++ b/internal/cloudapi/v2/openapi.v2.yml
@@ -504,11 +504,14 @@ components:
       type: string
       enum:
         - aws
-        - gcp
         - azure
         - edge-commit
         - edge-container
         - edge-installer
+        - gcp
+        - guest-image
+        - image-installer
+        - vsphere
     Repository:
       type: object
       required:
diff --git a/internal/cloudapi/v2/v2.go b/internal/cloudapi/v2/v2.go
index 5b8235706..45646d3b1 100644
--- a/internal/cloudapi/v2/v2.go
+++ b/internal/cloudapi/v2/v2.go
@@ -282,6 +282,12 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
 		}
 
 		irTarget = t
+	case ImageTypes_guest_image:
+		fallthrough
+	case ImageTypes_vsphere:
+		fallthrough
+	case ImageTypes_image_installer:
+		fallthrough
 	case ImageTypes_edge_installer:
 		fallthrough
 	case ImageTypes_edge_container:
@@ -486,6 +492,12 @@ func imageTypeFromApiImageType(it ImageTypes) string {
 		return "vhd"
 	case ImageTypes_azure:
 		return "vhd"
+	case ImageTypes_guest_image:
+		return "qcow2"
+	case ImageTypes_vsphere:
+		return "vmdk"
+	case ImageTypes_image_installer:
+		return "image-installer"
 	case ImageTypes_edge_commit:
 		return "rhel-edge-commit"
 	case ImageTypes_edge_container: