diff --git a/frontend/src/__tests__/cypress/cypress/e2e/pipelines/Pipelines.cy.ts b/frontend/src/__tests__/cypress/cypress/e2e/pipelines/Pipelines.cy.ts
index 083a8f16ed..997054c793 100644
--- a/frontend/src/__tests__/cypress/cypress/e2e/pipelines/Pipelines.cy.ts
+++ b/frontend/src/__tests__/cypress/cypress/e2e/pipelines/Pipelines.cy.ts
@@ -1212,5 +1212,5 @@ const viewPipelinelineDetails = (
   viewPipelineServerModal.shouldHaveEndPoint(endpoint);
   viewPipelineServerModal.shouldHaveBucketName(bucketName);
 
-  viewPipelineServerModal.findDoneButton().click();
+  viewPipelineServerModal.findCloseButton().click();
 };
diff --git a/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts b/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts
index 412ed6dbf6..bcec6cec6d 100644
--- a/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts
+++ b/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts
@@ -139,10 +139,6 @@ class ViewPipelineServerModal extends Modal {
     super('View pipeline server');
   }
 
-  findDoneButton() {
-    return this.find().findByTestId('view-pipeline-server-done-button');
-  }
-
   shouldHaveAccessKey(value: string) {
     this.find().findByTestId('access-key-field').should('have.text', value);
     return this;
diff --git a/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx b/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
index 244e87d183..0a5c3f0831 100644
--- a/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
+++ b/frontend/src/concepts/pipelines/content/ViewPipelineServerModal.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import {
-  Button,
   DescriptionList,
   DescriptionListDescription,
   DescriptionListGroup,
@@ -36,22 +35,7 @@ const ViewPipelineServerModal: React.FC<ViewPipelineServerModalProps> = ({
   const databaseSecret = dataEntryToRecord(result?.values?.data ?? []);
 
   return (
-    <Modal
-      title="View pipeline server"
-      isOpen={isOpen}
-      onClose={onClose}
-      actions={[
-        <Button
-          key="done-button"
-          variant="link"
-          onClick={onClose}
-          data-testid="view-pipeline-server-done-button"
-        >
-          Done
-        </Button>,
-      ]}
-      variant="small"
-    >
+    <Modal title="View pipeline server" isOpen={isOpen} onClose={onClose} variant="small">
       {pipelineNamespaceCR && (
         <DescriptionList termWidth="20ch" isHorizontal>
           {!!pipelineNamespaceCR.spec.objectStorage.externalStorage?.s3CredentialsSecret