diff --git a/ansible/roles/offline-installer/tasks/main.yml b/ansible/roles/offline-installer/tasks/main.yml
index 892ad88855fb6de9640c131e500596b8327c671a..cc64c39b22388db60451e3f0d77c9bcc0f3b7dbc 100644
--- a/ansible/roles/offline-installer/tasks/main.yml
+++ b/ansible/roles/offline-installer/tasks/main.yml
@@ -30,7 +30,6 @@
   include: uploadToAzure.yml
   when: uploadInstaller is defined
 
-- name: Delete offline installer repo
-  file:
-    path: "{{offline_repo_location}}/offline-installer-repo/"
-    state: absent
+- name: Delete offline installer folder if any issue
+  include: remove.yml
+  when: removeOfflineInstallerFolder is defined
diff --git a/ansible/roles/offline-installer/tasks/remove.yml b/ansible/roles/offline-installer/tasks/remove.yml
new file mode 100644
index 0000000000000000000000000000000000000000..22473f1dc5951ef26926d2a3e5008eebdb408338
--- /dev/null
+++ b/ansible/roles/offline-installer/tasks/remove.yml
@@ -0,0 +1,4 @@
+- name: Delete offline installer repo
+  file:
+    path: "{{offline_repo_location}}/offline-installer-repo/"
+    state: absent
diff --git a/pipelines/offlineinstaller/Jenkinsfile b/pipelines/offlineinstaller/Jenkinsfile
index f366f98b8ceeba4b73cbb3eca89080ecb98d799f..faee11713bdf15eddbdd768e8b515ee4fa157210 100644
--- a/pipelines/offlineinstaller/Jenkinsfile
+++ b/pipelines/offlineinstaller/Jenkinsfile
@@ -34,6 +34,7 @@ node() {
                     	println values
                     	ansible_playbook_run(values)
                 }
+		try {
 		     stage('Build, create and upload installer to azure') {
 			dir('offline-installer-repo') {
 				sh """
@@ -52,6 +53,20 @@ node() {
                         println values
                         ansible_playbook_run(values)
 		}
+		}
+		catch (err) {
+			values = [:]
+                        ansiblePlaybook = "${currentWs}/ansible/offline-installer.yml --vault-password-file /var/lib/jenkins/secrets/vault-pass "
+                        ansibleExtraArgs = " --extra-vars \"offline_repo_location=$currentWs removeOfflineInstallerFolder=True \""
+                        values.put('currentWs', currentWs)
+                        values.put('env', envDir)
+                        values.put('module', module)
+                        values.put('jobName', jobName)
+                        values.put('ansiblePlaybook', ansiblePlaybook)
+                        values.put('ansibleExtraArgs', ansibleExtraArgs)
+                        println values
+                        ansible_playbook_run(values)
+		}
             }
     }
     catch (err) {