diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 6898b96..a0374a4 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -32,142 +32,144 @@
 orchestrate = new com.mirantis.mk.Orchestrate()
 
 node {
-    // connection objects
-    def openstackCloud
-    def saltMaster
+    try {
+        // connection objects
+        def openstackCloud
+        def saltMaster
 
-    // value defaults
-    def openstackVersion = OPENSTACK_API_CLIENT ? OPENSTACK_API_CLIENT : 'liberty'
-    def openstackEnv = "${env.WORKSPACE}/venv"
+        // value defaults
+        def openstackVersion = OPENSTACK_API_CLIENT ? OPENSTACK_API_CLIENT : 'liberty'
+        def openstackEnv = "${env.WORKSPACE}/venv"
 
-    if (HEAT_STACK_NAME == '') {
-        HEAT_STACK_NAME = BUILD_TAG
-    }
-
-    //
-    // Bootstrap
-    //
-
-    stage ('Download Heat templates') {
-        git.checkoutGitRepository('template', HEAT_TEMPLATE_URL, HEAT_TEMPLATE_BRANCH, HEAT_TEMPLATE_CREDENTIALS)
-    }
-
-    stage('Install OpenStack CLI') {
-        openstack.setupOpenstackVirtualenv(openstackEnv, openstackVersion)
-    }
-
-    stage('Connect to OpenStack cloud') {
-        openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT)
-        openstack.getKeystoneToken(openstackCloud, openstackEnv)
-    }
-
-    if (HEAT_STACK_REUSE == 'false') {
-        stage('Launch new Heat stack') {
-            envParams = [
-                'instance_zone': HEAT_STACK_ZONE,
-                'public_net': HEAT_STACK_PUBLIC_NET
-            ]
-            openstack.createHeatStack(openstackCloud, HEAT_STACK_NAME, HEAT_STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, openstackEnv)
+        if (HEAT_STACK_NAME == '') {
+            HEAT_STACK_NAME = BUILD_TAG
         }
-    }
 
-    stage('Connect to Salt master') {
-        def saltMasterPort
-        try {
-            saltMasterPort = SALT_MASTER_PORT
-        } catch (MissingPropertyException e) {
-            saltMasterPort = 8000
+        //
+        // Bootstrap
+        //
+
+        stage ('Download Heat templates') {
+            git.checkoutGitRepository('template', HEAT_TEMPLATE_URL, HEAT_TEMPLATE_BRANCH, HEAT_TEMPLATE_CREDENTIALS)
         }
-        saltMasterHost = openstack.getHeatStackOutputParam(openstackCloud, HEAT_STACK_NAME, 'salt_master_ip', openstackEnv)
-        saltMasterUrl = "http://${saltMasterHost}:${saltMasterPort}"
-        saltMaster = salt.connection(saltMasterUrl, SALT_MASTER_CREDENTIALS)
-    }
 
-    //
-    // Install
-    //
+        stage('Install OpenStack CLI') {
+            openstack.setupOpenstackVirtualenv(openstackEnv, openstackVersion)
+        }
 
-    stage('Install core infra') {
-        // salt.master, reclass
-        // refresh_pillar
-        // sync_all
-        // linux,openssh,salt.minion.ntp
+        stage('Connect to OpenStack cloud') {
+            openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT)
+            openstack.getKeystoneToken(openstackCloud, openstackEnv)
+        }
 
-        orchestrate.installFoundationInfra(saltMaster)
-        orchestrate.validateFoundationInfra(saltMaster)
-    }
+        if (HEAT_STACK_REUSE == 'false') {
+            stage('Launch new Heat stack') {
+                envParams = [
+                    'instance_zone': HEAT_STACK_ZONE,
+                    'public_net': HEAT_STACK_PUBLIC_NET
+                ]
+                openstack.createHeatStack(openstackCloud, HEAT_STACK_NAME, HEAT_STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, openstackEnv)
+            }
+        }
 
-    stage("Deploy GlusterFS") {
-        salt.enforceState(saltMaster, 'I@glusterfs:server', 'glusterfs.server.service', true)
-        salt.enforceState(saltMaster, 'ci01*', 'glusterfs.server.setup', true)
-        sleep(5)
-        salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
-        print salt.cmdRun(saltMaster, 'I@glusterfs:client', 'mount|grep fuse.glusterfs || echo "Command failed"')
-    }
+        stage('Connect to Salt master') {
+            def saltMasterPort
+            try {
+                saltMasterPort = SALT_MASTER_PORT
+            } catch (MissingPropertyException e) {
+                saltMasterPort = 8000
+            }
+            saltMasterHost = openstack.getHeatStackOutputParam(openstackCloud, HEAT_STACK_NAME, 'salt_master_ip', openstackEnv)
+            saltMasterUrl = "http://${saltMasterHost}:${saltMasterPort}"
+            saltMaster = salt.connection(saltMasterUrl, SALT_MASTER_CREDENTIALS)
+        }
 
-    stage("Deploy GlusterFS") {
-        salt.enforceState(saltMaster, 'I@haproxy:proxy', 'haproxy,keepalived')
-    }
+        //
+        // Install
+        //
 
-    stage("Setup Docker Swarm") {
-        salt.enforceState(saltMaster, 'I@docker:host', 'docker.host', true)
-        salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.swarm', true)
-        salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'salt', true)
-        salt.runSaltProcessStep(saltMaster, 'I@docker:swarm:role:master', 'mine.flush')
-        salt.runSaltProcessStep(saltMaster, 'I@docker:swarm:role:master', 'mine.update')
-        salt.enforceState(saltMaster, 'I@docker:swarm', 'docker.swarm', true)
-        print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', 'docker node ls')
-    }
+        stage('Install core infra') {
+            // salt.master, reclass
+            // refresh_pillar
+            // sync_all
+            // linux,openssh,salt.minion.ntp
 
-    stage("Deploy Docker services") {
-        salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.client')
+            orchestrate.installFoundationInfra(saltMaster)
+            orchestrate.validateFoundationInfra(saltMaster)
+        }
 
-        // XXX: Hack to fix dependency of gerrit on mysql
-        print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "docker service rm gerrit; sleep 5; rm -rf /srv/volumes/gerrit/*")
-        sleep(10)
-        print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "apt-get install -y mysql-client; mysql -ppassword -h172.16.10.254 -e'drop database gerrit;create database gerrit;'")
-        salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.client')
-        // ---- cut here (end of hack) ----
+        stage("Deploy GlusterFS") {
+            salt.enforceState(saltMaster, 'I@glusterfs:server', 'glusterfs.server.service', true)
+            salt.enforceState(saltMaster, 'ci01*', 'glusterfs.server.setup', true)
+            sleep(5)
+            salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
+            print salt.cmdRun(saltMaster, 'I@glusterfs:client', 'mount|grep fuse.glusterfs || echo "Command failed"')
+        }
 
