diff --git a/edge_manager/edge_mgr_build_images.adoc b/edge_manager/edge_mgr_build_images.adoc
index 7670645cfa..ef60e1ad64 100644
--- a/edge_manager/edge_mgr_build_images.adoc
+++ b/edge_manager/edge_mgr_build_images.adoc
@@ -142,6 +142,8 @@ Build the operating system image with `bootc` that contains the {rhem} agent. Yo
 * Host configuration
 * Application workloads that you need
 
+*Note:* You must build the operating system image on a Red Hat Enterprise Linux host that has the required entitlement for the specified `rhacm` repository.
+
 Complete the following steps:
 
 . Create a `Containerfile` file with the following content to build a Red Hat Enterprise Linux based operating system image that includes the {rhem} agent and configuration. Replace `rhacm-<2.x>` and `rhel-<version>` with the version of the products that you are using:
@@ -151,7 +153,7 @@ Complete the following steps:
 ----
 FROM registry.redhat.io/rhel9/rhel-bootc:<required_os_version> <1>
 
-RUN subscription-manager repos --enable rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \
+RUN dnf config-manager --set-enabled rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \ 
     dnf -y install flightctl-agent && \
     dnf -y clean all && \
     systemctl enable flightctl-agent.service && \
diff --git a/edge_manager/edge_mgr_build_images_platform.adoc b/edge_manager/edge_mgr_build_images_platform.adoc
index 54973d5864..e1bcb369e4 100644
--- a/edge_manager/edge_mgr_build_images_platform.adoc
+++ b/edge_manager/edge_mgr_build_images_platform.adoc
@@ -15,6 +15,8 @@ When building operating system images and disk images for {ocp-virt}, you can fo
 * Add the `open-vm-tools` guest tools to the image.
 * Build a disk image of type `qcow2` instead of `iso`.
 
+*Note:* You must build the operating system image on a Red Hat Enterprise Linux host that has the required entitlement for the specified `rhacm` repository.
+
 Complete the generic steps with changes to the following steps:
 
 . Build an operating system image that is based on RHEL 9 that includes the {rhem} agent and virtual machine guest tools, but excludes the agent configuration.
@@ -26,7 +28,7 @@ Complete the generic steps with changes to the following steps:
 ----
 FROM registry.redhat.io/rhel9/bootc-image-builder:latest
 
-RUN subscription-manager repos --enable rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \
+RUN dnf config-manager --set-enabled rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \
     dnf -y install flightctl-agent && \
     dnf -y clean all && \
     systemctl enable flightctl-agent.service
@@ -115,6 +117,8 @@ When building operating system images and disk images for VMware vSphere, you ca
 
 Build an operating system image that is based on RHEL 9 that includes the {rhem} agent and VM guest tools, but excludes the agent configuration.
 
+*Note:* You must build the operating system image on a Red Hat Enterprise Linux host that has the required entitlement for the specified `rhacm` repository.
+
 Complete the generic steps with changes to the following steps:
 
 . Create a file that is named `Containerfile` with the following content. Replace `rhacm-<2.x>` and `rhel-<version>` with the version of the products that you are using:
@@ -124,7 +128,7 @@ Complete the generic steps with changes to the following steps:
 ----
 FROM registry.redhat.io/rhel9/bootc-image-builder:latest
 
-RUN subscription-manager repos --enable rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \
+RUN dnf config-manager --set-enabled rhacm-<2.x>-for-rhel-<version>-$(uname -m)-rpms && \
     dnf -y install flightctl-agent && \
     dnf -y clean all && \
     systemctl enable flightctl-agent.service && \