diff --git a/Jenkinsfile b/Jenkinsfile
index 1a1280b..d96d97f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,27 +34,33 @@
 			 steps {
 			    script {                  
                     Map functionMap =  evaluate("${projectMap}")
-                    for (rootFolder in functionMap.keySet()) {
-                        def projects = functionMap.getAt(rootFolder)
-                        
-                        if(environment != 'ALL'){
-                            if(projects != ''){
-                             sh "monaco -e $WORKSPACE/environment.yaml -se $environment -p $projects --dry-run $WORKSPACE/$rootFolder"
-                            } else{
-                             sh "cd $rootFolder && monaco -e $WORKSPACE/environment.yaml -se $environment --dry-run"
-                            }
-                        } else {
-                            if(projects != ''){
-                                sh "monaco -e $WORKSPACE/environment.yaml -p $projects --dry-run $WORKSPACE/$rootFolder"
-                            } else{
-                                sh "cd $rootFolder && monaco -e $WORKSPACE/environment.yaml --dry-run"
-                            }
-                        }
-
-                    }                  	
-                }
-             }
-        }
+						if(functionMap == null){
+							if(environment != 'ALL'){
+								sh '''for d in ./*/ ; do (cd "$d" && monaco -v -e $WORKSPACE/environment.yaml -se $environment --dry-run ); done'''
+							} else{
+								sh '''for d in ./*/ ; do (cd "$d" && monaco -v -e $WORKSPACE/environment.yaml --dry-run ); done'''	
+							}
+						} else{
+							for (rootFolder in functionMap.keySet()) {
+								def projects = functionMap.getAt(rootFolder)
+								if(environment != 'ALL'){
+									if(projects != ''){
+										sh "monaco -v -e $WORKSPACE/environment.yaml -se $environment -p $projects --dry-run $WORKSPACE/$rootFolder"
+									} else{
+										sh "cd $rootFolder && monaco -v -e $WORKSPACE/environment.yaml -se $environment --dry-run"
+									}
+								} else {
+									if(projects != ''){
+										sh "monaco -v -e $WORKSPACE/environment.yaml -p $projects --dry-run $WORKSPACE/$rootFolder"
+									} else{
+										sh "cd $rootFolder && monaco -v -e $WORKSPACE/environment.yaml --dry-run"
+									}
+								}
+							}
+						}                  	
+					}
+				}
+		}
 		stage('Approval') {
 			steps {
 			script {
@@ -64,28 +70,36 @@
 		}
 		stage('Dynatrace config deployment') {
 			 steps {
-                script {
+			    script {                  
                     Map functionMap =  evaluate("${projectMap}")
-                    for (rootFolder in functionMap.keySet()) {
-                        def projects = functionMap.getAt(rootFolder)
-                	    if(environment != 'ALL'){
-                            if(projects != ''){
-                                sh "monaco -v -e $WORKSPACE/environment.yaml -se $environment -p $projects $WORKSPACE/$rootFolder"
-                            } else{
-                                sh "cd $rootFolder && monaco -e $WORKSPACE/environment.yaml -se $environment"
-                            }
-                        } else {
-                            if(projects != ''){
-                                sh "monaco -e $WORKSPACE/environment.yaml -p $projects $WORKSPACE/$rootFolder"
-                            } else{
-                                sh "cd $rootFolder && monaco -e $WORKSPACE/environment.yaml"
-                            }
-                        }
-                    }
-			    }	
-             }
+                    
+						if(functionMap == null){
+							if(environment != 'ALL'){
+								sh '''for d in ./*/ ; do (cd "$d" && monaco -v -e $WORKSPACE/environment.yaml -se $environment); done'''
+							} else{
+								sh '''for d in ./*/ ; do (cd "$d" && monaco -v -e $WORKSPACE/environment.yaml ); done'''
+							}
+						} else{
+							for (rootFolder in functionMap.keySet()) {
+								def projects = functionMap.getAt(rootFolder)
+								if(environment != 'ALL'){
+									if(projects != ''){
+										sh "monaco -v -e $WORKSPACE/environment.yaml -se $environment -p $projects $WORKSPACE/$rootFolder"
+									} else{
+										sh "cd $rootFolder && monaco -v -e $WORKSPACE/environment.yaml -se $environment"
+									}
+								} else {
+									if(projects != ''){
+										sh "monaco -v -e $WORKSPACE/environment.yaml -p $projects $WORKSPACE/$rootFolder"
+									} else{
+										sh "cd $rootFolder && monaco -v -e $WORKSPACE/environment.yaml"
+									}
+								}
+							}
+						}                  	
+					}
+				}
 		}
-		
     }
     post { 
         always {