diff --git a/Jenkinsfile b/Jenkinsfile
index 8875b79..6363195 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
     }
     stage('Run tests') {
       steps {
-        sh 'cucumber features --format json --out cucumber.json'
+        sh 'cucumber features --format html --out coverage/cucumber.html'
       }
     }
     stage('Report results') {
@@ -36,11 +36,21 @@ pipeline {
           alwaysLinkToLastBuild: false,
           keepAll: true,
           reportDir: 'coverage',
-          reportFiles: 'index.html',
+          reportFiles: 'cucumber.html, index.html',
           reportName: 'Test Results',
-          reportTitles: 'Test Coverage'])
-        cucumber buildStatus: 'UNCHANGED', customCssFiles: '', customJsFiles: '', failedFeaturesNumber: -1, failedScenariosNumber: -1, failedStepsNumber: -1, fileIncludePattern: '**/cucumber.json', pendingStepsNumber: -1, skippedStepsNumber: -1, sortingMethod: 'ALPHABETICAL', undefinedStepsNumber: -1
+          reportTitles: 'Cucumber Results, Test Coverage'])
       }
     }
   }
+  post {
+    success {
+      mattermostSend channel: 'git-messages', color: 'good', message: "[${JOB_NAME}](${JOB_URL}) [#${BUILD_NUMBER}](${BUILD_URL}) ([Gitea](${GIT_URL}))", text: 'Build Finished Successfully'
+    }
+    unstable {
+      mattermostSend channel: 'git-messages', color: 'warning', message: "[${JOB_NAME}](${JOB_URL}) [#${BUILD_NUMBER}](${BUILD_URL}) ([Gitea](${GIT_URL}))", text: "Build Unstable"
+    }
+    failure {
+      mattermostSend channel: 'git-messages', color: 'danger', message: "[${JOB_NAME}](${JOB_URL}) [#${BUILD_NUMBER}](${BUILD_URL}) ([Gitea](${GIT_URL}))", text: "Build Failed"
+    }
+  }
 }