diff --git a/Jenkinsfile b/Jenkinsfile
index ecd3c7b..1434d2b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,16 +8,15 @@ pipeline {
     }
 
     environment {
-        CI_NETWORK = "tiptop-ci-${BUILD_NUMBER}"
-        CI_DATABASE = "tiptop-ci-db-${BUILD_NUMBER}"
-
-        DATABASE_URL = "postgresql://tiptop_ci:tiptop_ci_password@${CI_DATABASE}:5432/the_tip_top_ci"
-
         REGISTRY = "localhost:5000"
-        IMAGE_TAG = "${BUILD_NUMBER}"
 
         BACKEND_IMAGE = "${REGISTRY}/the-tip-top/backend"
         FRONTEND_IMAGE = "${REGISTRY}/the-tip-top/frontend"
+
+        CI_NETWORK = "tiptop-ci-${JOB_BASE_NAME}-${BUILD_NUMBER}"
+        CI_DATABASE = "tiptop-ci-db-${JOB_BASE_NAME}-${BUILD_NUMBER}"
+
+        DATABASE_URL = "postgresql://tiptop_ci:tiptop_ci_password@${CI_DATABASE}:5432/the_tip_top_ci"
     }
 
     stages {
@@ -27,6 +26,42 @@ pipeline {
             }
         }
 
+        stage('Préparer environnement') {
+            steps {
+                script {
+                    env.IMAGE_TAG = "${env.BRANCH_NAME}-${env.BUILD_NUMBER}"
+
+                    if (env.BRANCH_NAME == 'main') {
+                        env.DEPLOY_ENABLED = 'true'
+                        env.DEPLOY_ENV = 'DEV'
+                        env.COMPOSE_FILE = 'deploy/dev/docker-compose.yml'
+                        env.COMPOSE_PROJECT = 'tiptop-dev'
+                        env.DEPLOY_NETWORK = 'tiptop-dev'
+                        env.FRONTEND_API_URL = 'http://192.168.1.23:5001'
+                    } else if (env.BRANCH_NAME == 'develop') {
+                        env.DEPLOY_ENABLED = 'true'
+                        env.DEPLOY_ENV = 'PREPROD'
+                        env.COMPOSE_FILE = 'deploy/preprod/docker-compose.yml'
+                        env.COMPOSE_PROJECT = 'tiptop-preprod'
+                        env.DEPLOY_NETWORK = 'tiptop-preprod'
+                        env.FRONTEND_API_URL = 'http://192.168.1.23:5002'
+                    } else {
+                        env.DEPLOY_ENABLED = 'false'
+                        env.DEPLOY_ENV = 'CI uniquement'
+                        env.COMPOSE_FILE = ''
+                        env.COMPOSE_PROJECT = ''
+                        env.DEPLOY_NETWORK = ''
+                        env.FRONTEND_API_URL = ''
+                    }
+
+                    echo "Branche            : ${env.BRANCH_NAME}"
+                    echo "Tag Docker         : ${env.IMAGE_TAG}"
+                    echo "Environnement      : ${env.DEPLOY_ENV}"
+                    echo "Déploiement activé : ${env.DEPLOY_ENABLED}"
+                }
+            }
+        }
+
         stage('Vérification du workspace') {
             steps {
                 sh '''
@@ -34,9 +69,10 @@ pipeline {
                     test -f backend/package-lock.json
                     test -f frontend/package.json
                     test -f frontend/package-lock.json
-                    test -f deploy/dev/docker-compose.yml
 
-                    echo "Tag Docker : ${IMAGE_TAG}"
+                    if [ "${DEPLOY_ENABLED}" = "true" ]; then
+                      test -f "${COMPOSE_FILE}"
+                    fi
                 '''
             }
         }
