diff --git a/deploy-aws-k8s-kqueen-pipeline.groovy b/deploy-aws-k8s-kqueen-pipeline.groovy
index 19c6816..89242a8 100644
--- a/deploy-aws-k8s-kqueen-pipeline.groovy
+++ b/deploy-aws-k8s-kqueen-pipeline.groovy
@@ -32,74 +32,74 @@
 
 def ipRegex = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
 def aws_env_vars
-node("python") {
-     try {
-        // Set build-specific variables
-        venv = "${env.WORKSPACE}/venv"
-        venvPepper = "${env.WORKSPACE}/venvPepper"
+timeout(time: 12, unit: 'HOURS') {
+    node("python") {
+         try {
+            // Set build-specific variables
+            venv = "${env.WORKSPACE}/venv"
+            venvPepper = "${env.WORKSPACE}/venvPepper"
 
-        //
-        // Prepare machines
-        //
-        stage ('Create infrastructure') {
+            //
+            // Prepare machines
+            //
+            stage ('Create infrastructure') {
 
-            outputs.put('stack_type', "aws")
-            // setup environment
-            aws.setupVirtualEnv(venv)
-            // set aws_env_vars
-            aws_env_vars = aws.getEnvVars(AWS_API_CREDENTIALS, AWS_STACK_REGION)
-            // We just use STACK_NAME from param
-            currentBuild.description = STACK_NAME
-            outputs.put('stack_name', STACK_NAME)
+                outputs.put('stack_type', "aws")
+                // setup environment
+                aws.setupVirtualEnv(venv)
+                // set aws_env_vars
+                aws_env_vars = aws.getEnvVars(AWS_API_CREDENTIALS, AWS_STACK_REGION)
+                // We just use STACK_NAME from param
+                currentBuild.description = STACK_NAME
+                outputs.put('stack_name', STACK_NAME)
 
-            // get templates
-            git.checkoutGitRepository('template', STACK_TEMPLATE_URL, STACK_TEMPLATE_BRANCH, STACK_TEMPLATE_CREDENTIALS)
+                // get templates
+                git.checkoutGitRepository('template', STACK_TEMPLATE_URL, STACK_TEMPLATE_BRANCH, STACK_TEMPLATE_CREDENTIALS)
 
-            // start stack
-            def stack_params = [
-                "ParameterKey=KeyName,ParameterValue=" + AWS_SSH_KEY,
-                "ParameterKey=CmpNodeCount,ParameterValue=" + STACK_COMPUTE_COUNT
-            ]
-            def template_file = 'cfn/' + STACK_TEMPLATE + '.yml'
-            aws.createStack(venv, aws_env_vars, template_file, STACK_NAME, stack_params)
+                // start stack
+                def stack_params = [
+                    "ParameterKey=KeyName,ParameterValue=" + AWS_SSH_KEY,
+                    "ParameterKey=CmpNodeCount,ParameterValue=" + STACK_COMPUTE_COUNT
+                ]
+                def template_file = 'cfn/' + STACK_TEMPLATE + '.yml'
+                aws.createStack(venv, aws_env_vars, template_file, STACK_NAME, stack_params)
 
-            // wait for stack to be ready
-            aws.waitForStatus(venv, aws_env_vars, STACK_NAME, 'CREATE_COMPLETE')
+                // wait for stack to be ready
+                aws.waitForStatus(venv, aws_env_vars, STACK_NAME, 'CREATE_COMPLETE')
 
-            // get outputs
-            saltMasterHost = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'SaltMasterIP')
+                // get outputs
+                saltMasterHost = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'SaltMasterIP')
 
-            // check that saltMasterHost is valid
-            if (!saltMasterHost || !saltMasterHost.matches(ipRegex)) {
-                common.errorMsg("saltMasterHost is not a valid ip, value is: ${saltMasterHost}")
-                throw new Exception("saltMasterHost is not a valid ip")
+                // check that saltMasterHost is valid
+                if (!saltMasterHost || !saltMasterHost.matches(ipRegex)) {
+                    common.errorMsg("saltMasterHost is not a valid ip, value is: ${saltMasterHost}")
+                    throw new Exception("saltMasterHost is not a valid ip")
+                }
+
+                currentBuild.description = "${STACK_NAME} ${saltMasterHost}"
+                SALT_MASTER_URL = "http://${saltMasterHost}:6969"
+
+                outputs.put('salt_api', SALT_MASTER_URL)
+
+                // Setup virtualenv for pepper
+                python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             }
 
-            currentBuild.description = "${STACK_NAME} ${saltMasterHost}"
-            SALT_MASTER_URL = "http://${saltMasterHost}:6969"
-
-            outputs.put('salt_api', SALT_MASTER_URL)
-
-            // Setup virtualenv for pepper
-            python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
-        }
-
-        stage('Install core infrastructure') {
-            def staticMgmtNetwork = false
-            if (common.validInputParam('STATIC_MGMT_NETWORK')) {
-                staticMgmtNetwork = STATIC_MGMT_NETWORK.toBoolean()
-            }
-            orchestrate.installFoundationInfra(venvPepper, staticMgmtNetwork)
-
-            if (common.checkContains('STACK_INSTALL', 'kvm')) {
-                orchestrate.installInfraKvm(venvPepper)
+            stage('Install core infrastructure') {
+                def staticMgmtNetwork = false
+                if (common.validInputParam('STATIC_MGMT_NETWORK')) {
+                    staticMgmtNetwork = STATIC_MGMT_NETWORK.toBoolean()
+                }
                 orchestrate.installFoundationInfra(venvPepper, staticMgmtNetwork)
-            }
 
-            orchestrate.validateFoundationInfra(venvPepper)
-        }
-        stage('Install Kubernetes infra') {
-            if (STACK_TYPE == 'aws') {
+                if (common.checkContains('STACK_INSTALL', 'kvm')) {
+                    orchestrate.installInfraKvm(venvPepper)
+                    orchestrate.installFoundationInfra(venvPepper, staticMgmtNetwork)
+                }
+
+                orchestrate.validateFoundationInfra(venvPepper)
+            }
+            stage('Install Kubernetes infra') {
                 // configure kubernetes_control_address - save loadbalancer
                 def awsOutputs = aws.getOutputs(venv, aws_env_vars, STACK_NAME)
                 common.prettyPrint(awsOutputs)
@@ -107,57 +107,57 @@
                     salt.runSaltProcessStep(venvPepper, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_control_address', awsOutputs['ControlLoadBalancer']], null, true)
                     outputs.put('kubernetes_apiserver', 'https://' + awsOutputs['ControlLoadBalancer'])
                 }
+
+                // ensure certificates are generated properly
+                salt.runSaltProcessStep(venvPepper, '*', 'saltutil.refresh_pillar', [], null, true)
+                salt.enforceState(venvPepper, '*', ['salt.minion.cert'], true)
+
+                orchestrate.installKubernetesInfra(venvPepper)
             }
 
-            // ensure certificates are generated properly
-            salt.runSaltProcessStep(venvPepper, '*', 'saltutil.refresh_pillar', [], null, true)
-            salt.enforceState(venvPepper, '*', ['salt.minion.cert'], true)
+            stage('Install Kubernetes control') {
+                orchestrate.installKubernetesControl(venvPepper)
 
-            orchestrate.installKubernetesInfra(venvPepper)
-        }
+                // collect artifacts (kubeconfig)
+                writeFile(file: 'kubeconfig', text: salt.getFileContent(venvPepper, 'I@kubernetes:master and *01*', '/etc/kubernetes/admin-kube-config'))
+                archiveArtifacts(artifacts: 'kubeconfig')
+            }
 
-        stage('Install Kubernetes control') {
-            orchestrate.installKubernetesControl(venvPepper)
+            stage('Install Kubernetes computes') {
+                if (common.validInputParam('STACK_COMPUTE_COUNT')) {
+                    if (STACK_COMPUTE_COUNT > 0) {
+                        // get stack info
+                        def scaling_group = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'ComputesScalingGroup')
 
-            // collect artifacts (kubeconfig)
-            writeFile(file: 'kubeconfig', text: salt.getFileContent(venvPepper, 'I@kubernetes:master and *01*', '/etc/kubernetes/admin-kube-config'))
-            archiveArtifacts(artifacts: 'kubeconfig')
-        }
+                        //update autoscaling group
+                        aws.updateAutoscalingGroup(venv, aws_env_vars, scaling_group, ["--desired-capacity " + STACK_COMPUTE_COUNT])
 
-        stage('Install Kubernetes computes') {
-            if (common.validInputParam('STACK_COMPUTE_COUNT')) {
-                if (STACK_COMPUTE_COUNT > 0) {
-                    // get stack info
-                    def scaling_group = aws.getOutputs(venv, aws_env_vars, STACK_NAME, 'ComputesScalingGroup')
-
-                    //update autoscaling group
-                    aws.updateAutoscalingGroup(venv, aws_env_vars, scaling_group, ["--desired-capacity " + STACK_COMPUTE_COUNT])
-
-                    // wait for computes to boot up
-                    aws.waitForAutoscalingInstances(venv, aws_env_vars, scaling_group)
-                    sleep(60)
+                        // wait for computes to boot up
+                        aws.waitForAutoscalingInstances(venv, aws_env_vars, scaling_group)
+                        sleep(60)
+                    }
                 }
+
+                orchestrate.installKubernetesCompute(venvPepper)
             }
 
-            orchestrate.installKubernetesCompute(venvPepper)
-        }
+            stage('Finalize') {
+                outputsPretty = common.prettify(outputs)
+                print(outputsPretty)
+                writeFile(file: 'outputs.json', text: outputsPretty)
+                archiveArtifacts(artifacts: 'outputs.json')
+            }
 
-        stage('Finalize') {
-            outputsPretty = common.prettify(outputs)
-            print(outputsPretty)
-            writeFile(file: 'outputs.json', text: outputsPretty)
-            archiveArtifacts(artifacts: 'outputs.json')
-        }
+        } catch (Throwable e) {
+            currentBuild.result = 'FAILURE'
+            throw e
+        } finally {
+            if (currentBuild.result == 'FAILURE') {
+                common.errorMsg("Deploy job FAILED and was not deleted. Please fix the problem and delete stack on you own.")
 
-    } catch (Throwable e) {
-        currentBuild.result = 'FAILURE'
-        throw e
-    } finally {
-        if (currentBuild.result == 'FAILURE') {
-            common.errorMsg("Deploy job FAILED and was not deleted. Please fix the problem and delete stack on you own.")
-
-            if (common.validInputParam('SALT_MASTER_URL')) {
-                common.errorMsg("Salt master URL: ${SALT_MASTER_URL}")
+                if (common.validInputParam('SALT_MASTER_URL')) {
+                    common.errorMsg("Salt master URL: ${SALT_MASTER_URL}")
+                }
             }
         }
     }