diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml
index dcfac44..be54386 100644
--- a/jjb/dcae/dcae-controller-analytics.yaml
+++ b/jjb/dcae/dcae-controller-analytics.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'dcae-settings'
+    mvn-settings: 'dcae-controller-analytics-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/dcae/dcae-controller.yaml b/jjb/dcae/dcae-controller.yaml
index 0e082ee..176821b 100644
--- a/jjb/dcae/dcae-controller.yaml
+++ b/jjb/dcae/dcae-controller.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'dcae-settings'
+    mvn-settings: 'dcae-controller-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/dcae/dcae-operation-utils.yaml b/jjb/dcae/dcae-operation-utils.yaml
index 182163e..035ee4a 100644
--- a/jjb/dcae/dcae-operation-utils.yaml
+++ b/jjb/dcae/dcae-operation-utils.yaml
@@ -15,7 +15,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'dcae-settings'
+    mvn-settings: 'dcae-operation-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-cdap.yaml b/jjb/ncomp/ncomp-cdap.yaml
index ec56af8..6b3f4f7 100644
--- a/jjb/ncomp/ncomp-cdap.yaml
+++ b/jjb/ncomp/ncomp-cdap.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-cdap-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-core.yaml b/jjb/ncomp/ncomp-core.yaml
index 8949728..675e7ad 100644
--- a/jjb/ncomp/ncomp-core.yaml
+++ b/jjb/ncomp/ncomp-core.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-core-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-docker.yaml b/jjb/ncomp/ncomp-docker.yaml
index ba0c12b..6603b16 100644
--- a/jjb/ncomp/ncomp-docker.yaml
+++ b/jjb/ncomp/ncomp-docker.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-docker-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml
index 9a1d2ad..2bc55d4 100644
--- a/jjb/ncomp/ncomp-maven.yaml
+++ b/jjb/ncomp/ncomp-maven.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-maven-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-openstack.yaml b/jjb/ncomp/ncomp-openstack.yaml
index eb9272f..e2a0207 100644
--- a/jjb/ncomp/ncomp-openstack.yaml
+++ b/jjb/ncomp/ncomp-openstack.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-openstack-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-sirius-manager.yaml b/jjb/ncomp/ncomp-sirius-manager.yaml
index 86cf771..f33fa95 100644
--- a/jjb/ncomp/ncomp-sirius-manager.yaml
+++ b/jjb/ncomp/ncomp-sirius-manager.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-sirius-manager-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
diff --git a/jjb/ncomp/ncomp-utils.yaml b/jjb/ncomp/ncomp-utils.yaml
index d2c2b3f..985c791 100644
--- a/jjb/ncomp/ncomp-utils.yaml
+++ b/jjb/ncomp/ncomp-utils.yaml
@@ -11,7 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'ncomp-settings'
+    mvn-settings: 'ncomp-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job