diff --git a/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.spec.tsx b/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.spec.tsx
index 252a3bda1cb..6e62a3cae29 100644
--- a/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.spec.tsx
+++ b/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.spec.tsx
@@ -1,10 +1,10 @@
-import type { ReactNode } from 'react'
+import type { ForwardedRef, ReactNode } from 'react'
 import { applicationFactoryMock, environmentFactoryMock } from '@qovery/shared/factories'
 import { renderWithProviders, screen } from '@qovery/shared/util-tests'
 import { EnvironmentActionToolbar } from './environment-action-toolbar'
 
 const mockEnvironment = environmentFactoryMock(1)[0]
-const mockServices = applicationFactoryMock(3)
+let mockServices: unknown[] = applicationFactoryMock(3)
 const mockDeployEnvironment = jest.fn()
 const mockDeleteEnvironment = jest.fn()
 const mockNavigate = jest.fn()
@@ -36,7 +36,18 @@ jest.mock('@tanstack/react-router', () => ({
   useNavigate: () => mockNavigate,
   useLocation: () => ({ pathname: '/', search: '' }),
   useRouter: () => ({ buildLocation: () => ({ href: '/' }) }),
-  Link: ({ children, ...props }: { children?: ReactNode; [key: string]: unknown }) => <a {...props}>{children}</a>,
+  Link: jest
+    .requireActual('react')
+    .forwardRef(
+      (
+        { children, ...props }: { children?: ReactNode; [key: string]: unknown },
+        ref: ForwardedRef<HTMLAnchorElement>
+      ) => (
+        <a {...props} ref={ref}>
+          {children}
+        </a>
+      )
+    ),
 }))
 
 jest.mock('@qovery/shared/ui', () => ({
@@ -95,6 +106,7 @@ describe('EnvironmentActionToolbar', () => {
       state: 'DEPLOYED',
       deployment_status: 'OUT_OF_DATE',
     }
+    mockServices = applicationFactoryMock(3)
     mockVariables = [
       {
         key: 'QOVERY_KUBERNETES_NAMESPACE_NAME',
@@ -137,6 +149,54 @@ describe('EnvironmentActionToolbar', () => {
     expect(mockOpenModalConfirmation).not.toHaveBeenCalled()
   })
 
+  it('should display an ArgoCD warning on redeploy when the environment contains ArgoCD services', async () => {
+    mockServices = [
+      applicationFactoryMock(1)[0],
+      {
+        id: 'argocd-service-1',
+        name: 'ArgoCD service',
+        service_type: 'ARGOCD_APP',
+        serviceType: 'ARGOCD_APP',
+      },
+    ]
+
+    const { userEvent } = renderWithProviders(<EnvironmentActionToolbar environment={mockEnvironment} />)
+
+    await userEvent.click(screen.getByLabelText(/manage deployment/i))
+    await userEvent.hover(screen.getByLabelText(/argocd deployment information/i))
+
+    expect(await screen.findAllByText('Environment has changed and needs to be applied')).toHaveLength(2)
+    expect(
+      await screen.findAllByText('Redeploy will only target Qovery created services and not ArgoCD imported ones.')
+    ).toHaveLength(2)
+  })
+
+  it('should display an ArgoCD warning on deploy when the environment contains ArgoCD services', async () => {
+    mockDeploymentStatus = {
+      state: 'READY',
+      deployment_status: 'OUT_OF_DATE',
+    }
+    mockServices = [
+      applicationFactoryMock(1)[0],
+      {
+        id: 'argocd-service-1',
+        name: 'ArgoCD service',
+        service_type: 'ARGOCD_APP',
+        serviceType: 'ARGOCD_APP',
+      },
+    ]
+
+    const { userEvent } = renderWithProviders(<EnvironmentActionToolbar environment={mockEnvironment} />)
+
+    await userEvent.click(screen.getByLabelText(/manage deployment/i))
+    await userEvent.hover(screen.getByLabelText(/argocd deployment information/i))
+
+    expect(await screen.findAllByText('Environment has changed and needs to be applied')).toHaveLength(2)
+    expect(
+      await screen.findAllByText('Redeploy will only target Qovery created services and not ArgoCD imported ones.')
+    ).toHaveLength(2)
+  })
+
   it('should keep a confirmation modal for stop', async () => {
     const { userEvent } = renderWithProviders(<EnvironmentActionToolbar environment={mockEnvironment} />)
 
@@ -207,4 +267,23 @@ describe('EnvironmentActionToolbar', () => {
     expect(screen.getByText('Namespace ID')).toBeInTheDocument()
     expect(screen.getByText('z1234567-env-name')).toBeInTheDocument()
   })
+
+  it('should disable ArgoCD environment deletion', async () => {
+    const { userEvent } = renderWithProviders(
+      <EnvironmentActionToolbar environment={mockEnvironment} isArgoCdEnvironment />
+    )
+
+    await userEvent.click(screen.getByLabelText(/other actions/i))
+
+    const deleteEnvironmentItem = screen.getByRole('menuitem', { name: /delete environment/i })
+    expect(deleteEnvironmentItem).toHaveAttribute('aria-disabled', 'true')
+
+    await userEvent.hover(screen.getByText('Delete environment'))
+
+    expect(
+      await screen.findByRole('tooltip', {
+        name: 'ArgoCD environment can only be deleted by revoking the integration',
+      })
+    ).toBeInTheDocument()
+  })
 })
diff --git a/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.tsx b/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.tsx
index 468d478758f..f2815796460 100644
--- a/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.tsx
+++ b/libs/domains/environments/feature/src/lib/environment-action-toolbar/environment-action-toolbar.tsx
@@ -8,6 +8,7 @@ import {
 } from 'qovery-typescript-axios'
 import { useState } from 'react'
 import { match } from 'ts-pattern'
+import { isArgoCd } from '@qovery/domains/services/data-access'
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import { useServices } from '@qovery/domains/services/feature'
 import { useVariables } from '@qovery/domains/variables/feature'
@@ -76,6 +77,24 @@ export function MenuManageDeployment({
   // XXX: Required to display a warning for managed Database
   // https://qovery.atlassian.net/jira/software/projects/FRT/boards/23?selectedIssue=FRT-1416
   const { data: services = [] } = useServices({ environmentId: environment.id })
+  const hasArgoCdServices = services.some(isArgoCd)
+
+  const argoCdDeploymentTooltipContent = (
+    <span className="flex flex-col gap-1">
+      {displayYellowColor ? <span>Environment has changed and needs to be applied</span> : null}
+      <span>Redeploy will only target Qovery created services and not ArgoCD imported ones.</span>
+    </span>
+  )
+
+  const tooltipDeployWithArgoCdServices = hasArgoCdServices ? (
+    <Tooltip side="bottom" content={argoCdDeploymentTooltipContent}>
+      <span aria-label="ArgoCD deployment information" className="flex">
+        <Icon iconName={displayYellowColor ? 'circle-exclamation' : 'circle-info'} iconStyle="regular" />
+      </span>
+    </Tooltip>
+  ) : (
+    tooltipEnvironmentNeedUpdate
+  )
 
   const mutationDeploy = () =>
     deployEnvironment({
@@ -182,7 +201,7 @@ export function MenuManageDeployment({
           >
             <div className="flex w-full items-center justify-between">
               Deploy
-              {tooltipEnvironmentNeedUpdate}
+              {tooltipDeployWithArgoCdServices}
             </div>
           </DropdownMenu.Item>
         )}
@@ -194,7 +213,7 @@ export function MenuManageDeployment({
           >
             <div className="flex w-full items-center justify-between">
               Redeploy
-              {tooltipEnvironmentNeedUpdate}
+              {tooltipDeployWithArgoCdServices}
             </div>
           </DropdownMenu.Item>
         )}
@@ -244,10 +263,12 @@ export function MenuManageDeployment({
 export function MenuOtherActions({
   state,
   environment,
+  isArgoCdEnvironment = false,
   variant = 'default',
 }: {
   state: StateEnum
   environment: Environment
+  isArgoCdEnvironment?: boolean
   variant?: ActionToolbarVariant
 }) {
   const [isActionsOpen, setIsActionsOpen] = useState(false)
@@ -386,9 +407,17 @@ export function MenuOtherActions({
         {isDeleteAvailable(state) && (
           <>
             <DropdownMenu.Separator />
-            <DropdownMenu.Item color="red" icon={<Icon iconName="trash" />} onSelect={mutationDeleteEnvironment}>
-              Delete environment
-            </DropdownMenu.Item>
+            {isArgoCdEnvironment ? (
+              <DropdownMenu.Item color="red" icon={<Icon iconName="trash" />} disabled>
+                <Tooltip content="ArgoCD environment can only be deleted by revoking the integration">
+                  <span>Delete environment</span>
+                </Tooltip>
+              </DropdownMenu.Item>
+            ) : (
+              <DropdownMenu.Item color="red" icon={<Icon iconName="trash" />} onSelect={mutationDeleteEnvironment}>
+                Delete environment
+              </DropdownMenu.Item>
+            )}
           </>
         )}
       </DropdownMenu.Content>
@@ -398,10 +427,15 @@ export function MenuOtherActions({
 
 export interface EnvironmentActionToolbarProps {
   environment: Environment
+  isArgoCdEnvironment?: boolean
   variant?: ActionToolbarVariant
 }
 
-export function EnvironmentActionToolbar({ environment, variant = 'default' }: EnvironmentActionToolbarProps) {
+export function EnvironmentActionToolbar({
+  environment,
+  isArgoCdEnvironment = false,
+  variant = 'default',
+}: EnvironmentActionToolbarProps) {
   const { data: countServices, isFetched: isFetchedServices } = useServiceCount({ environmentId: environment.id })
 
   const { data: deploymentStatus } = useDeploymentStatus({ environmentId: environment.id })
@@ -434,7 +468,11 @@ export function EnvironmentActionToolbar({ environment, variant = 'default' }: E
               <Icon iconName="timeline" />
             </Link>
           </Tooltip>
-          <MenuOtherActions environment={environment} state={deploymentStatus.state} />
+          <MenuOtherActions
+            environment={environment}
+            state={deploymentStatus.state}
+            isArgoCdEnvironment={isArgoCdEnvironment}
+          />
         </>
       )}
     </div>
diff --git a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.spec.tsx b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.spec.tsx
index e9861b3a96f..17ce8bfebbf 100644
--- a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.spec.tsx
+++ b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.spec.tsx
@@ -54,9 +54,15 @@ const overview: EnvironmentOverviewResponse = {
 
 describe('EnvironmentSection', () => {
   beforeEach(() => {
+    jest.useFakeTimers()
     jest.clearAllMocks()
   })
 
+  afterEach(() => {
+    jest.clearAllTimers()
+    jest.useRealTimers()
+  })
+
   it('should navigate to the environment when clicking the row', async () => {
     const { userEvent } = renderWithProviders(
       <EnvironmentSection type={EnvironmentModeEnum.DEVELOPMENT} items={[overview]} />
@@ -120,5 +126,7 @@ describe('EnvironmentSection', () => {
     )
 
     expect(screen.getByText('ArgoCD')).toBeInTheDocument()
+    const manageDeploymentButton = screen.getByRole('button', { name: /manage deployment/i })
+    expect(manageDeploymentButton).toBeEnabled()
   })
 })
diff --git a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
index ddc0f72950f..a2e34bcf581 100644
--- a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
+++ b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
@@ -16,9 +16,9 @@ const { Table } = TablePrimitives
 const gridLayoutClassName =
   'grid w-full grid-cols-[minmax(280px,2fr)_minmax(220px,1.4fr)_minmax(240px,1.2fr)_minmax(140px,1fr)_96px]'
 
-function DisabledManageDeploymentButton() {
+function DisabledManageDeploymentButton({ tooltip }: { tooltip: string }) {
   return (
-    <Tooltip content="Add at least one service to deploy this environment">
+    <Tooltip content={tooltip}>
       <div>
         <Button aria-label="Manage Deployment" color="neutral" variant="outline" size="sm" iconOnly disabled>
           <div className="flex h-full w-full items-center justify-center gap-1.5">
@@ -142,11 +142,12 @@ function EnvRow({ overview }: { overview: EnvironmentOverviewResponse }) {
               {overview.services_overview.service_count > 0 && overview.deployment_status ? (
                 <MenuManageDeployment environment={environment} deploymentStatus={overview.deployment_status} />
               ) : (
-                <DisabledManageDeploymentButton />
+                <DisabledManageDeploymentButton tooltip="Add at least one service to deploy this environment" />
               )}
               <MenuOtherActions
                 environment={environment}
                 state={overview.deployment_status?.last_deployment_state ?? StateEnum.READY}
+                isArgoCdEnvironment={isArgoCdEnvironment}
               />
             </>
           )}
diff --git a/libs/domains/organizations/data-access/src/lib/domains-organizations-data-access.ts b/libs/domains/organizations/data-access/src/lib/domains-organizations-data-access.ts
index 71803c9da3d..8af6f5aee41 100644
--- a/libs/domains/organizations/data-access/src/lib/domains-organizations-data-access.ts
+++ b/libs/domains/organizations/data-access/src/lib/domains-organizations-data-access.ts
@@ -434,6 +434,23 @@ export const mutations = {
     )
     return response.data
   },
+  async unlinkArgoCdDestinationClusterMapping({
+    organizationId,
+    agentClusterId,
+    argocdClusterUrl,
+  }: {
+    organizationId: string
+    agentClusterId: string
+    argocdClusterUrl: string
+  }) {
+    const response = await argoCdApi.deleteArgoCdDestinationClusterMapping(
+      organizationId,
+      agentClusterId,
+      argocdClusterUrl,
+      { headers: { 'Content-Type': 'application/json' } }
+    )
+    return response.data
+  },
   async listTfVarsFilesFromGitRepo({
     organizationId,
     repository,
diff --git a/libs/domains/organizations/feature/src/index.ts b/libs/domains/organizations/feature/src/index.ts
index e8188ab8cc4..bacd8532db6 100644
--- a/libs/domains/organizations/feature/src/index.ts
+++ b/libs/domains/organizations/feature/src/index.ts
@@ -90,6 +90,7 @@ export * from './lib/hooks/use-container-registry-associated-services/use-contai
 export * from './lib/hooks/use-organization-credentials/use-organization-credentials'
 export * from './lib/hooks/use-organization-argocd-integrations/use-organization-argocd-integrations'
 export * from './lib/hooks/use-save-argocd-destination-cluster-mapping/use-save-argocd-destination-cluster-mapping'
+export * from './lib/hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping'
 export * from './lib/hooks/use-parse-terraform-variables-from-git-repo/use-parse-terraform-variables-from-git-repo'
 export * from './lib/hooks/use-list-tfvars-files-from-git-repo/use-list-tfvars-files-from-git-repo'
 export * from './lib/invoice-banner/invoice-banner'
diff --git a/libs/domains/organizations/feature/src/lib/hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping.ts b/libs/domains/organizations/feature/src/lib/hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping.ts
new file mode 100644
index 00000000000..1594a959efb
--- /dev/null
+++ b/libs/domains/organizations/feature/src/lib/hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping.ts
@@ -0,0 +1,23 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { mutations } from '@qovery/domains/organizations/data-access'
+import { queries } from '@qovery/state/util-queries'
+
+export function useUnlinkArgoCdDestinationClusterMapping() {
+  const queryClient = useQueryClient()
+
+  return useMutation(mutations.unlinkArgoCdDestinationClusterMapping, {
+    onSuccess(_, { organizationId }) {
+      queryClient.invalidateQueries({
+        queryKey: queries.organizations.argoCdDestinationClusterMappings({ organizationId }).queryKey,
+      })
+    },
+    meta: {
+      notifyOnSuccess: {
+        title: 'The ArgoCD cluster mapping has been unlinked',
+      },
+      notifyOnError: true,
+    },
+  })
+}
+
+export default useUnlinkArgoCdDestinationClusterMapping
diff --git a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.spec.tsx b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.spec.tsx
index 752899e11dd..b6d94d71515 100644
--- a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.spec.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.spec.tsx
@@ -6,6 +6,7 @@ import { SettingsArgoCdIntegration } from './settings-argocd-integration'
 
 const mockOpenModal = jest.fn()
 const mockCloseModal = jest.fn()
+const mockUnlinkArgoCdDestinationClusterMapping = jest.fn()
 
 jest.mock('@tanstack/react-router', () => ({
   ...jest.requireActual('@tanstack/react-router'),
@@ -15,6 +16,14 @@ jest.mock('@tanstack/react-router', () => ({
 jest.mock('../hooks/use-organization-argocd-integrations/use-organization-argocd-integrations', () => ({
   useOrganizationArgoCdIntegrations: jest.fn(),
 }))
+jest.mock(
+  '../hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping',
+  () => ({
+    useUnlinkArgoCdDestinationClusterMapping: () => ({
+      mutateAsync: mockUnlinkArgoCdDestinationClusterMapping,
+    }),
+  })
+)
 jest.mock('@qovery/shared/ui', () => ({
   ...jest.requireActual('@qovery/shared/ui'),
   useModal: () => ({
@@ -33,6 +42,7 @@ describe('SettingsArgoCdIntegration', () => {
     useParamsMock.mockReturnValue({ organizationId: 'org-1' } as never)
     mockOpenModal.mockReset()
     mockCloseModal.mockReset()
+    mockUnlinkArgoCdDestinationClusterMapping.mockReset()
   })
 
   it('should render an empty state when no integration is configured', () => {
@@ -47,7 +57,7 @@ describe('SettingsArgoCdIntegration', () => {
     expect(screen.getAllByRole('button', { name: 'Add ArgoCD' })).toHaveLength(2)
   })
 
-  it('should render integration cards with linked and unlinked sections', () => {
+  it('should render integration cards with linked and unlinked sections', async () => {
     useOrganizationArgoCdIntegrationsMock.mockReturnValue({
       data: [
         {
@@ -81,15 +91,65 @@ describe('SettingsArgoCdIntegration', () => {
       isLoading: false,
     } as ReturnType<typeof useOrganizationArgoCdIntegrations>)
 
-    renderWithProviders(<SettingsArgoCdIntegration />)
+    const { userEvent } = renderWithProviders(<SettingsArgoCdIntegration />)
 
     expect(screen.getByText('ArgoCD running on')).toBeInTheDocument()
     expect(screen.getByText('Linked clusters (1)')).toBeInTheDocument()
     expect(screen.getByText('Unlinked clusters (1)')).toBeInTheDocument()
     expect(screen.getByText('AWS EKS Demo')).toBeInTheDocument()
+
+    await userEvent.click(screen.getByText('Unlinked clusters (1)'))
+
+    expect(
+      screen.getByText(
+        'Unlinked clusters are clusters detected by ArgoCD that are not yet associated with a cluster in Qovery. Add the cluster to Qovery, then link it here to display the applications running on it.'
+      )
+    ).toBeInTheDocument()
+    expect(screen.getByText('external-prod')).toBeInTheDocument()
+    expect(screen.getByText('unmapped.example.com')).toBeInTheDocument()
     expect(screen.getByText('Connected')).toBeInTheDocument()
   })
 
+  it('should unlink a linked cluster mapping', async () => {
+    mockUnlinkArgoCdDestinationClusterMapping.mockResolvedValue({})
+    useOrganizationArgoCdIntegrationsMock.mockReturnValue({
+      data: [
+        {
+          agent_cluster_id: 'cluster-1',
+          agent_cluster_name: 'undeletable_cluster',
+          agent_cluster_cloud_provider: 'AWS',
+          credentials_id: 'integration-1',
+          argocd_url: 'https://argocd.example.com',
+          status: 'connected',
+          last_checked_at: '2026-04-28T12:20:00.000Z',
+          linked_clusters: [
+            {
+              argocd_cluster_url: 'https://kubernetes.default.svc',
+              argocd_cluster_name: 'kube-system',
+              qovery_cluster_id: 'cluster-1',
+              qovery_cluster_name: 'AWS EKS Demo',
+              qovery_cluster_cloud_provider: 'AWS',
+              qovery_cluster_type: 'MANAGED',
+              applications_count: 4,
+            },
+          ],
+          unlinked_clusters: [],
+        },
+      ],
+      isLoading: false,
+    } as ReturnType<typeof useOrganizationArgoCdIntegrations>)
+
+    const { userEvent } = renderWithProviders(<SettingsArgoCdIntegration />)
+
+    await userEvent.click(screen.getByTestId('unlink-linked-cluster-https://kubernetes.default.svc'))
+
+    expect(mockUnlinkArgoCdDestinationClusterMapping).toHaveBeenCalledWith({
+      organizationId: 'org-1',
+      agentClusterId: 'cluster-1',
+      argocdClusterUrl: 'https://kubernetes.default.svc',
+    })
+  })
+
   it('should render an importing state when the integration has no cluster mapping yet', () => {
     useOrganizationArgoCdIntegrationsMock.mockReturnValue({
       data: [
diff --git a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
index 29b94a683b8..2c42272ec67 100644
--- a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
@@ -2,17 +2,19 @@ import * as AccordionPrimitive from '@radix-ui/react-accordion'
 import { useParams } from '@tanstack/react-router'
 import {
   type ArgoCdInstanceMappingResponse,
+  type ArgoCdLinkedClusterDetails,
   type ArgoCdUnlinkedClusterDetails,
   type KubernetesEnum,
 } from 'qovery-typescript-axios'
 import { type ReactNode, Suspense, useEffect, useMemo, useState } from 'react'
 import { useDeleteArgoCdCredentials } from '@qovery/domains/clusters/feature'
 import { SettingsHeading } from '@qovery/shared/console-shared'
-import { Badge, Button, EmptyState, Icon, Link, ModalConfirmation, Section, useModal } from '@qovery/shared/ui'
+import { Badge, Button, EmptyState, Icon, Link, ModalConfirmation, Section, Tooltip, useModal } from '@qovery/shared/ui'
 import { timeAgo } from '@qovery/shared/util-dates'
 import { useDocumentTitle } from '@qovery/shared/util-hooks'
 import { useOrganizationArgoCdIntegrations } from '../hooks/use-organization-argocd-integrations/use-organization-argocd-integrations'
 import { useSaveArgoCdDestinationClusterMapping } from '../hooks/use-save-argocd-destination-cluster-mapping/use-save-argocd-destination-cluster-mapping'
+import { useUnlinkArgoCdDestinationClusterMapping } from '../hooks/use-unlink-argocd-destination-cluster-mapping/use-unlink-argocd-destination-cluster-mapping'
 import { ArgoCdIntegrationCardSkeleton } from './argocd-integration-skeleton'
 import { ConnectArgoCdModal } from './connect-argocd-modal/connect-argocd-modal'
 import { LinkClusterModal, type LinkClusterModalResponse } from './link-cluster-modal/link-cluster-modal'
@@ -92,9 +94,16 @@ interface ArgoCdIntegrationCardProps {
     cluster: ArgoCdUnlinkedClusterDetails,
     response: LinkClusterModalResponse
   ) => void
+  onUnlinkCluster: (integrationId: string, cluster: ArgoCdLinkedClusterDetails) => void
 }
 
-function ArgoCdIntegrationCard({ integration, onEdit, onDelete, onLinkCluster }: ArgoCdIntegrationCardProps) {
+function ArgoCdIntegrationCard({
+  integration,
+  onEdit,
+  onDelete,
+  onLinkCluster,
+  onUnlinkCluster,
+}: ArgoCdIntegrationCardProps) {
   const { organizationId = '' } = useParams({ strict: false })
   const { openModal, closeModal } = useModal()
   const [isLinkedSectionOpen, setIsLinkedSectionOpen] = useState(true)
@@ -215,6 +224,18 @@ function ArgoCdIntegrationCard({ integration, onEdit, onDelete, onLinkCluster }:
                       </span>
                     </div>
                   </div>
+                  <Tooltip content="Unlink cluster">
+                    <Button
+                      size="md"
+                      variant="outline"
+                      color="neutral"
+                      iconOnly
+                      onClick={() => onUnlinkCluster(integration.credentials_id, cluster)}
+                      data-testid={`unlink-linked-cluster-${cluster.argocd_cluster_url}`}
+                    >
+                      <Icon iconName="link-broken" iconStyle="regular" />
+                    </Button>
+                  </Tooltip>
                 </div>
               ))}
             </div>
@@ -230,6 +251,10 @@ function ArgoCdIntegrationCard({ integration, onEdit, onDelete, onLinkCluster }:
             onOpenChange={setIsUnlinkedSectionOpen}
             hasBottomBorder={false}
           >
+            <p className="mb-3 text-sm text-neutral-subtle">
+              Unlinked clusters are clusters detected by ArgoCD that are not yet associated with a cluster in Qovery.
+              Add the cluster to Qovery, then link it here to display the applications running on it.
+            </p>
             <div className="overflow-hidden rounded-md border border-neutral bg-surface-neutral-subtle">
               {integration.unlinked_clusters.map((cluster) => (
                 <div
@@ -324,6 +349,7 @@ function SettingsArgoCdIntegrationContent() {
   const { openModal, closeModal } = useModal()
   const { mutateAsync: deleteArgoCdCredentials } = useDeleteArgoCdCredentials({ organizationId })
   const { mutateAsync: saveArgoCdDestinationClusterMapping } = useSaveArgoCdDestinationClusterMapping()
+  const { mutateAsync: unlinkArgoCdDestinationClusterMapping } = useUnlinkArgoCdDestinationClusterMapping()
   const [integrationsState, setIntegrationsState] = useState<ArgoCdInstanceMappingResponse[]>([])
 
   useEffect(() => {
@@ -412,6 +438,20 @@ function SettingsArgoCdIntegrationContent() {
     })
   }
 
+  const unlinkCluster = async (integrationId: string, cluster: ArgoCdLinkedClusterDetails) => {
+    const integration = integrationsState.find(({ credentials_id }) => credentials_id === integrationId)
+
+    if (!integration) {
+      return
+    }
+
+    await unlinkArgoCdDestinationClusterMapping({
+      organizationId,
+      agentClusterId: integration.agent_cluster_id,
+      argocdClusterUrl: cluster.argocd_cluster_url,
+    })
+  }
+
   if (integrationsState.length === 0) {
     return (
       <EmptyState
@@ -437,6 +477,7 @@ function SettingsArgoCdIntegrationContent() {
           onEdit={openEditModal}
           onDelete={openDeleteModal}
           onLinkCluster={linkCluster}
+          onUnlinkCluster={unlinkCluster}
         />
       ))}
     </div>
diff --git a/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.spec.tsx b/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.spec.tsx
index 39d08ccdbdc..efc4646076b 100644
--- a/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.spec.tsx
+++ b/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.spec.tsx
@@ -1,4 +1,5 @@
 import { type ArgocdAppResponse, type Environment } from 'qovery-typescript-axios'
+import type { ForwardedRef, ReactNode } from 'react'
 import { renderWithProviders, screen } from '@qovery/shared/util-tests'
 import { ArgoCdServiceList } from './argocd-service-list'
 
@@ -14,6 +15,52 @@ jest.mock('../hooks/use-argocd-services/use-argocd-services', () => ({
   useArgoCdServices: (params: unknown) => mockUseArgoCdServices(params),
 }))
 
+jest.mock('@qovery/shared/ui', () => {
+  const React = jest.requireActual('react')
+  const actual = jest.requireActual('@qovery/shared/ui')
+
+  return {
+    ...actual,
+    Link: React.forwardRef(
+      (
+        {
+          children,
+          as,
+          color,
+          iconOnly,
+          params,
+          size,
+          to,
+          variant,
+          ...props
+        }: {
+          children?: ReactNode
+          as?: string
+          color?: string
+          iconOnly?: boolean
+          params?: Record<string, string>
+          size?: string
+          to?: string
+          variant?: string
+          [key: string]: unknown
+        },
+        ref: ForwardedRef<HTMLAnchorElement>
+      ) => {
+        const href = Object.entries(params ?? {}).reduce(
+          (path, [key, value]) => path.replace(`$${key}`, value),
+          to ?? ''
+        )
+
+        return (
+          <a {...props} href={href} ref={ref}>
+            {children}
+          </a>
+        )
+      }
+    ),
+  }
+})
+
 const environment = {
   id: 'env-1',
   name: 'Environment',
@@ -29,17 +76,29 @@ const services = [
   {
     id: 'service-1',
     name: 'Argo service',
-    source_repo_url: 'https://github.com/qovery/service',
+    git_repository: {
+      provider: 'GITHUB',
+      owner: 'qovery',
+      name: 'qovery/service',
+      url: 'https://github.com/qovery/service',
+      branch: 'env/refs/merge',
+    },
+    manifest_revision: '313a525a4ad53b37f0b33f81282c52fef5f8e7d8',
     last_synced_at: '2026-05-05T10:00:00.000Z',
   },
 ] as ArgocdAppResponse[]
 
 describe('ArgoCdServiceList', () => {
   beforeEach(() => {
+    jest.useFakeTimers()
     jest.clearAllMocks()
     mockUseArgoCdServices.mockReturnValue({ data: services })
   })
 
+  afterEach(() => {
+    jest.useRealTimers()
+  })
+
   it('should navigate to the service overview when clicking the row', async () => {
     const { userEvent } = renderWithProviders(<ArgoCdServiceList environment={environment} />)
 
@@ -59,8 +118,48 @@ describe('ArgoCdServiceList', () => {
   it('should not navigate to the service overview when clicking the repository link', async () => {
     const { userEvent } = renderWithProviders(<ArgoCdServiceList environment={environment} />)
 
-    await userEvent.click(screen.getByRole('link', { name: /github\.com\/qovery\/service/i }))
+    await userEvent.click(screen.getByRole('link', { name: /qovery\/service/i }))
 
     expect(mockNavigate).not.toHaveBeenCalled()
   })
+
+  it('should not navigate to the service overview when clicking the branch link', async () => {
+    const { userEvent } = renderWithProviders(<ArgoCdServiceList environment={environment} />)
+
+    await userEvent.click(screen.getByRole('link', { name: /env\/refs\/merge/i }))
+
+    expect(mockNavigate).not.toHaveBeenCalled()
+  })
+
+  it('should render git target version information', () => {
+    renderWithProviders(<ArgoCdServiceList environment={environment} />)
+
+    expect(screen.getByText('Target version')).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: /qovery\/service/i })).toHaveAttribute(
+      'href',
+      'https://github.com/qovery/service'
+    )
+    expect(screen.getByRole('link', { name: /env\/refs\/merge/i })).toHaveAttribute(
+      'href',
+      'https://github.com/qovery/service/tree/env/refs/merge/'
+    )
+    expect(screen.getByRole('button', { name: /313a525/i })).toBeInTheDocument()
+  })
+
+  it('should render ArgoCD service actions', async () => {
+    const { userEvent } = renderWithProviders(<ArgoCdServiceList environment={environment} />)
+
+    expect(screen.getByText('Actions')).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: /service logs for argo service/i })).toHaveAttribute(
+      'href',
+      '/organization/org-1/project/project-1/environment/env-1/service/service-1/service-logs'
+    )
+
+    await userEvent.click(screen.getByRole('button', { name: /other actions for argo service/i }))
+
+    expect(screen.getByRole('menuitem', { name: /see manifest/i })).toHaveAttribute(
+      'href',
+      '/organization/org-1/project/project-1/environment/env-1/service/service-1/manifest'
+    )
+  })
 })
diff --git a/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.tsx b/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.tsx
index 1e3b905553a..7f7a1f899e3 100644
--- a/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.tsx
+++ b/libs/domains/services/feature/src/lib/argocd-service-list/argocd-service-list.tsx
@@ -1,32 +1,33 @@
 import { useNavigate } from '@tanstack/react-router'
-import { type ArgocdAppResponse, type Environment } from 'qovery-typescript-axios'
+import { type Environment } from 'qovery-typescript-axios'
 import { type KeyboardEvent, type MouseEvent, useMemo } from 'react'
 import { IconEnum } from '@qovery/shared/enums'
-import { Badge, ExternalLink, Heading, Icon, Section, TablePrimitives, Tooltip } from '@qovery/shared/ui'
+import {
+  Badge,
+  Button,
+  CopyToClipboard,
+  DropdownMenu,
+  ExternalLink,
+  Heading,
+  Icon,
+  Link,
+  Section,
+  TablePrimitives,
+  Tooltip,
+} from '@qovery/shared/ui'
 import { timeAgo } from '@qovery/shared/util-dates'
+import { buildGitProviderUrl } from '@qovery/shared/util-git'
 import { useArgoCdServices } from '../hooks/use-argocd-services/use-argocd-services'
 
 const { Table } = TablePrimitives
 
-const tableGridLayoutClassName = 'grid w-full grid-cols-[minmax(280px,1.7fr)_minmax(220px,1fr)_minmax(280px,1.1fr)]'
+const tableGridLayoutClassName =
+  'grid w-full grid-cols-[minmax(280px,1.7fr)_minmax(220px,1fr)_minmax(280px,1.1fr)_minmax(112px,112px)]'
 
 export interface ArgoCdServiceListProps {
   environment: Environment
 }
 
-const getRepositoryLabel = (service: ArgocdAppResponse) => {
-  if (!service.source_repo_url) {
-    return null
-  }
-
-  try {
-    const url = new URL(service.source_repo_url)
-    return `${url.hostname}${url.pathname}`
-  } catch {
-    return service.source_repo_url
-  }
-}
-
 export function ArgoCdServiceList({ environment }: ArgoCdServiceListProps) {
   const navigate = useNavigate()
   const environmentId = environment.id
@@ -86,15 +87,19 @@ export function ArgoCdServiceList({ environment }: ArgoCdServiceListProps) {
               <Table.ColumnHeaderCell className="flex h-full items-center border-r border-neutral text-neutral-subtle">
                 Last operation
               </Table.ColumnHeaderCell>
-              <Table.ColumnHeaderCell className="flex h-full items-center text-neutral-subtle">
+              <Table.ColumnHeaderCell className="flex h-full items-center border-r border-neutral text-neutral-subtle">
                 Target version
               </Table.ColumnHeaderCell>
+              <Table.ColumnHeaderCell className="flex h-full items-center justify-center text-neutral-subtle">
+                Actions
+              </Table.ColumnHeaderCell>
             </Table.Row>
           </Table.Header>
 
           <Table.Body>
             {services.map((service) => {
-              const repositoryLabel = getRepositoryLabel(service)
+              const gitRepository = service.git_repository
+              const manifestRevision = service.manifest_revision
 
               return (
                 <Table.Row
@@ -131,13 +136,32 @@ export function ArgoCdServiceList({ environment }: ArgoCdServiceListProps) {
                     </div>
                   </Table.Cell>
 
-                  <Table.Cell className="flex h-full items-center">
+                  <Table.Cell className="flex h-full items-center border-r border-neutral">
                     <div className="flex min-w-0 flex-col gap-0.5 text-ssm">
-                      {repositoryLabel ? (
+                      {gitRepository && (
                         <div className="flex min-w-0 items-center gap-2 text-neutral">
+                          <Icon className="h-3 w-3 shrink-0 text-inherit" name={gitRepository.provider} />
+                          <ExternalLink
+                            href={gitRepository.url}
+                            underline
+                            color="neutral"
+                            size="ssm"
+                            withIcon={false}
+                            className="min-w-0 flex-1 overflow-hidden font-normal"
+                            onClick={stopRowNavigation}
+                            onKeyDown={stopRowNavigation}
+                          >
+                            <span className="min-w-0 truncate" title={gitRepository.name}>
+                              {gitRepository.name}
+                            </span>
+                          </ExternalLink>
+                        </div>
+                      )}
+                      {gitRepository?.branch && gitRepository.url ? (
+                        <div className="flex min-w-0 items-center gap-2 text-neutral-subtle">
                           <Icon className="h-3 w-3 shrink-0 text-inherit" iconName="code-branch" iconStyle="regular" />
                           <ExternalLink
-                            href={service.source_repo_url ?? '#'}
+                            href={buildGitProviderUrl(gitRepository.url, gitRepository.branch)}
                             underline
                             color="neutral"
                             size="ssm"
@@ -146,13 +170,89 @@ export function ArgoCdServiceList({ environment }: ArgoCdServiceListProps) {
                             onClick={stopRowNavigation}
                             onKeyDown={stopRowNavigation}
                           >
-                            <span className="min-w-0 truncate" title={repositoryLabel}>
-                              {repositoryLabel}
+                            <span className="min-w-0 truncate" title={gitRepository.branch}>
+                              {gitRepository.branch}
                             </span>
                           </ExternalLink>
                         </div>
                       ) : null}
                     </div>
+                    {manifestRevision && (
+                      <CopyToClipboard text={manifestRevision} className="ml-3 shrink-0">
+                        <Button
+                          type="button"
+                          variant="outline"
+                          color="neutral"
+                          size="xs"
+                          className="pl-1"
+                          onClick={stopRowNavigation}
+                          onKeyDown={stopRowNavigation}
+                        >
+                          <Icon iconName="code-commit" className="w-4" />
+                          {manifestRevision.substring(0, 7)}
+                        </Button>
+                      </CopyToClipboard>
+                    )}
+                  </Table.Cell>
+
+                  <Table.Cell className="flex h-full items-center justify-center">
+                    <div className="flex items-center gap-1.5" onClick={stopRowNavigation}>
+                      <Tooltip content="Logs">
+                        <Link
+                          as="button"
+                          aria-label={`Service logs for ${service.name}`}
+                          to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
+                          params={{
+                            organizationId,
+                            projectId,
+                            environmentId,
+                            serviceId: service.id,
+                          }}
+                          color="neutral"
+                          variant="outline"
+                          size="sm"
+                          iconOnly
+                          onClick={stopRowNavigation}
+                          onKeyDown={stopRowNavigation}
+                        >
+                          <Icon iconName="scroll" />
+                        </Link>
+                      </Tooltip>
+
+                      <DropdownMenu.Root>
+                        <DropdownMenu.Trigger asChild>
+                          <Button
+                            aria-label={`Other actions for ${service.name}`}
+                            variant="outline"
+                            size="sm"
+                            iconOnly
+                            onKeyDown={stopRowNavigation}
+                          >
+                            <Tooltip content="Other actions">
+                              <div className="flex h-full w-full items-center justify-center">
+                                <Icon iconName="ellipsis-v" />
+                              </div>
+                            </Tooltip>
+                          </Button>
+                        </DropdownMenu.Trigger>
+                        <DropdownMenu.Content>
+                          <DropdownMenu.Item icon={<Icon iconName="gear" />} asChild>
+                            <Link
+                              className="gap-0"
+                              to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/manifest"
+                              params={{
+                                organizationId,
+                                projectId,
+                                environmentId,
+                                serviceId: service.id,
+                              }}
+                            >
+                              See manifest
+                            </Link>
+                          </DropdownMenu.Item>
+                        </DropdownMenu.Content>
+                      </DropdownMenu.Root>
+                    </div>
                   </Table.Cell>
                 </Table.Row>
               )
diff --git a/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.spec.tsx b/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.spec.tsx
index 481db2fafec..21cdda39ea3 100644
--- a/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.spec.tsx
+++ b/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.spec.tsx
@@ -59,8 +59,13 @@ const services = {
     name: 'kube-dns-prod',
     description: '',
     icon_uri: 'app://qovery-console/argocd',
-    source_repo_url: 'https://github.com/Qovery/kube-dns.git',
-    source_target_revision: 'main',
+    git_repository: {
+      provider: 'GITHUB',
+      owner: 'Qovery',
+      url: 'https://github.com/Qovery/kube-dns.git',
+      name: 'Qovery/kube-dns',
+      branch: 'main',
+    },
   },
 }
 
diff --git a/package.json b/package.json
index f53ad666a68..e00f5ef069a 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "mermaid": "11.6.0",
     "monaco-editor": "0.53.0",
     "posthog-js": "1.345.1",
-    "qovery-typescript-axios": "1.1.889",
+    "qovery-typescript-axios": "1.1.891",
     "react": "18.3.1",
     "react-country-flag": "3.0.2",
     "react-datepicker": "4.12.0",
diff --git a/yarn.lock b/yarn.lock
index a93e00edf0b..1fcdd2d0273 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6369,7 +6369,7 @@ __metadata:
     prettier: 3.2.5
     prettier-plugin-tailwindcss: 0.5.14
     pretty-quick: 4.0.0
-    qovery-typescript-axios: 1.1.889
+    qovery-typescript-axios: 1.1.891
     qovery-ws-typescript-axios: 0.1.586
     react: 18.3.1
     react-country-flag: 3.0.2
@@ -26327,12 +26327,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qovery-typescript-axios@npm:1.1.889":
-  version: 1.1.889
-  resolution: "qovery-typescript-axios@npm:1.1.889"
+"qovery-typescript-axios@npm:1.1.891":
+  version: 1.1.891
+  resolution: "qovery-typescript-axios@npm:1.1.891"
   dependencies:
     axios: 1.15.2
-  checksum: 4feb2907a88f82ed65c822bb223a5baa3ac8e9b4164c6ab7a11d1efe8acbc69681770a09aaa0c34eb5ea353bcc27e6c1b04b067e3070272d10c1bd41d294183b
+  checksum: 6903edb42bb9a4146123e26e8fd0d36a0375c44d0479eb758ccf26a3531013def7a390f9c07a705d3203e64b06e18fb967eeaa314cad0803f7719fcbb97dd49f
   languageName: node
   linkType: hard