diff --git a/Jenkinsfile b/Jenkinsfile
index c279235..98be1d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
     stage('Unit Tests and CodeCoverage Test'){
       steps{
         script{
-          sh 'docker-compose -f docker-compose.test.yml up test'
+          sh 'docker compose -f docker-compose.test.yml up test'
         }
         xunit (
           thresholds: [ skipped(failureThreshold: '0'), failed(failureThreshold: '0') ],
@@ -39,7 +39,7 @@ pipeline {
       post{
         failure{
           script{
-            sh 'docker-compose -f docker-compose.test.yml down --remove-orphans'
+            sh 'docker compose -f docker-compose.test.yml down --remove-orphans'
           }
           error "Test failure. Stopping pipeline execution!"
         }
@@ -55,10 +55,17 @@ pipeline {
       steps{
         script{
             sh 'scp src/test/resources/IUDX_GIS_Server_APIs_V4.5.0.postman_collection.json jenkins@jenkins-master:/var/lib/jenkins/iudx/gis/Newman/'
-            sh 'docker-compose -f docker-compose.test.yml up -d integTest'
+            sh 'docker compose -f docker-compose.test.yml up -d integTest'
             sh 'sleep 45'
         }
       }
+      post{
+        failure{
+          script{
+            sh 'docker compose -f docker-compose.test.yml down --remove-orphans'
+          }
+        }
+      }
     }
 
     stage('Integration Tests & ZAP pen test'){
@@ -81,7 +88,7 @@ pipeline {
             }  
           }
           script{
-             sh 'docker-compose -f docker-compose.test.yml down --remove-orphans'
+             sh 'docker compose -f docker-compose.test.yml down --remove-orphans'
           }
         }
       }