diff --git a/automation/Dockerfile b/automation/Dockerfile
index ce7088fb..5bd7d382 100644
--- a/automation/Dockerfile
+++ b/automation/Dockerfile
@@ -22,4 +22,4 @@ RUN git clone https://github.com/ETLCPP/etl.git && \
         cmake --install build/
 
 #ssh needs a valid user to work
-RUN adduser -m -u 114 jenkins
+RUN adduser --uid 114 jenkins
diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 6bc5b0a6..54b21b36 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -41,18 +41,34 @@ pipeline {
             }
         }
         stage('Documentation') {
+            when {
+                branch 'development'
+            }
             steps {
-                echo env.BRANCH_NAME
                 dir(DOCDDIR) {
                     sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
                     sh 'make Sphinx'
                     sh 'cd docs/sphinx'
                     sshagent(credentials: ['documentation-buildfix']) {
-                        sh 'ssh -vvv buildfix@documents.intra.irs.uni-stuttgart.de uname -a'
                         sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/development'
                     }
                 }
             }
         }
+        stage('Master Documentation') {
+            when {
+                branch 'master'
+            }
+            steps {
+                dir(DOCDDIR) {
+                    sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
+                    sh 'make Sphinx'
+                    sh 'cd docs/sphinx'
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/master'
+                    }
+                }
+            }
+        }
     }
 }