diff --git a/Jenkinsfile b/Jenkinsfile
index 1f583bf..031fd8c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,6 @@ pipeline {
             steps {
                 dir('web/vue-app') {
                     sh 'docker build -t ${FRONTEND_IMAGE} .'
-                    sh 'docker tag ${FRONTEND_IMAGE} ${FRONTEND_IMAGE_LATEST}'
                 }
             }
         }
@@ -44,7 +43,7 @@ pipeline {
         stage('Build Backend (Flask) App') {
             steps {
                 dir('.') {
-                    sh """docker build --build-arg APP_BUILD=${BUILD_NUMBER} -t chore-app-backend:${BASE_VERSION} -t chore-app-backend:${BASE_VERSION}-${BUILD_NUMBER} -t chore-app-backend:latest ."""
+                    sh """docker build --build-arg APP_BUILD=${BUILD_NUMBER} -t chore-app-backend:${BASE_VERSION}-${BUILD_NUMBER} ."""
                 }
             }
         }
@@ -69,7 +68,7 @@ pipeline {
                         --name ${VUE_CONTAINER_NAME} \\
                         --network ${NETWORK_NAME} \\
                         -p 443:443 \\
-                        ${FRONTEND_IMAGE_LATEST}
+                        ${FRONTEND_IMAGE}
                 """
 
                 sh """
@@ -78,13 +77,21 @@ pipeline {
                         --network ${NETWORK_NAME} \\
                         -e BUILD_NUMBER=${BUILD_NUMBER} \\
                         -v ${FLASK_CONTAINER_NAME}_data:/app/data \\
-                        ${BACKEND_IMAGE_LATEST}
+                        chore-app-backend:${BASE_VERSION}-${BUILD_NUMBER}
                 """
 
                 echo 'Deployment complete!'
             }
         }
 
+        stage('Tag Latest') {
+            steps {
+                echo 'Tagging deployed images as latest...'
+                sh "docker tag ${FRONTEND_IMAGE} chore-app-frontend:latest"
+                sh "docker tag chore-app-backend:${BASE_VERSION}-${BUILD_NUMBER} chore-app-backend:latest"
+            }
+        }
+
         stage('Cleanup') {
             steps {
                 echo 'Removing old/dangling Docker images...'