diff --git a/Jenkinsfile b/Jenkinsfile
index 2d7559b7afa12a719309b32f20a92d10debf2662..fcb38c7076aa0346b1cbebc851ed12be498ea566 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -457,7 +457,7 @@ Void pushRolloutGitopsRepo() {
 Void pushGitopsRepo(String directory) {
     withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
         dir("${directory}/gitops") {
-            if (hasUnpushedCommits()){
+            if (hasUnpushedCommits()) {
                 sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
             }
         }
@@ -465,7 +465,7 @@ Void pushGitopsRepo(String directory) {
 }
 
 Boolean hasUnpushedCommits() {
-    return sh (script: "git cherry -v", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE
+    return sh (script: "git cherry -v | grep .", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Void configGit(String directory) {
@@ -631,11 +631,11 @@ Void waitForHealthyApplication(String bezeichner, String application) {
 }
 
 Boolean isApplicationPresent(String bezeichner, String application) {
-    return sh (script: "kubectl get applications -n argocd | grep 'by-${bezeichner}-dev-${application}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE
+    return sh (script: "kubectl get applications -n argocd | grep 'by-${bezeichner}-dev-${application}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Boolean isApplicationHealthy(String bezeichner, String application) {
-    return sh (script: "kubectl get application/by-${bezeichner}-dev-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE
+    return sh (script: "kubectl get application/by-${bezeichner}-dev-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Void waitForHealthyStatus(String bezeichner, String application) {
@@ -818,7 +818,7 @@ Void setNewGoofyGitopsVersion(String directory, String environment) {
 }
 
 Boolean hasGoofyValuesFileChanged(String environment) {
-    return sh (script: "git status | grep '${environment}/application/values/goofy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE
+    return sh (script: "git status | grep '${environment}/application/values/goofy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Void exposeElasticSearch() {