diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 12db6d1..2d186ec 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -190,13 +190,6 @@
                 saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             }
 
-            // Set up override params
-            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
-                stage('Set Salt overrides') {
-                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
-                }
-            }
-
             //
             // Install
             //
@@ -214,6 +207,14 @@
                 }
             }
 
+            // Set up override params
+            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
+                stage('Set Salt overrides') {
+                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
+                }
+            }
+
+
             // install k8s
             if (common.checkContains('STACK_INSTALL', 'k8s')) {
 
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 84f5dcf..043324b 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -152,12 +152,6 @@
                 saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             }
 
-            // Set up override params
-            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
-                stage('Set Salt overrides') {
-                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
-                }
-            }
             //
             // Install
             //
@@ -175,6 +169,13 @@
                 }
             }
 
+            // Set up override params
+            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
+                stage('Set Salt overrides') {
+                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
+                }
+            }
+
             // install k8s
             if (common.checkContains('STACK_INSTALL', 'k8s')) {
 
