diff --git a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.spec.tsx b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.spec.tsx
index 54aa7bdfe91..1b47992f464 100644
--- a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.spec.tsx
+++ b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.spec.tsx
@@ -15,6 +15,7 @@ describe('EnvironmentStages', () => {
     },
     environmentStatus: {
       state: 'RUNNING',
+      last_deployment_id: 'exec-1',
     },
     hideSkipped: false,
     setHideSkipped: jest.fn(),
@@ -54,7 +55,7 @@ describe('EnvironmentStages', () => {
     const logLink = screen.getByText('Pre-check logs').closest('a')
     expect(logLink).toHaveAttribute(
       'href',
-      ENVIRONMENT_LOGS_URL('org-1', 'proj-1', 'env-1') + ENVIRONMENT_PRE_CHECK_LOGS_URL()
+      ENVIRONMENT_LOGS_URL('org-1', 'proj-1', 'env-1') + ENVIRONMENT_PRE_CHECK_LOGS_URL('exec-1')
     )
   })
 })
diff --git a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
index c749a8145d8..a7075bef88b 100644
--- a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
+++ b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
@@ -32,7 +32,7 @@ export function EnvironmentStages({
   setHideSkipped,
   children,
 }: EnvironmentStagesProps) {
-  const executionId = environmentStatus.last_deployment_id ?? undefined
+  const executionId = environmentStatus.last_deployment_id
 
   return (
     <div className="h-[calc(100vh-64px)] w-[calc(100vw-64px)] p-1">
@@ -75,21 +75,26 @@ export function EnvironmentStages({
                           </span>
                         </div>
                       </div>
-                      <div className="flex flex-col gap-1.5 bg-neutral-800 p-1.5">
-                        <NavLink
-                          to={
-                            ENVIRONMENT_LOGS_URL(environment.organization.id, environment.project.id, environment.id) +
-                            ENVIRONMENT_PRE_CHECK_LOGS_URL(executionId)
-                          }
-                          className="flex w-full items-center gap-2.5 rounded border border-neutral-400 bg-neutral-550 px-2.5 py-2 hover:border-brand-400"
-                        >
-                          <span className="flex h-8 w-8 items-center justify-center rounded-full border border-neutral-400 text-neutral-250">
-                            <Icon iconName="list-check" iconStyle="solid" />
-                          </span>
-                          <span className="text-sm">Pre-check logs</span>
-                          <StatusChip className="ml-auto" status={preCheckStage.status} />
-                        </NavLink>
-                      </div>
+                      {executionId && (
+                        <div className="flex flex-col gap-1.5 bg-neutral-800 p-1.5">
+                          <NavLink
+                            to={
+                              ENVIRONMENT_LOGS_URL(
+                                environment.organization.id,
+                                environment.project.id,
+                                environment.id
+                              ) + ENVIRONMENT_PRE_CHECK_LOGS_URL(executionId)
+                            }
+                            className="flex w-full items-center gap-2.5 rounded border border-neutral-400 bg-neutral-550 px-2.5 py-2 hover:border-brand-400"
+                          >
+                            <span className="flex h-8 w-8 items-center justify-center rounded-full border border-neutral-400 text-neutral-250">
+                              <Icon iconName="list-check" iconStyle="solid" />
+                            </span>
+                            <span className="text-sm">Pre-check logs</span>
+                            <StatusChip className="ml-auto" status={preCheckStage.status} />
+                          </NavLink>
+                        </div>
+                      )}
                     </div>
                     <div className="mt-4 w-4">
                       <svg xmlns="http://www.w3.org/2000/svg" width="17" height="9" fill="none" viewBox="0 0 17 9">
diff --git a/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.spec.tsx b/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.spec.tsx
index 309ca6c2e70..c1a118acf84 100644
--- a/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.spec.tsx
+++ b/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.spec.tsx
@@ -22,14 +22,14 @@ describe('DeploymentLogsPlaceholder', () => {
   const props: DeploymentLogsPlaceholderProps = {
     serviceStatus: undefined,
     itemsLength: 0,
-    deploymentHistoryEnvironment: [],
+    environmentDeploymentHistory: [],
   }
 
   it('should render deployment history', () => {
     renderWithProviders(
       <DeploymentLogsPlaceholder
         itemsLength={1}
-        deploymentHistoryEnvironment={[
+        environmentDeploymentHistory={[
           {
             identifier: {
               execution_id: 'exec-1',
@@ -98,7 +98,7 @@ describe('DeploymentLogsPlaceholder', () => {
     renderWithProviders(
       <DeploymentLogsPlaceholder
         itemsLength={0}
-        deploymentHistoryEnvironment={[]}
+        environmentDeploymentHistory={[]}
         serviceStatus={{
           id: '0',
           state: 'DEPLOYED',
diff --git a/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.tsx b/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.tsx
index 843002fb81d..af6666c579a 100644
--- a/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.tsx
+++ b/libs/domains/service-logs/feature/src/lib/deployment-logs-placeholder/deployment-logs-placeholder.tsx
@@ -73,13 +73,13 @@ function DeploymentHistoryPlaceholder({
 export interface DeploymentLogsPlaceholderProps {
   serviceStatus?: Status
   itemsLength?: number
-  deploymentHistoryEnvironment?: DeploymentHistoryEnvironmentV2[]
+  environmentDeploymentHistory?: DeploymentHistoryEnvironmentV2[]
 }
 
 export function DeploymentLogsPlaceholder({
   serviceStatus,
   itemsLength,
-  deploymentHistoryEnvironment,
+  environmentDeploymentHistory,
 }: DeploymentLogsPlaceholderProps) {
   const { environmentId = '', serviceId = '' } = useParams()
 
@@ -105,7 +105,7 @@ export function DeploymentLogsPlaceholder({
     )
     .otherwise(() => false)
 
-  const deploymentsByServiceId = mergeDeploymentServices(deploymentHistoryEnvironment).filter(
+  const deploymentsByServiceId = mergeDeploymentServices(environmentDeploymentHistory).filter(
     (deploymentHistory) => deploymentHistory.identifier.service_id === serviceId
   )
 
diff --git a/libs/domains/service-logs/feature/src/lib/hooks/use-deployment-logs/use-deployment-logs.ts b/libs/domains/service-logs/feature/src/lib/hooks/use-deployment-logs/use-deployment-logs.ts
index 7c34cea94bd..06a876b92b5 100644
--- a/libs/domains/service-logs/feature/src/lib/hooks/use-deployment-logs/use-deployment-logs.ts
+++ b/libs/domains/service-logs/feature/src/lib/hooks/use-deployment-logs/use-deployment-logs.ts
@@ -6,6 +6,7 @@ import { useEnvironment } from '@qovery/domains/environments/feature'
 import { QOVERY_WS } from '@qovery/shared/util-node-env'
 import { useReactQueryWsSubscription } from '@qovery/state/util-queries'
 import { ServiceStageIdsContext } from '../../service-stage-ids-context/service-stage-ids-context'
+import { useDeploymentHistory } from '../use-deployment-history/use-deployment-history'
 
 export interface UseDeploymentLogsProps {
   organizationId?: string
@@ -31,6 +32,7 @@ export function useDeploymentLogs({
   versionId,
 }: UseDeploymentLogsProps) {
   const { hash } = useLocation()
+  const { data: deploymentHistory = [] } = useDeploymentHistory({ environmentId: environmentId ?? '' })
   const { data: environment } = useEnvironment({ environmentId })
 
   // States for controlling log actions, showing new, previous or paused logs
@@ -60,6 +62,9 @@ export function useDeploymentLogs({
     [setMessageChunks]
   )
 
+  // XXX: If we don't have a version, it works like WS otherwise, it works like a REST API
+  const isLatestVersion = deploymentHistory[0]?.identifier.execution_id === versionId
+
   useReactQueryWsSubscription({
     url: QOVERY_WS + '/deployment/logs',
     urlSearchParams: {
@@ -67,7 +72,7 @@ export function useDeploymentLogs({
       cluster: environment?.cluster_id,
       project: projectId,
       environment: environmentId,
-      version: versionId,
+      version: isLatestVersion ? undefined : versionId,
     },
     enabled:
       Boolean(organizationId) && Boolean(environment?.cluster_id) && Boolean(projectId) && Boolean(environmentId),
diff --git a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.spec.tsx b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.spec.tsx
index c8c6b718467..0e75040716e 100644
--- a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.spec.tsx
+++ b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.spec.tsx
@@ -21,17 +21,22 @@ jest.mock('react-router-dom', () => ({
   }),
 }))
 
+jest.mock('../hooks/use-deployment-history/use-deployment-history', () => ({
+  ...jest.requireActual('../hooks/use-deployment-history/use-deployment-history'),
+  useDeploymentHistory: () => ({
+    data: [
+      {
+        identifier: {
+          execution_id: '4',
+        },
+      },
+    ],
+  }),
+}))
+
 describe('ListDeploymentLogs', () => {
   const mockEnvironment = environmentFactoryMock(1)[0]
 
-  const mockDeploymentHistoryEnvironment: DeploymentHistoryEnvironmentV2[] = [
-    {
-      identifier: {
-        execution_id: '4',
-      },
-    },
-  ]
-
   const mockServiceStatus: Status = {
     id: '111',
     state: 'DELETE_ERROR',
@@ -120,23 +125,13 @@ describe('ListDeploymentLogs', () => {
 
   it('should render successfully', () => {
     const { baseElement } = renderWithProviders(
-      <ListDeploymentLogs
-        environment={mockEnvironment}
-        deploymentHistoryEnvironment={mockDeploymentHistoryEnvironment}
-        serviceStatus={mockServiceStatus}
-      />
+      <ListDeploymentLogs environment={mockEnvironment} serviceStatus={mockServiceStatus} />
     )
     expect(baseElement).toBeTruthy()
   })
 
   it('should display logs', () => {
-    renderWithProviders(
-      <ListDeploymentLogs
-        environment={mockEnvironment}
-        deploymentHistoryEnvironment={mockDeploymentHistoryEnvironment}
-        serviceStatus={mockServiceStatus}
-      />
-    )
+    renderWithProviders(<ListDeploymentLogs environment={mockEnvironment} serviceStatus={mockServiceStatus} />)
 
     expect(screen.getByText('Log 1')).toBeInTheDocument()
     expect(screen.getByText('Log 2')).toBeInTheDocument()
@@ -144,11 +139,7 @@ describe('ListDeploymentLogs', () => {
 
   it('should filter logs by stage step', async () => {
     const { userEvent } = renderWithProviders(
-      <ListDeploymentLogs
-        environment={mockEnvironment}
-        deploymentHistoryEnvironment={mockDeploymentHistoryEnvironment}
-        serviceStatus={mockServiceStatus}
-      />
+      <ListDeploymentLogs environment={mockEnvironment} serviceStatus={mockServiceStatus} />
     )
 
     const buildButton = screen.getByRole('button', { name: /build/i })
@@ -165,13 +156,7 @@ describe('ListDeploymentLogs', () => {
       data: { state: 'BUILDING' },
     })
 
-    renderWithProviders(
-      <ListDeploymentLogs
-        environment={mockEnvironment}
-        deploymentHistoryEnvironment={mockDeploymentHistoryEnvironment}
-        serviceStatus={mockServiceStatus}
-      />
-    )
+    renderWithProviders(<ListDeploymentLogs environment={mockEnvironment} serviceStatus={mockServiceStatus} />)
 
     expect(screen.getByText('Streaming deployment logs')).toBeInTheDocument()
   })
diff --git a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
index f3ad5772e38..2564941f2ca 100644
--- a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
+++ b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
@@ -7,13 +7,7 @@ import {
   useReactTable,
 } from '@tanstack/react-table'
 import download from 'downloadjs'
-import {
-  type DeploymentHistoryEnvironmentV2,
-  type Environment,
-  type EnvironmentStatus,
-  type Stage,
-  type Status,
-} from 'qovery-typescript-axios'
+import { type Environment, type EnvironmentStatus, type Stage, type Status } from 'qovery-typescript-axios'
 import { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'
 import { useLocation, useParams } from 'react-router-dom'
 import { match } from 'ts-pattern'
@@ -22,6 +16,7 @@ import { ENVIRONMENT_LOGS_URL, ENVIRONMENT_STAGES_URL, SERVICE_LOGS_URL } from '
 import { Button, Icon, Indicator, Link, TablePrimitives } from '@qovery/shared/ui'
 import { DeploymentLogsPlaceholder } from '../deployment-logs-placeholder/deployment-logs-placeholder'
 import HeaderLogs from '../header-logs/header-logs'
+import { useDeploymentHistory } from '../hooks/use-deployment-history/use-deployment-history'
 import { type EnvironmentLogIds, useDeploymentLogs } from '../hooks/use-deployment-logs/use-deployment-logs'
 import { ProgressIndicator } from '../progress-indicator/progress-indicator'
 import { ServiceStageIdsContext } from '../service-stage-ids-context/service-stage-ids-context'
@@ -126,19 +121,12 @@ const getFilterStep = (step: EnvironmentEngineStep): FilterType =>
 
 export interface ListDeploymentLogsProps {
   environment: Environment
-  deploymentHistoryEnvironment: DeploymentHistoryEnvironmentV2[]
   serviceStatus: Status
   stage?: Stage
   environmentStatus?: EnvironmentStatus
 }
 
-export function ListDeploymentLogs({
-  environment,
-  deploymentHistoryEnvironment,
-  environmentStatus,
-  serviceStatus,
-  stage,
-}: ListDeploymentLogsProps) {
+export function ListDeploymentLogs({ environment, environmentStatus, serviceStatus, stage }: ListDeploymentLogsProps) {
   const { hash } = useLocation()
   const { organizationId, projectId, serviceId, versionId } = useParams()
   const refScrollSection = useRef<HTMLDivElement>(null)
@@ -150,6 +138,7 @@ export function ListDeploymentLogs({
 
   const { data: service } = useService({ environmentId: environment.id, serviceId })
   const { data: deploymentStatus } = useDeploymentStatus({ environmentId: environment.id, serviceId })
+  const { data: environmentDeploymentHistory = [] } = useDeploymentHistory({ environmentId: environment.id })
   const {
     data: logs = [],
     pauseLogs,
@@ -272,7 +261,7 @@ export function ListDeploymentLogs({
     [columnFilters]
   )
 
-  const isLastVersion = deploymentHistoryEnvironment?.[0]?.identifier.execution_id === versionId || !versionId
+  const isLastVersion = environmentDeploymentHistory?.[0]?.identifier.execution_id === versionId || !versionId
   const isDeploymentProgressing = isLastVersion
     ? match(deploymentStatus?.state)
         .with(
@@ -302,8 +291,8 @@ export function ListDeploymentLogs({
         environmentStatus={environmentStatus}
         deploymentHistory={
           versionId
-            ? deploymentHistoryEnvironment.find((d) => d.identifier.execution_id === versionId)
-            : deploymentHistoryEnvironment[0]
+            ? environmentDeploymentHistory.find((d) => d.identifier.execution_id === versionId)
+            : environmentDeploymentHistory[0]
         }
       >
         <div className="flex items-center gap-4">
@@ -365,7 +354,7 @@ export function ListDeploymentLogs({
             <DeploymentLogsPlaceholder
               serviceStatus={serviceStatus}
               itemsLength={logs.length}
-              deploymentHistoryEnvironment={deploymentHistoryEnvironment}
+              environmentDeploymentHistory={environmentDeploymentHistory}
             />
           </div>
         </div>
@@ -426,11 +415,13 @@ export function ListDeploymentLogs({
             <ProgressIndicator className="mb-2 pl-2" pauseLogs={pauseLogs} message="Streaming deployment logs" />
           )}
         </div>
-        <ShowNewLogsButton
-          pauseLogs={pauseLogs}
-          setPauseLogs={setPauseLogs}
-          newMessagesAvailable={newMessagesAvailable}
-        />
+        {isLastVersion && (
+          <ShowNewLogsButton
+            pauseLogs={pauseLogs}
+            setPauseLogs={setPauseLogs}
+            newMessagesAvailable={newMessagesAvailable}
+          />
+        )}
       </div>
     </div>
   )
diff --git a/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
index c3050e2e1ac..f789a869152 100644
--- a/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
@@ -33,12 +33,12 @@ exports[`RedeployModal should match snapshot 1`] = `
               value="redeploy"
             />
             <label
-              class="font-medium leading-5 text-neutral-400 text-ssm"
+              class="font-medium leading-5 text-neutral-400 dark:text-neutral-50 text-ssm"
               for="redeploy"
             >
               Redeploy
               <p
-                class="mt-1 text-xs font-normal text-neutral-350"
+                class="mt-1 text-xs font-normal text-neutral-350 dark:text-neutral-50"
               >
                 This action will not restart your service but it will allow to align again your configuration with your cluster.
               </p>
@@ -55,12 +55,12 @@ exports[`RedeployModal should match snapshot 1`] = `
               value="restart"
             />
             <label
-              class="font-medium leading-5 text-neutral-400 text-ssm"
+              class="font-medium leading-5 text-neutral-400 dark:text-neutral-50 text-ssm"
               for="restart"
             >
               Restart service
               <p
-                class="mt-1 text-xs font-normal text-neutral-350"
+                class="mt-1 text-xs font-normal text-neutral-350 dark:text-neutral-50"
               >
                 To restart the pods of your service.
               </p>
diff --git a/libs/pages/layout/src/lib/ui/breadcrumb/breadcrumb.tsx b/libs/pages/layout/src/lib/ui/breadcrumb/breadcrumb.tsx
index c40b368ba43..3e40d520473 100644
--- a/libs/pages/layout/src/lib/ui/breadcrumb/breadcrumb.tsx
+++ b/libs/pages/layout/src/lib/ui/breadcrumb/breadcrumb.tsx
@@ -51,7 +51,6 @@ export function Breadcrumb(props: BreadcrumbProps) {
   const matchClusters = useMatch({ path: CLUSTERS_URL(), end: false })
   const matchEnvironmentLogs = useMatch({ path: ENVIRONMENT_LOGS_URL(), end: false })
   const matchServiceLogs = useMatch({ path: ENVIRONMENT_LOGS_URL() + SERVICE_LOGS_URL(), end: false })
-  const matchDeploymentLogs = useMatch({ path: ENVIRONMENT_LOGS_URL() + DEPLOYMENT_LOGS_URL(), end: false })
   const matchEnvironmentStage = useMatch({
     path: ENVIRONMENT_LOGS_URL() + ENVIRONMENT_STAGES_URL(),
     end: false,
@@ -60,10 +59,7 @@ export function Breadcrumb(props: BreadcrumbProps) {
     path: ENVIRONMENT_LOGS_URL() + ENVIRONMENT_STAGES_URL(':versionId'),
     end: false,
   })
-  const matchEnvironmentPreCheck = useMatch({
-    path: ENVIRONMENT_LOGS_URL() + ENVIRONMENT_PRE_CHECK_LOGS_URL(),
-    end: false,
-  })
+
   const matchEnvironmentPreCheckVersion = useMatch({
     path: ENVIRONMENT_LOGS_URL() + ENVIRONMENT_PRE_CHECK_LOGS_URL(':versionId'),
     end: false,
@@ -373,7 +369,7 @@ export function Breadcrumb(props: BreadcrumbProps) {
             link=""
           />
         )}
-        {(matchDeploymentLogsVersion || matchDeploymentLogs) &&
+        {(matchDeploymentLogsVersion || matchDeploymentLogsVersion) &&
           statusStages &&
           isFetchedStatusStages &&
           services.length > 0 && (
@@ -382,10 +378,14 @@ export function Breadcrumb(props: BreadcrumbProps) {
               <div className="flex items-center">
                 <BreadcrumbDeploymentLogs
                   serviceId={
-                    matchDeploymentLogsVersion?.params['serviceId'] || matchDeploymentLogs?.params['serviceId'] || ''
+                    matchDeploymentLogsVersion?.params['serviceId'] ||
+                    matchDeploymentLogsVersion?.params['serviceId'] ||
+                    ''
                   }
                   versionId={
-                    matchDeploymentLogsVersion?.params['versionId'] || matchDeploymentLogs?.params['versionId'] || ''
+                    matchDeploymentLogsVersion?.params['versionId'] ||
+                    matchDeploymentLogsVersion?.params['versionId'] ||
+                    ''
                   }
                   services={services}
                   statusStages={statusStages}
@@ -395,28 +395,26 @@ export function Breadcrumb(props: BreadcrumbProps) {
               <BreadcrumbDeploymentHistory
                 type="DEPLOYMENT"
                 serviceId={
-                  matchDeploymentLogsVersion?.params['serviceId'] || matchDeploymentLogs?.params['serviceId'] || ''
+                  matchDeploymentLogsVersion?.params['serviceId'] ||
+                  matchDeploymentLogsVersion?.params['serviceId'] ||
+                  ''
                 }
                 versionId={matchDeploymentLogsVersion?.params['versionId']}
               />
             </>
           )}
-        {(matchEnvironmentStage ||
-          matchEnvironmentStageVersion ||
-          matchEnvironmentPreCheck ||
-          matchEnvironmentPreCheckVersion) &&
-          statusStages && (
-            <>
-              <div className="mx-3 mt-3 h-auto w-4 text-center text-neutral-300 dark:text-neutral-500">/</div>
-              <BreadcrumbDeploymentHistory
-                type={matchEnvironmentPreCheck ? 'PRE_CHECK' : 'STAGES'}
-                versionId={
-                  matchEnvironmentStageVersion?.params['versionId'] ||
-                  matchEnvironmentPreCheckVersion?.params['versionId']
-                }
-              />
-            </>
-          )}
+        {(matchEnvironmentStage || matchEnvironmentStageVersion || matchEnvironmentPreCheckVersion) && statusStages && (
+          <>
+            <div className="mx-3 mt-3 h-auto w-4 text-center text-neutral-300 dark:text-neutral-500">/</div>
+            <BreadcrumbDeploymentHistory
+              type={matchEnvironmentPreCheckVersion ? 'PRE_CHECK' : 'STAGES'}
+              versionId={
+                matchEnvironmentStageVersion?.params['versionId'] ||
+                matchEnvironmentPreCheckVersion?.params['versionId']
+              }
+            />
+          </>
+        )}
         {matchServiceLogs && services && (
           <>
             <div className="mx-3 mt-3 h-auto w-4 text-center text-neutral-300 dark:text-neutral-500">/</div>
diff --git a/libs/pages/logs/environment/src/lib/feature/deployment-logs-feature/deployment-logs-feature.tsx b/libs/pages/logs/environment/src/lib/feature/deployment-logs-feature/deployment-logs-feature.tsx
index 4c7d1e047d0..a57ae7e1f72 100644
--- a/libs/pages/logs/environment/src/lib/feature/deployment-logs-feature/deployment-logs-feature.tsx
+++ b/libs/pages/logs/environment/src/lib/feature/deployment-logs-feature/deployment-logs-feature.tsx
@@ -7,7 +7,6 @@ import {
 } from 'qovery-typescript-axios'
 import { memo } from 'react'
 import { useParams } from 'react-router-dom'
-import { useDeploymentHistory } from '@qovery/domains/environments/feature'
 import { ListDeploymentLogs, SidebarPodStatuses } from '@qovery/domains/service-logs/feature'
 import { useService } from '@qovery/domains/services/feature'
 import { useDocumentTitle } from '@qovery/shared/util-hooks'
@@ -100,7 +99,6 @@ export function DeploymentLogsFeature({
   const { serviceId = '' } = useParams()
 
   const { data: service, isFetched: isFetchedService } = useService({ environmentId: environment.id, serviceId })
-  const { data: deploymentHistoryEnvironment = [] } = useDeploymentHistory({ environmentId: environment.id })
 
   useDocumentTitle(`Deployment logs - ${service?.name ?? 'Loading...'}`)
 
@@ -126,7 +124,6 @@ export function DeploymentLogsFeature({
       >
         <ListDeploymentLogs
           environment={environment}
-          deploymentHistoryEnvironment={deploymentHistoryEnvironment}
           serviceStatus={serviceStatus}
           environmentStatus={environmentStatus}
           stage={stageFromServiceId}
diff --git a/libs/pages/logs/environment/src/lib/feature/environment-stages-feature/environment-stages-feature.tsx b/libs/pages/logs/environment/src/lib/feature/environment-stages-feature/environment-stages-feature.tsx
index 838bc2f56f2..0c3694b8368 100644
--- a/libs/pages/logs/environment/src/lib/feature/environment-stages-feature/environment-stages-feature.tsx
+++ b/libs/pages/logs/environment/src/lib/feature/environment-stages-feature/environment-stages-feature.tsx
@@ -161,7 +161,10 @@ export function EnvironmentStagesFeature({
                         if (hideSkipped && !service.is_part_last_deployment) return null
                         if (!fullService)
                           return (
-                            <div className="flex w-full items-center gap-2.5 rounded border border-neutral-400 bg-neutral-550 px-2.5 py-2">
+                            <div
+                              key={service?.id}
+                              className="flex w-full items-center gap-2.5 rounded border border-neutral-400 bg-neutral-550 px-2.5 py-2"
+                            >
                               <span className="flex h-8 w-8 items-center justify-center rounded-full border border-neutral-400 text-neutral-250">
                                 <Icon iconName="trash-can-xmark" iconStyle="solid" />
                               </span>
diff --git a/libs/pages/logs/environment/src/lib/page-environment-logs.tsx b/libs/pages/logs/environment/src/lib/page-environment-logs.tsx
index ef13cfe1801..e40ec3a82a6 100644
--- a/libs/pages/logs/environment/src/lib/page-environment-logs.tsx
+++ b/libs/pages/logs/environment/src/lib/page-environment-logs.tsx
@@ -6,7 +6,7 @@ import {
 } from 'qovery-typescript-axios'
 import { useCallback, useState } from 'react'
 import { Navigate, Route, Routes, matchPath, useLocation, useParams } from 'react-router-dom'
-import { useEnvironment } from '@qovery/domains/environments/feature'
+import { useDeploymentHistory, useEnvironment } from '@qovery/domains/environments/feature'
 import { ServiceStageIdsProvider } from '@qovery/domains/service-logs/feature'
 import {
   DEPLOYMENT_LOGS_URL,
@@ -25,10 +25,35 @@ import EnvironmentStagesFeature from './feature/environment-stages-feature/envir
 import PodLogsFeature from './feature/pod-logs-feature/pod-logs-feature'
 import PreCheckLogsFeature from './feature/pre-check-logs-feature/pre-check-logs-feature'
 
+// XXX: This is a workaround to redirect to the last deployment logs with (execution_id/last_deployment_id)
+// We don't authorize to see the deployment without versionId
+function RedirectDeploymentLogs({
+  organizationId,
+  projectId,
+  environmentId,
+  lastDeploymentId,
+}: {
+  organizationId: string
+  projectId: string
+  environmentId: string
+  lastDeploymentId: string
+}) {
+  const { serviceId = '' } = useParams()
+  return (
+    <Navigate
+      to={
+        ENVIRONMENT_LOGS_URL(organizationId, projectId, environmentId) +
+        DEPLOYMENT_LOGS_VERSION_URL(serviceId, lastDeploymentId)
+      }
+    />
+  )
+}
+
 export function PageEnvironmentLogs() {
   const { organizationId = '', projectId = '', environmentId = '' } = useParams()
   const location = useLocation()
   const { data: environment } = useEnvironment({ environmentId })
+  const { data: environmentDeploymentHistory = [] } = useDeploymentHistory({ environmentId })
 
   useDocumentTitle(`Environment logs ${environment ? `- ${environment?.name}` : '- Loading...'}`)
 
@@ -60,6 +85,9 @@ export function PageEnvironmentLogs() {
   const [environmentStatus, setEnvironmentStatus] = useState<EnvironmentStatus>()
   const [preCheckStage, setPreCheckStage] = useState<EnvironmentStatusesWithStagesPreCheckStage>()
 
+  const versionIdUrl = deploymentVersionId || preCheckVersionId || stageVersionId
+  const isLatestVersion = environmentDeploymentHistory[0]?.identifier.execution_id === versionIdUrl
+
   const messageHandler = useCallback(
     (
       _: QueryClient,
@@ -79,6 +107,7 @@ export function PageEnvironmentLogs() {
     },
     [setDeploymentStages]
   )
+  // XXX: If we don't have a version, it works like WS otherwise, it works like a REST API
   useReactQueryWsSubscription({
     url: QOVERY_WS + '/deployment/status',
     urlSearchParams: {
@@ -86,14 +115,14 @@ export function PageEnvironmentLogs() {
       cluster: environment?.cluster_id,
       project: projectId,
       environment: environmentId,
-      version: deploymentVersionId || preCheckVersionId || stageVersionId,
+      version: isLatestVersion ? undefined : versionIdUrl,
     },
     enabled:
       Boolean(organizationId) && Boolean(environment?.cluster_id) && Boolean(projectId) && Boolean(environmentId),
     onMessage: messageHandler,
   })
 
-  if (!environment)
+  if (!environment || !environmentStatus?.last_deployment_state)
     return (
       <div className="h-[calc(100vh-64px)] w-[calc(100vw-64px)] p-1">
         <div className="flex h-full w-full justify-center border border-neutral-500 bg-neutral-600 pt-11">
@@ -102,6 +131,8 @@ export function PageEnvironmentLogs() {
       </div>
     )
 
+  const lastDeploymentId = environmentStatus.last_deployment_id ?? ''
+
   return (
     <div className="flex h-full">
       <ServiceStageIdsProvider>
@@ -128,18 +159,15 @@ export function PageEnvironmentLogs() {
               />
             }
           />
-          <Route
-            path={ENVIRONMENT_PRE_CHECK_LOGS_URL()}
-            element={<PreCheckLogsFeature environment={environment} preCheckStage={preCheckStage} />}
-          />
           <Route
             path={ENVIRONMENT_PRE_CHECK_LOGS_URL(':versionId')}
             element={<PreCheckLogsFeature environment={environment} preCheckStage={preCheckStage} />}
           />
           <Route
-            path={DEPLOYMENT_LOGS_URL()}
+            path={DEPLOYMENT_LOGS_VERSION_URL()}
             element={
               <DeploymentLogsFeature
+                key={location.pathname}
                 environment={environment}
                 deploymentStages={deploymentStages}
                 environmentStatus={environmentStatus}
@@ -147,13 +175,13 @@ export function PageEnvironmentLogs() {
             }
           />
           <Route
-            path={DEPLOYMENT_LOGS_VERSION_URL()}
+            path={DEPLOYMENT_LOGS_URL()}
             element={
-              <DeploymentLogsFeature
-                key={location.pathname}
-                environment={environment}
-                deploymentStages={deploymentStages}
-                environmentStatus={environmentStatus}
+              <RedirectDeploymentLogs
+                organizationId={organizationId}
+                projectId={projectId}
+                environmentId={environmentId}
+                lastDeploymentId={lastDeploymentId}
               />
             }
           />
diff --git a/libs/shared/routes/src/lib/sub-router/logs.router.ts b/libs/shared/routes/src/lib/sub-router/logs.router.ts
index 9a294d0d545..e9d20370e23 100644
--- a/libs/shared/routes/src/lib/sub-router/logs.router.ts
+++ b/libs/shared/routes/src/lib/sub-router/logs.router.ts
@@ -19,5 +19,4 @@ export const DEPLOYMENT_LOGS_URL = (serviceId = ':serviceId') => `/${serviceId}/
 export const DEPLOYMENT_LOGS_VERSION_URL = (serviceId = ':serviceId', versionId = ':versionId') =>
   `/${serviceId}/deployment-logs/${versionId}`
 
-export const ENVIRONMENT_PRE_CHECK_LOGS_URL = (versionId?: string) =>
-  versionId ? `/pre-check-logs/${versionId}` : '/pre-check-logs'
+export const ENVIRONMENT_PRE_CHECK_LOGS_URL = (versionId: string) => `/pre-check-logs/${versionId}`
diff --git a/libs/shared/ui/src/lib/components/inputs/input-radio/input-radio.tsx b/libs/shared/ui/src/lib/components/inputs/input-radio/input-radio.tsx
index 506a637a4a2..6643bbc2571 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-radio/input-radio.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-radio/input-radio.tsx
@@ -59,9 +59,12 @@ export function InputRadio(props: InputRadioProps) {
         onChange={(e) => inputChange(e.currentTarget.checked, e.currentTarget.value, e)}
         className="relative mr-5 appearance-none font-icons  before:absolute before:left-[1px] before:top-[1px] before:flex before:h-[1.125rem] before:w-[1.125rem] before:items-center before:justify-center before:rounded-full before:border-2 before:border-neutral-350 before:bg-white before:text-xs before:font-black before:leading-none before:text-white  before:transition-all before:content-[''] after:absolute after:left-[5px] after:top-[5px] after:h-2.5 after:w-2.5 after:rounded-full after:bg-brand-500 after:opacity-0 after:transition-all after:content-[''] checked:before:border-brand-500 checked:after:opacity-100 hover:before:border-brand-500"
       />
-      <label htmlFor={value} className={`font-medium leading-5 text-neutral-400 ${big ? 'text-sm' : 'text-ssm'}`}>
+      <label
+        htmlFor={value}
+        className={`font-medium leading-5 text-neutral-400 dark:text-neutral-50 ${big ? 'text-sm' : 'text-ssm'}`}
+      >
         {label}
-        {description && <p className="mt-1 text-xs font-normal text-neutral-350">{description}</p>}
+        {description && <p className="mt-1 text-xs font-normal text-neutral-350 dark:text-neutral-50">{description}</p>}
       </label>
     </div>
   )