diff --git a/.gitignore b/.gitignore
index 91879240b36709b5c827ec951366cc55ad515cce..0411de3941d790fd1668fe2328b248cd3c09be08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,6 @@ MANIFEST
 /finn-hlslib/
 /pyverilator/
 /PYNQ-HelloWorld/
+
+# Jenkins cfg dir
+/docker/jenkins_home
diff --git a/docker/Jenkinsfile b/docker/Jenkinsfile
index 3fd841a150d94394931777acc08c9e4b6a915c9d..3cda131b2f8ef1f8a4fa97dc2156c07195800122 100644
--- a/docker/Jenkinsfile
+++ b/docker/Jenkinsfile
@@ -1,16 +1,15 @@
 pipeline {
     agent any
     parameters {
-        string(name: 'FINN_CI_BRANCH', defaultValue: 'feature/docker_reorg', description: '')
+        string(name: 'FINN_CI_BRANCH', defaultValue: '', description: 'FINN branch to build')
+        string(name: 'VIVADO_PATH', defaultValue: '', description: 'Path to Vivado installation')
     }
     environment {
-        FINN_CI_BRANCH='feature/docker_reorg'
-        VIVADO_PATH='/opt/Xilinx/Vivado/2019.1'
         DOCKER_TAG='finn_ci:$BUILD_ID'
         DOCKER_INST_NAME='finn_ci_$BUILD_ID'
         BUILD_PATH='/tmp/finn_ci_$BUILD_ID'
         VIVADO_IP_CACHE='$BUILD_PATH/vivado_ip_cache'
-        DOCKER_CMD="source /root/.bashrc; python setup.py test --addopts '-k test_compilation_trafo'"
+        DOCKER_CMD="python setup.py test --addopts '-k test_compilation_trafo'"
     }
     stages {
         stage("Clone") {
@@ -21,10 +20,10 @@ pipeline {
       stage('Build') {
             steps {
                 sh """
-                docker build --no-cache -t $DOCKER_TAG -f docker/Dockerfile.finn_ci \
+                docker build -t $DOCKER_TAG -f docker/Dockerfile.finn_ci \
                 --build-arg BUILD_PATH=$BUILD_PATH \
-                --build-arg FINN_CI_BRANCH=$FINN_CI_BRANCH \
-                --build-arg VIVADO_PATH=$VIVADO_PATH \
+                --build-arg FINN_CI_BRANCH=${params.FINN_CI_BRANCH} \
+                --build-arg VIVADO_PATH=${params.VIVADO_PATH} \
                 docker/
                 """
             }
@@ -34,12 +33,9 @@ pipeline {
                 sh """
                 docker run --name $DOCKER_INST_NAME \
                 --hostname $DOCKER_INST_NAME \
-                -e "XILINX_VIVADO=$VIVADO_PATH" \
-                -e "SHELL=/bin/bash" \
-                -v $VIVADO_PATH:$VIVADO_PATH:ro \
-                -e VIVADO_PATH=$VIVADO_PATH \
+                -v ${params.VIVADO_PATH}:${params.VIVADO_PATH}:ro \
+                -e VIVADO_PATH=${params.VIVADO_PATH} \
                 -e FINN_INST_NAME=$DOCKER_INST_NAME \
-                -e FINN_ROOT="/workspace/finn" \
                 -e VIVADO_IP_CACHE="$VIVADO_IP_CACHE" \
                 $DOCKER_TAG bash -c "$DOCKER_CMD"
                 """
diff --git a/docker/launch-jenkins.sh b/docker/launch-jenkins.sh
index fe9faec844f33dcbf55dff4d027c28b03c18712b..72a3758dc0fb206e5e156075cb7f461741607502 100644
--- a/docker/launch-jenkins.sh
+++ b/docker/launch-jenkins.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-JENKINS_USER ?= jenkins
-JENKINS_PORT ?= 8080
-JENKINS_HOME ?= $(pwd)/jenkins_home
+: ${JUPYTER_PORT=8888}
+: ${JENKINS_USER=jenkins}
+: ${JENKINS_PORT=8080}
+: ${JENKINS_HOME=$(pwd)/jenkins_home}
 
 mkdir -p $JENKINS_HOME