diff --git a/frontend/src/__tests__/integration/pages/modelServing/ModelServingGlobal.spec.ts b/frontend/src/__tests__/integration/pages/modelServing/ModelServingGlobal.spec.ts
index 56ef9a95e2..cb1cb8681c 100644
--- a/frontend/src/__tests__/integration/pages/modelServing/ModelServingGlobal.spec.ts
+++ b/frontend/src/__tests__/integration/pages/modelServing/ModelServingGlobal.spec.ts
@@ -41,6 +41,7 @@ test('Edit model', async ({ page }) => {
   await page
     .getByRole('textbox', { name: 'Field list AWS_SECRET_ACCESS_KEY' })
     .fill('test-secret-key');
+  await page.getByRole('textbox', { name: 'Field list AWS_S3_ENDPOINT' }).fill('test-endpoint');
   await expect(page.getByRole('button', { name: 'Deploy', exact: true })).toBeEnabled();
 });
 
@@ -81,5 +82,6 @@ test('Create model', async ({ page }) => {
   await page
     .getByRole('textbox', { name: 'Field list AWS_SECRET_ACCESS_KEY' })
     .fill('test-secret-key');
+  await page.getByRole('textbox', { name: 'Field list AWS_S3_ENDPOINT' }).fill('test-endpoint');
   await expect(await page.getByRole('button', { name: 'Deploy' })).toBeEnabled();
 });
diff --git a/frontend/src/__tests__/integration/pages/modelServing/ServingRuntimeList.spec.ts b/frontend/src/__tests__/integration/pages/modelServing/ServingRuntimeList.spec.ts
index 261db4c4ce..971fd8d5d2 100644
--- a/frontend/src/__tests__/integration/pages/modelServing/ServingRuntimeList.spec.ts
+++ b/frontend/src/__tests__/integration/pages/modelServing/ServingRuntimeList.spec.ts
@@ -29,6 +29,7 @@ test('Deploy model', async ({ page }) => {
   await page
     .getByRole('textbox', { name: 'Field list AWS_SECRET_ACCESS_KEY' })
     .fill('test-secret-key');
+  await page.getByRole('textbox', { name: 'Field list AWS_S3_ENDPOINT' }).fill('test-endpoint');
   await expect(await page.getByRole('button', { name: 'Deploy', exact: true })).toBeEnabled();
 });
 
diff --git a/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx b/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
index d24fb330d1..75e5ff48d2 100644
--- a/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
+++ b/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
@@ -78,13 +78,13 @@ const ViewPipelineServerModal: React.FC<ViewPipelineServerModalProps> = ({
                   </DescriptionListDescription>
                 </DescriptionListGroup>
                 <DescriptionListGroup>
-                  <DescriptionListTerm>AWS_ACCESS_KEY_ID</DescriptionListTerm>
+                  <DescriptionListTerm>Access key</DescriptionListTerm>
                   <DescriptionListDescription>
                     {objectStorageRecord?.AWS_ACCESS_KEY_ID}
                   </DescriptionListDescription>
                 </DescriptionListGroup>
                 <DescriptionListGroup>
-                  <DescriptionListTerm>AWS_SECRET_ACCESS_KEY</DescriptionListTerm>
+                  <DescriptionListTerm>Secret key</DescriptionListTerm>
                   <DescriptionListDescription>
                     <PasswordHiddenText
                       password={objectStorageRecord?.AWS_SECRET_ACCESS_KEY ?? ''}
@@ -92,7 +92,7 @@ const ViewPipelineServerModal: React.FC<ViewPipelineServerModalProps> = ({
                   </DescriptionListDescription>
                 </DescriptionListGroup>
                 <DescriptionListGroup>
-                  <DescriptionListTerm>AWS_S3_ENDPOINT</DescriptionListTerm>
+                  <DescriptionListTerm>Endpoint</DescriptionListTerm>
                   <DescriptionListDescription>
                     {pipelineNamespaceCR.spec.objectStorage.externalStorage?.scheme &&
                     pipelineNamespaceCR.spec.objectStorage.externalStorage?.host
@@ -101,7 +101,7 @@ const ViewPipelineServerModal: React.FC<ViewPipelineServerModalProps> = ({
                   </DescriptionListDescription>
                 </DescriptionListGroup>
                 <DescriptionListGroup>
-                  <DescriptionListTerm>AWS_S3_BUCKET</DescriptionListTerm>
+                  <DescriptionListTerm>Bucket</DescriptionListTerm>
                   <DescriptionListDescription>
                     {pipelineNamespaceCR.spec.objectStorage.externalStorage?.bucket}
                   </DescriptionListDescription>
diff --git a/frontend/src/pages/projects/dataConnections/const.ts b/frontend/src/pages/projects/dataConnections/const.ts
index 5d620120f6..50987adb93 100644
--- a/frontend/src/pages/projects/dataConnections/const.ts
+++ b/frontend/src/pages/projects/dataConnections/const.ts
@@ -18,26 +18,27 @@ export const AWS_FIELDS: FieldOptions[] = [
   },
   {
     key: AWS_KEYS.ACCESS_KEY_ID,
-    label: AWS_KEYS.ACCESS_KEY_ID,
+    label: 'Access key',
     isRequired: true,
   },
   {
     key: AWS_KEYS.SECRET_ACCESS_KEY,
-    label: AWS_KEYS.SECRET_ACCESS_KEY,
+    label: 'Secret key',
     isPassword: true,
     isRequired: true,
   },
   {
     key: AWS_KEYS.S3_ENDPOINT,
-    label: AWS_KEYS.S3_ENDPOINT,
+    label: 'Endpoint',
+    isRequired: true,
   },
   {
     key: AWS_KEYS.DEFAULT_REGION,
-    label: AWS_KEYS.DEFAULT_REGION,
+    label: 'Region',
   },
   {
     key: AWS_KEYS.AWS_S3_BUCKET,
-    label: AWS_KEYS.AWS_S3_BUCKET,
+    label: 'Bucket',
   },
 ];
 
@@ -60,10 +61,10 @@ export const EMPTY_AWS_SECRET_DATA: AWSDataEntry = [
   },
   {
     key: AWS_KEYS.S3_ENDPOINT,
-    value: 'https://s3.amazonaws.com/',
+    value: '',
   },
   {
     key: AWS_KEYS.DEFAULT_REGION,
-    value: 'us-east-1',
+    value: '',
   },
 ];