diff --git a/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx b/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
index 7eea6be655..68e8f0edce 100644
--- a/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
+++ b/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
@@ -196,7 +196,10 @@ export default function Onboarding(): JSX.Element {
 			}
 		} else if (selectedModule?.id === ModulesMap.APM) {
 			handleAPMSteps();
-			updateSelectedDataSource(defaultApplicationDataSource);
+
+			if (!selectedDataSource) {
+				updateSelectedDataSource(defaultApplicationDataSource);
+			}
 		}
 
 		// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/frontend/src/container/OnboardingContainer/utils/dataSourceUtils.ts b/frontend/src/container/OnboardingContainer/utils/dataSourceUtils.ts
index 140cefadd5..77f1210858 100644
--- a/frontend/src/container/OnboardingContainer/utils/dataSourceUtils.ts
+++ b/frontend/src/container/OnboardingContainer/utils/dataSourceUtils.ts
@@ -223,7 +223,7 @@ const supportedInfraMetrics = [
 ];
 
 export const defaultAwsServices = {
-	name: 'EC2 - Application Logs',
+	name: 'EC2 - App/Server Logs',
 	id: 'awsEc2ApplicationLogs',
 	imgURL: `/Logos/ec2.svg`,
 };