diff --git a/src/features/clusters/upsert/ClusterBilling.tsx b/src/features/clusters/upsert/ClusterBilling.tsx
index 494b6fee9..de1d8699a 100644
--- a/src/features/clusters/upsert/ClusterBilling.tsx
+++ b/src/features/clusters/upsert/ClusterBilling.tsx
@@ -88,7 +88,7 @@ export function ClusterBilling({
 			</li>
 			{clusterId && (
 				<li>If you scale up, you'll be charged for the additional blocks you've purchased
-					now${selectedAutoRenew ? ', and your next auto renewal will be for all purchased blocks' : ''}.
+					now{selectedAutoRenew ? ', and your next auto renewal will be for all purchased blocks' : ''}.
 				</li>)}
 			{clusterId && (<li>If you remove a region, that usage block will not be used (because it is specific to that
 				region).</li>)}
diff --git a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx
index e83c2a033..8d4ce0e56 100644
--- a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx
+++ b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx
@@ -88,17 +88,17 @@ export function ResourcesPerInstance({ planLimits, resourcesPerInstance }: {
 	].filter(excludeFalsy), [planLimits, resourcesPerInstance]);
 
 	return <FormItem className="col-span-3 md:col-span-6">
-		<FormLabel className="inline-flex">
+		<FormLabel>
+			Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min
+			&amp; {humanNumber(planLimits.totalReadCount)} total reads per region,
+			{humanNumber(planLimits.writesPerMinuteCount!)} writes/min &amp; {humanNumber(planLimits.totalWriteCount)} total writes, for 3 months.
 			<Button
 				type="button"
 				variant="link"
 				className="text-white cursor-pointer"
 				onClick={onUsageLimitsClick}
 			>
-				Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min
-				&amp; {humanNumber(planLimits.totalReadCount)} total reads per region,<br/>
-				{humanNumber(planLimits.writesPerMinuteCount!)} writes/min &amp; {humanNumber(planLimits.totalWriteCount!)} total writes, for 3 months, expand for more details:
-				{toggled ? <ArrowDownIcon /> : <ArrowRightIcon />}
+				Learn More {toggled ? <ArrowDownIcon /> : <ArrowRightIcon />}
 			</Button>
 		</FormLabel>
 		<FormControl>
diff --git a/src/features/clusters/upsert/index.tsx b/src/features/clusters/upsert/index.tsx
index 8da9b630b..5fa1a3524 100644
--- a/src/features/clusters/upsert/index.tsx
+++ b/src/features/clusters/upsert/index.tsx
@@ -52,6 +52,7 @@ export function UpsertCluster() {
 		const instances: z.infer<typeof UpsertClusterSchema.shape.instances> = [];
 		const defaults = calculateDefaultDeploymentPerformanceAndRegionPlans(planTypes, regionLocations);
 
+		let isSelfManaged = false;
 		if (planTypes && regionLocations) {
 			if (cluster) {
 				if (cluster.plans) {
@@ -69,6 +70,7 @@ export function UpsertCluster() {
 				}
 				if (!regionPlans.length && cluster.instances) {
 					for (const instance of cluster.instances) {
+						isSelfManaged = true;
 						instances.push({
 							fqdn: instance.instanceFqdn,
 							port: instance.operationsApiPort,
@@ -87,7 +89,7 @@ export function UpsertCluster() {
 			abbreviatedName: cluster?.abbreviatedName ?? '',
 			deploymentDescription: selectedPlan?.deploymentDescription ?? defaults?.deploymentDescription ?? '',
 			performanceDescription: selectedPlan?.performanceDescription ?? defaults?.performanceDescription ?? '',
-			fqdn: cluster?.fqdn ?? '',
+			fqdn: isSelfManaged ? cluster?.fqdn ?? '' : '',
 			instances,
 			regionPlans,
 		};