diff --git a/internal/cloudapi/openapi.gen.go b/internal/cloudapi/openapi.gen.go
index 1d41c056b..3b96a6d0b 100644
--- a/internal/cloudapi/openapi.gen.go
+++ b/internal/cloudapi/openapi.gen.go
@@ -83,6 +83,7 @@ type ImageStatus struct {
 // Repository defines model for Repository.
 type Repository struct {
 	Baseurl string `json:"baseurl"`
+	Rhsm    bool   `json:"rhsm"`
 }
 
 // Subscription defines model for Subscription.
diff --git a/internal/cloudapi/openapi.yml b/internal/cloudapi/openapi.yml
index da2734d8d..e8103cb16 100644
--- a/internal/cloudapi/openapi.yml
+++ b/internal/cloudapi/openapi.yml
@@ -136,11 +136,14 @@ components:
       type: object
       required:
         - baseurl
+        - rhsm
       properties:
         baseurl:
           type: string
           format: url
           example: 'https://cdn.redhat.com/content/dist/rhel8/8/x86_64/baseos/os/'
+        rhsm:
+          type: boolean
     UploadRequest:
       type: object
       required:
diff --git a/internal/cloudapi/server.go b/internal/cloudapi/server.go
index a51c253a0..178a98e99 100644
--- a/internal/cloudapi/server.go
+++ b/internal/cloudapi/server.go
@@ -87,7 +87,7 @@ func (server *Server) Compose(w http.ResponseWriter, r *http.Request) {
 		repositories := make([]rpmmd.RepoConfig, len(ir.Repositories))
 		for j, repo := range ir.Repositories {
 			repositories[j].BaseURL = repo.Baseurl
-			repositories[j].RHSM = true
+			repositories[j].RHSM = repo.Rhsm
 		}
 
 		var bp = blueprint.Blueprint{}
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 41f12ef8e..282462a43 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -261,6 +261,7 @@ The cloud api for osbuild-composer
 Summary:    Integration tests
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-koji = %{version}-%{release}
+Requires:   %{name}-cloud = %{version}-%{release}
 Requires:   composer-cli
 Requires:   createrepo_c
 Requires:   genisoimage
diff --git a/test/image-tests/aws.sh b/test/image-tests/aws.sh
index 3f4135a5d..c19a45b0d 100755
--- a/test/image-tests/aws.sh
+++ b/test/image-tests/aws.sh
@@ -310,8 +310,14 @@ tee "$CLOUD_REQUEST_FILE" > /dev/null << EOF
       "architecture": "x86_64",
       "image_type": "qcow2",
       "repositories": [
-        { "baseurl": "${BASE_URL}" },
-        { "baseurl": "${APPSTREAM_URL}" }
+        {
+          "baseurl": "${BASE_URL}",
+          "rhsm": true
+        },
+        {
+          "baseurl": "${APPSTREAM_URL}",
+          "rhsm": true
+        }
       ],
       "upload_requests": [
         {