diff --git a/libs/domains/services/feature/src/index.ts b/libs/domains/services/feature/src/index.ts
index 815068ecfb4..9e53a18022a 100644
--- a/libs/domains/services/feature/src/index.ts
+++ b/libs/domains/services/feature/src/index.ts
@@ -1,3 +1,4 @@
+export * from './lib/auto-deploy-badge/auto-deploy-badge'
 export * from './lib/auto-deploy-setting/auto-deploy-setting'
 export * from './lib/auto-deploy-section/auto-deploy-section'
 export * from './lib/git-webhook-status-badge/git-webhook-status-badge'
diff --git a/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx b/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx
new file mode 100644
index 00000000000..509f0e49c25
--- /dev/null
+++ b/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx
@@ -0,0 +1,70 @@
+import { type IconName } from '@fortawesome/fontawesome-common-types'
+import { type GitWebhookStatusResponse } from 'qovery-typescript-axios'
+import { useParams } from 'react-router-dom'
+import { APPLICATION_SETTINGS_GENERAL_URL, APPLICATION_SETTINGS_URL, APPLICATION_URL } from '@qovery/shared/routes'
+import { Icon, Link, LoaderSpinner, Tooltip } from '@qovery/shared/ui'
+import { useGitWebhookStatus } from '../hooks/use-git-webhook-status/use-git-webhook-status'
+
+export interface AutoDeployBadgeProps {
+  serviceId: string
+}
+
+const webhookStatusConfig: Record<
+  GitWebhookStatusResponse['status'],
+  {
+    icon: IconName
+    iconClassName: string
+    tooltip: string
+  }
+> = {
+  ACTIVE: {
+    icon: 'circle-check',
+    iconClassName: 'text-green-500',
+    tooltip: 'Webhook is correctly configured. Auto-deploy will trigger on git events.',
+  },
+  NOT_CONFIGURED: {
+    icon: 'circle-question',
+    iconClassName: 'text-red-500',
+    tooltip: 'No webhook found for auto-deployment. Click to configure it in settings.',
+  },
+  MISCONFIGURED: {
+    icon: 'triangle-exclamation',
+    iconClassName: 'text-yellow-500',
+    tooltip: 'Webhook is missing required events. Click to fix it in settings.',
+  },
+  UNABLE_TO_VERIFY: {
+    icon: 'circle-exclamation',
+    iconClassName: 'text-neutral-350',
+    tooltip:
+      "Couldn't verify webhook status. This could be due to expired credentials, insufficient permissions, or git provider API unavailability.",
+  },
+}
+
+export function AutoDeployBadge({ serviceId }: AutoDeployBadgeProps) {
+  const { organizationId = '', projectId = '', environmentId = '', applicationId = '' } = useParams()
+  const { data: webhookStatus, isLoading } = useGitWebhookStatus({ serviceId })
+
+  const config = webhookStatus ? webhookStatusConfig[webhookStatus.status] : undefined
+  const tooltipContent = config?.tooltip ?? 'Auto-deploy enabled. Click to view settings.'
+
+  const settingsUrl =
+    APPLICATION_URL(organizationId, projectId, environmentId, applicationId) +
+    APPLICATION_SETTINGS_URL +
+    APPLICATION_SETTINGS_GENERAL_URL
+
+  return (
+    <Tooltip content={tooltipContent}>
+      <Link as="button" color="neutral" variant="surface" size="xs" to={settingsUrl}>
+        <Icon className="text-neutral-350" iconName="arrows-rotate" />
+        <span className="ml-1.5">Auto-deploy</span>
+        {isLoading ? (
+          <LoaderSpinner classWidth="w-3" />
+        ) : (
+          config && <Icon iconName={config.icon} className={`ml-1 text-xs ${config.iconClassName}`} />
+        )}
+      </Link>
+    </Tooltip>
+  )
+}
+
+export default AutoDeployBadge
diff --git a/libs/pages/application/src/lib/ui/container/container.tsx b/libs/pages/application/src/lib/ui/container/container.tsx
index 303cfb33fd7..ae8597131e5 100644
--- a/libs/pages/application/src/lib/ui/container/container.tsx
+++ b/libs/pages/application/src/lib/ui/container/container.tsx
@@ -6,6 +6,7 @@ import { useCluster } from '@qovery/domains/clusters/feature'
 import { EnvironmentMode, useEnvironment } from '@qovery/domains/environments/feature'
 import { type AnyService, type Database } from '@qovery/domains/services/data-access'
 import {
+  AutoDeployBadge,
   NeedRedeployFlag,
   ServiceActionToolbar,
   ServiceAvatar,
@@ -15,7 +16,7 @@ import {
   useService,
 } from '@qovery/domains/services/feature'
 import { VariablesProvider } from '@qovery/domains/variables/feature'
-import { IconEnum } from '@qovery/shared/enums'
+import { IconEnum, isHelmGitSource, isJobGitSource } from '@qovery/shared/enums'
 import {
   APPLICATION_DEPLOYMENTS_URL,
   APPLICATION_GENERAL_URL,
@@ -155,14 +156,21 @@ export function Container({ children }: ContainerProps) {
             </Link>
           </Tooltip>
         </Skeleton>
-        <Skeleton width={22} height={24} show={!service}>
-          {service && 'auto_deploy' in service && service.auto_deploy && (
-            <Tooltip content="Auto-deploy">
-              <Badge variant="outline">
-                <Icon className="text-neutral-350" iconName="arrows-rotate" />
-              </Badge>
-            </Tooltip>
-          )}
+        <Skeleton width={120} height={24} show={!service}>
+          {service &&
+            'auto_deploy' in service &&
+            service.auto_deploy &&
+            match(service)
+              .with({ serviceType: 'APPLICATION' }, { serviceType: 'TERRAFORM' }, () => (
+                <AutoDeployBadge serviceId={service.id} />
+              ))
+              .with({ serviceType: 'JOB' }, (job) =>
+                isJobGitSource(job.source) ? <AutoDeployBadge serviceId={service.id} /> : null
+              )
+              .with({ serviceType: 'HELM' }, (helm) =>
+                isHelmGitSource(helm.source) ? <AutoDeployBadge serviceId={service.id} /> : null
+              )
+              .otherwise(() => null)}
         </Skeleton>
       </div>
     </div>