diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go
index 511c12839..d4c135623 100644
--- a/internal/cloudapi/v2/openapi.v2.gen.go
+++ b/internal/cloudapi/v2/openapi.v2.gen.go
@@ -207,6 +207,7 @@ 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"
 )
@@ -511,32 +512,32 @@ var swaggerSpec = []string{
 	"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",
-	"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",
+	"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",
 }
 
 // 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 9f4e435d8..1652008c5 100644
--- a/internal/cloudapi/v2/openapi.v2.yml
+++ b/internal/cloudapi/v2/openapi.v2.yml
@@ -510,6 +510,7 @@ components:
         - gcp
         - azure
         - edge-commit
+        - edge-container
         - edge-installer
     Repository:
       type: object
diff --git a/internal/cloudapi/v2/v2.go b/internal/cloudapi/v2/v2.go
index b142657ff..da252a991 100644
--- a/internal/cloudapi/v2/v2.go
+++ b/internal/cloudapi/v2/v2.go
@@ -280,6 +280,8 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
 		irTarget = t
 	case ImageTypes_edge_installer:
 		fallthrough
+	case ImageTypes_edge_container:
+		fallthrough
 	case ImageTypes_edge_commit:
 		var awsS3UploadOptions AWSS3UploadOptions
 		jsonUploadOptions, err := json.Marshal(ir.UploadOptions)
@@ -482,6 +484,8 @@ func imageTypeFromApiImageType(it ImageTypes) string {
 		return "vhd"
 	case ImageTypes_edge_commit:
 		return "rhel-edge-commit"
+	case ImageTypes_edge_container:
+		return "rhel-edge-container"
 	case ImageTypes_edge_installer:
 		return "rhel-edge-installer"
 	}