diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/components/SoftwareDetailsModal/SoftwareDetailsModal.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/components/SoftwareDetailsModal/SoftwareDetailsModal.tsx
index b36c3345fe..34f7eac36d 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/components/SoftwareDetailsModal/SoftwareDetailsModal.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/components/SoftwareDetailsModal/SoftwareDetailsModal.tsx
@@ -11,13 +11,28 @@ import TooltipWrapper from "components/TooltipWrapper";
 const baseClass = "software-details-modal";
 
 interface ITargetValueProps {
-  labels: ILabelSoftwareTitle[];
+  labelIncludeAny?: ILabelSoftwareTitle[];
+  labelExcludeAny?: ILabelSoftwareTitle[];
 }
 
-const TargetValue = ({ labels }: ITargetValueProps) => {
-  if (labels.length === 1) {
-    return <>labels[0].name</>;
+const TargetValue = ({
+  labelIncludeAny,
+  labelExcludeAny,
+}: ITargetValueProps) => {
+  if (!labelIncludeAny && !labelExcludeAny) {
+    return <>All hosts</>;
   }
+
+  let valueText = "";
+  let labels: ILabelSoftwareTitle[] = [];
+  if (labelIncludeAny) {
+    valueText = "Custom - include any label";
+    labels = labelIncludeAny;
+  } else if (labelExcludeAny) {
+    valueText = "Custom - exclude any label";
+    labels = labelExcludeAny;
+  }
+
   return (
     <TooltipWrapper
       tipContent={labels.map((label) => (
@@ -27,36 +42,11 @@ const TargetValue = ({ labels }: ITargetValueProps) => {
         </>
       ))}
     >
-      {labels.length} labels
+      {valueText}
     </TooltipWrapper>
   );
 };
 
-const generateTargetTitle = (
-  labelIncludeAny?: ILabelSoftwareTitle[],
-  labelExcludeAny?: ILabelSoftwareTitle[]
-) => {
-  if (labelIncludeAny && labelIncludeAny.length > 0) {
-    return "Targets (include any)";
-  } else if (labelExcludeAny && labelExcludeAny.length > 0) {
-    return "Targets (exclude any)";
-  }
-  return "Targets";
-};
-
-const generateTargetValue = (
-  labelIncludeAny?: ILabelSoftwareTitle[],
-  labelExcludeAny?: ILabelSoftwareTitle[]
-) => {
-  // handle single label case
-  if (labelIncludeAny) {
-    return <TargetValue labels={labelIncludeAny} />;
-  } else if (labelExcludeAny) {
-    return <TargetValue labels={labelExcludeAny} />;
-  }
-  return "None";
-};
-
 interface ISoftwareDetailsModalProps {
   details: IActivityDetails;
   onCancel: () => void;
@@ -67,7 +57,6 @@ const SoftwareDetailsModal = ({
   onCancel,
 }: ISoftwareDetailsModalProps) => {
   const { labels_include_any, labels_exclude_any } = details;
-  const hasTargets = labels_include_any || labels_exclude_any;
 
   return (
     <Modal
@@ -85,18 +74,15 @@ const SoftwareDetailsModal = ({
             title="Self-Service"
             value={details.self_service ? "Yes" : "No"}
           />
-          {hasTargets && (
-            <DataSet
-              title={generateTargetTitle(
-                labels_include_any,
-                labels_exclude_any
-              )}
-              value={generateTargetValue(
-                labels_include_any,
-                labels_exclude_any
-              )}
-            />
-          )}
+          <DataSet
+            title="Target"
+            value={
+              <TargetValue
+                labelIncludeAny={labels_include_any}
+                labelExcludeAny={labels_exclude_any}
+              />
+            }
+          />
         </div>
         <div className="modal-cta-wrap">
           <Button onClick={onCancel} variant="brand">
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareModal/SelectSoftwareModal.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareModal/SelectSoftwareModal.tsx
index cb3aafe0b5..3da3058e40 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareModal/SelectSoftwareModal.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareModal/SelectSoftwareModal.tsx
@@ -79,7 +79,12 @@ const SelectSoftwareModal = ({
   );
 
   return (
-    <Modal className={baseClass} title="Select software" onExit={onExit}>
+    <Modal
+      className={baseClass}
+      title="Select software"
+      width="large"
+      onExit={onExit}
+    >
       <>
         <SelectSoftwareTable
           softwareTitles={softwareTitles}
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/SelectSoftwareTable.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/SelectSoftwareTable.tsx
index c7958dd0f1..abf3fb0624 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/SelectSoftwareTable.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/SelectSoftwareTable.tsx
@@ -72,6 +72,12 @@ const SelectSoftwareTable = ({
       searchQueryColumn="name"
       isClientSideFilter
       onClearSelection={() => onChangeSelectAll(false)}
+      renderTableHelpText={() => (
+        <p className={`${baseClass}__help-text`}>
+          Software will be installed on all hosts. Currently, custom targets
+          (labels) don&apos;t apply during set up experience.
+        </p>
+      )}
     />
   );
 };
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/_styles.scss b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/_styles.scss
index 2ae06f0643..4f636ee5ac 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/_styles.scss
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/_styles.scss
@@ -4,4 +4,8 @@
     max-height: 343px;
     overflow-y: auto;
   }
+
+  &__help-text {
+    font-size: $xx-small;
+  }
 }