-        retry(30) {
-            out = salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', """/bin/bash -c 'docker service ls | grep -E "0/[0-9]+"' && echo 'Some services are not running'""")
-            for (int a = 0; a < out['return'].size(); a++) {
-                def entry = out['return'].get(a)
-                for (int i = 0; i < entry.size(); i++) {
-                    def node = entry.get(i)
-                    if (node) {
-                        if (node.value =~ /Some services are not running/) {
-                            sleep(10)
-                            throw new Exception("$node.key: $node.value")
-                        } else {
-                            print out
+        stage("Deploy GlusterFS") {
+            salt.enforceState(saltMaster, 'I@haproxy:proxy', 'haproxy,keepalived')
+        }
+
+        stage("Setup Docker Swarm") {
+            salt.enforceState(saltMaster, 'I@docker:host', 'docker.host', true)
+            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.swarm', true)
+            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'salt', true)
+            salt.runSaltProcessStep(saltMaster, 'I@docker:swarm:role:master', 'mine.flush')
+            salt.runSaltProcessStep(saltMaster, 'I@docker:swarm:role:master', 'mine.update')
+            salt.enforceState(saltMaster, 'I@docker:swarm', 'docker.swarm', true)
+            print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', 'docker node ls')
+        }
+
+        stage("Deploy Docker services") {
+            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.client')
+
+            // XXX: Hack to fix dependency of gerrit on mysql
+            print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "docker service rm gerrit; sleep 5; rm -rf /srv/volumes/gerrit/*")
+            sleep(10)
+            print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "apt-get install -y mysql-client; mysql -ppassword -h172.16.10.254 -e'drop database gerrit;create database gerrit;'")
+            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.client')
+            // ---- cut here (end of hack) ----
+
+            retry(30) {
+                out = salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', """/bin/bash -c 'docker service ls | grep -E "0/[0-9]+"' && echo 'Some services are not running'""")
+                for (int a = 0; a < out['return'].size(); a++) {
+                    def entry = out['return'].get(a)
+                    for (int i = 0; i < entry.size(); i++) {
+                        def node = entry.get(i)
+                        if (node) {
+                            if (node.value =~ /Some services are not running/) {
+                                sleep(10)
+                                throw new Exception("$node.key: $node.value")
+                            } else {
+                                print out
+                            }
                         }
                     }
                 }
             }
         }
-    }
 
-    stage("Configure CI/CD services") {
-        salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'aptly', true)
-        retry(2) {
-            // Needs to run twice to pass __virtual__ method of gerrit module
-            // after installation of dependencies
-            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'gerrit', true)
+        stage("Configure CI/CD services") {
+            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'aptly', true)
+            retry(2) {
+                // Needs to run twice to pass __virtual__ method of gerrit module
+                // after installation of dependencies
+                salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'gerrit', true)
+            }
+            retry(2) {
+                // Same for jenkins
+                salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'jenkins', true)
+            }
         }
-        retry(2) {
-            // Same for jenkins
-            salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'jenkins', true)
+    } catch (Throwable e) {
+        // If there was an error or exception thrown, the build failed
+        currentBuild.result = "FAILURE"
+        throw e
+    } finally {
+        // Cleanup
+        if (HEAT_STACK_DELETE == 'true') {
+            stage('Trigger cleanup job') {
+                build job: 'deploy_heat_cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
+            }
         }
-    }
-
-    //
-    // Cleanup
-    //
-
-    if (HEAT_STACK_DELETE == 'true') {
-        stage('Trigger cleanup job') {
-            build job: 'deploy_heat_cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
-        }
-    }
 }