@@ -54,12 +90,12 @@ pipeline {
                       -e POSTGRES_DB=the_tip_top_ci \
                       postgres:16-alpine
 
-                    echo "Attente de PostgreSQL..."
+                    echo "Attente de PostgreSQL CI..."
 
                     for i in $(seq 1 30); do
                       if docker exec "${CI_DATABASE}" \
                         pg_isready -U tiptop_ci -d the_tip_top_ci; then
-                        echo "PostgreSQL est prêt."
+                        echo "PostgreSQL CI est prêt."
                         break
                       fi
 
@@ -124,70 +160,85 @@ pipeline {
         }
 
         stage('Construction des images Docker') {
+            when {
+                expression {
+                    env.DEPLOY_ENABLED == 'true'
+                }
+            }
+
             steps {
                 sh '''
                     docker build \
                       -t "${BACKEND_IMAGE}:${IMAGE_TAG}" \
-                      -t "${BACKEND_IMAGE}:latest" \
                       backend
 
                     docker build \
-                      --build-arg VITE_API_URL=http://192.168.1.23:5001 \
+                      --build-arg VITE_API_URL="${FRONTEND_API_URL}" \
                       -t "${FRONTEND_IMAGE}:${IMAGE_TAG}" \
-                      -t "${FRONTEND_IMAGE}:latest" \
                       frontend
                 '''
             }
         }
 
         stage('Publication dans le Registry') {
+            when {
+                expression {
+                    env.DEPLOY_ENABLED == 'true'
+                }
+            }
+
             steps {
                 sh '''
                     docker push "${BACKEND_IMAGE}:${IMAGE_TAG}"
-                    docker push "${BACKEND_IMAGE}:latest"
-
                     docker push "${FRONTEND_IMAGE}:${IMAGE_TAG}"
-                    docker push "${FRONTEND_IMAGE}:latest"
                 '''
             }
         }
 
-       stage('Déploiement DEV') {
+        stage('Déploiement') {
+            when {
+                expression {
+                    env.DEPLOY_ENABLED == 'true'
+                }
+            }
+
             steps {
                 sh '''
+                    echo "Déploiement de ${BRANCH_NAME} vers ${DEPLOY_ENV}"
+
                     REGISTRY="${REGISTRY}" \
                     IMAGE_TAG="${IMAGE_TAG}" \
                     docker compose \
-                      -p tiptop-dev \
-                      -f deploy/dev/docker-compose.yml \
+                      -p "${COMPOSE_PROJECT}" \
+                      -f "${COMPOSE_FILE}" \
                       up -d \
                       --pull always \
                       --remove-orphans
 
-                    echo "Attente du backend DEV..."
+                    echo "Attente du backend ${DEPLOY_ENV}..."
 
                     for i in $(seq 1 30); do
                       if docker run --rm \
-                        --network tiptop-dev \
+                        --network "${DEPLOY_NETWORK}" \
                         curlimages/curl:8.12.1 \
                         -fsS http://backend:5000/ >/dev/null; then
 
-                        echo "Backend DEV opérationnel."
+                        echo "Backend ${DEPLOY_ENV} opérationnel."
                         break
                       fi
 
                       if [ "$i" -eq 30 ]; then
-                        echo "Le backend DEV ne répond pas."
+                        echo "Le backend ${DEPLOY_ENV} ne répond pas."
 
                         docker compose \
-                          -p tiptop-dev \
-                          -f deploy/dev/docker-compose.yml \
+                          -p "${COMPOSE_PROJECT}" \
+                          -f "${COMPOSE_FILE}" \
                           ps
 
                         docker compose \
-                          -p tiptop-dev \
-                          -f deploy/dev/docker-compose.yml \
-                          logs --tail=100
+                          -p "${COMPOSE_PROJECT}" \
+                          -f "${COMPOSE_FILE}" \
+                          logs --tail=150
 
                         exit 1
                       fi
@@ -195,14 +246,14 @@ pipeline {
                       sleep 5
                     done
 
-                    echo "Vérification du frontend DEV..."
+                    echo "Vérification du frontend ${DEPLOY_ENV}..."
 
                     docker run --rm \
-                      --network tiptop-dev \
+                      --network "${DEPLOY_NETWORK}" \
                       curlimages/curl:8.12.1 \
                       -fsS http://frontend/ >/dev/null
 
-                    echo "Frontend DEV opérationnel."
+                    echo "Frontend ${DEPLOY_ENV} opérationnel."
                 '''
             }
         }
@@ -217,11 +268,11 @@ pipeline {
         }
 
         success {
-            echo "Pipeline CI/CD réussi. Version DEV déployée : ${IMAGE_TAG}"
+            echo "Pipeline réussi pour ${BRANCH_NAME}. Environnement : ${DEPLOY_ENV}. Version : ${IMAGE_TAG}"
         }
 
         failure {
-            echo "Pipeline CI/CD en échec. Consulte la Console Output."
+            echo "Pipeline en échec pour ${BRANCH_NAME}. Consulte la Console Output."
         }
     }
 }