diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 713d24ebf..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,19 +0,0 @@
-node {
-    try {
-        lock(resource: "sap-jenkins-library/10", inversePrecedence: true) {
-            milestone 10
-            deleteDir()
-            stage ('Checkout'){
-                checkout scm
-            }
-            stage ('Test') {
-                sh "mvn clean test --batch-mode"
-            }
-        }
-    } catch (Throwable err) {
-        echo "Error occured: ${err}"
-        currentBuild.result = 'FAILURE'
-        mail subject: '[Build failed] SAP/jenkins-library', body: 'Fix the build.', to: 'marcus.holl@sap.com,oliver.nocon@sap.com'
-        throw err
-    } 
-}
diff --git a/README.md b/README.md
index 3167d9055..edcecd3df 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ Register to our [google group][google-group] in order to get updates or for aski
 Read and understand our [contribution guidelines][piper-library-contribution]
 before opening a pull request.
 
-# [License][piper-library-license]
+# License
 
 Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
 This file is licensed under the Apache Software License, v. 2 except as noted
diff --git a/vars/influxWriteData.groovy b/vars/influxWriteData.groovy
index 79a083756..2f51c74e2 100644
--- a/vars/influxWriteData.groovy
+++ b/vars/influxWriteData.groovy
@@ -35,7 +35,10 @@ void call(Map parameters = [:]) {
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
             .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin([
-                artifactVersion: script.commonPipelineEnvironment.getArtifactVersion()
+                artifactVersion: script.commonPipelineEnvironment.getArtifactVersion(),
+                influxPrefix: script.commonPipelineEnvironment.getGithubOrg() && script.commonPipelineEnvironment.getGithubRepo()
+                    ? "${script.commonPipelineEnvironment.getGithubOrg()}_${script.commonPipelineEnvironment.getGithubRepo()}"
+                    : null
             ])
             .mixin(parameters, PARAMETER_KEYS)
             .addIfNull('customData', script.commonPipelineEnvironment.getInfluxCustomData())
diff --git a/vars/prepareDefaultValues.groovy b/vars/prepareDefaultValues.groovy
index c1e80d323..79f296a7b 100644
--- a/vars/prepareDefaultValues.groovy
+++ b/vars/prepareDefaultValues.groovy
@@ -6,7 +6,7 @@ import groovy.transform.Field
 @Field STEP_NAME = getClass().getName()
 
 void call(Map parameters = [:]) {
-    handlePipelineStepErrors (stepName: 'prepareDefaultValues', stepParameters: parameters) {
+    handlePipelineStepErrors (stepName: 'prepareDefaultValues', stepParameters: parameters, echoDetails: false) {
         if(!DefaultValueCache.getInstance() || parameters.customDefaults) {
             def defaultValues = [:]
             def configFileList = ['default_pipeline_environment.yml']