diff --git a/Jenkinsfile b/Jenkinsfile
index 4cc805490dfb8573ac3c482909a08269dbe31cdb..b3c044e277709d224670dd322fc4d6eb05ec2d72 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,9 +85,6 @@ pipeline {
 //            }
         }
         stage('Server') {
-         	when {
-                branch 'master'
-            }
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -97,21 +94,23 @@ pipeline {
                         sh 'mvn --version'
                         sh "mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dspring-boot.build-image.imageName=docker.ozg-sh.de/goofy:${IMAGE_TAG} -Dspring-boot.build-image.publish -Dmaven.wagon.http.retryHandler.count=3"
 
-                   		try {
-    	                    dir('alfa-service'){
-                                withSonarQubeEnv('sonarqube-ozg-sh'){
-                                    sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
-                                }
-                            }
-                            dir('alfa-xdomea'){
-                                withSonarQubeEnv('sonarqube-ozg-sh'){
-                                    sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
-                                }
-                            }
-                        }
-                        catch (Exception e) {
-                            unstable("SonarQube failed")
-                        }
+ 						if (isMasterBranch()) {
+	                   		try {
+	    	                    dir('alfa-service'){
+	                                withSonarQubeEnv('sonarqube-ozg-sh'){
+	                                    sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
+	                                }
+	                            }
+	                            dir('alfa-xdomea'){
+	                                withSonarQubeEnv('sonarqube-ozg-sh'){
+	                                    sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
+	                                }
+	                            }
+	                        }
+	                        catch (Exception e) {
+	                            unstable("SonarQube failed")
+	                        }
+	                    }
                     }
                 }
             }