diff --git a/Jenkinsfile b/Jenkinsfile
index 5f2a1d5..0235111 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -279,7 +279,7 @@ pipeline {
                         echo "🔍 SECURITY: Checking if infrastructure is ready for deployment..."
                         echo "🔍 Current deployment type: ${env.DEPLOYMENT_TYPE}"
                         
-                        // Only check readiness if not forced
+                        // Only check readiness if deployment type is APPLICATION
                         if (env.DEPLOYMENT_TYPE == "APPLICATION") {
                             def serviceExists = sh(
                                 script: """
@@ -300,6 +300,8 @@ pipeline {
                                 env.DEPLOYMENT_TYPE = "INFRASTRUCTURE"
                                 currentBuild.description = "INFRASTRUCTURE (auto-detected) | ${env.IMAGE_TAG}"
                             }
+                        } else {
+                            echo "✅ Infrastructure deployment already forced - skipping readiness check"
                         }
                         
                         echo "📋 SECURITY: Infrastructure readiness assessment completed"
@@ -311,15 +313,13 @@ pipeline {
 
         stage('Deploy Infrastructure') {
             when {
-                expression { 
-                    echo "🔍 Checking deployment type: ${env.DEPLOYMENT_TYPE}"
-                    return env.DEPLOYMENT_TYPE == "INFRASTRUCTURE" 
-                }
+                expression { env.DEPLOYMENT_TYPE == "INFRASTRUCTURE" }
             }
             steps {
                 withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', credentialsId: env.AWS_CRED_ID]]) {
                     dir('terraform') {
                         script {
+                            echo "🔍 DEPLOYMENT: Deployment type is ${env.DEPLOYMENT_TYPE}"
                             echo "🚨 SECURITY NOTICE: Infrastructure deployment requested"
                             echo "🏗️ ARCHITECTURE: Deploying ECS Cluster with SSM access (secure, keyless)"
                             echo "🔐 In production: This would require infrastructure-admin role"