diff --git a/Jenkinsfile b/Jenkinsfile
index 057d10ad4..b1835d123 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,5 @@
 node('node') {
+  disableConcurrentBuilds()
   try {
     currentBuild.result = "SUCCESS"
 
diff --git a/cmd/gateway/Dockerfile b/cmd/gateway/Dockerfile
index 1f6d48836..839ba267c 100644
--- a/cmd/gateway/Dockerfile
+++ b/cmd/gateway/Dockerfile
@@ -5,7 +5,7 @@ FROM storjlabs/golang as build-env
 
 # final stage
 FROM alpine
-ENV CONF_PATH=/root/.local/share/storj/uplink/config.yaml \
+ENV CONF_PATH=/root/.local/share/storj/uplink \
     API_KEY= \
     SATELLITE_ADDR=
 EXPOSE 7776/udp \
diff --git a/cmd/gateway/entrypoint b/cmd/gateway/entrypoint
index b92be4fc9..5c00e21c7 100755
--- a/cmd/gateway/entrypoint
+++ b/cmd/gateway/entrypoint
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -euo pipefail
 
-if [[ ! -f "${CONF_PATH}" ]]; then
+if [[ ! -d "${CONF_PATH}" ]]; then
 	./gateway setup
 fi
 
-RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
+RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
 
 if [[ -n "${API_KEY}" ]]; then
 	RUN_PARAMS="${RUN_PARAMS} --client.api-key ${API_KEY}"
diff --git a/cmd/satellite/Dockerfile b/cmd/satellite/Dockerfile
index 4edb2328a..e356c9b55 100644
--- a/cmd/satellite/Dockerfile
+++ b/cmd/satellite/Dockerfile
@@ -6,7 +6,7 @@ FROM storjlabs/golang as build-env
 # final stage
 FROM alpine
 ENV API_KEY= \
-    CONF_PATH=/root/.local/share/storj/satellite/config.yaml \
+    CONF_PATH=/root/.local/share/storj/satellite \
     OVERLAY_URL=redis://redis:6379/?db=0 \
     BOOTSTRAP_ADDR=bootstrap.storj.io:8080
 EXPOSE 7776/udp \
diff --git a/cmd/satellite/entrypoint b/cmd/satellite/entrypoint
index 953acda65..cb5af619b 100755
--- a/cmd/satellite/entrypoint
+++ b/cmd/satellite/entrypoint
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -euo pipefail
 
-if [[ ! -f "${CONF_PATH}" ]]; then
+if [[ ! -d "${CONF_PATH}" ]]; then
 	./satellite setup
 fi
 
-RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
+RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
 
 if [[ -n "${OVERLAY_URL:-}" ]]; then
 	RUN_PARAMS="${RUN_PARAMS} --overlay.database-url ${OVERLAY_URL}"
diff --git a/cmd/storagenode/Dockerfile b/cmd/storagenode/Dockerfile
index c80ba2b05..e4ca404c7 100644
--- a/cmd/storagenode/Dockerfile
+++ b/cmd/storagenode/Dockerfile
@@ -5,7 +5,7 @@ FROM storjlabs/golang as build-env
 
 # final stage
 FROM alpine
-ENV CONF_PATH=/root/.local/share/storj/storagenode/config.yaml \
+ENV CONF_PATH=/root/.local/share/storj/storagenode \
     SATELLITE_ADDR=
 EXPOSE 7776/udp \
        7777
diff --git a/cmd/storagenode/entrypoint b/cmd/storagenode/entrypoint
index 947ba43ad..1a9a1dc01 100755
--- a/cmd/storagenode/entrypoint
+++ b/cmd/storagenode/entrypoint
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -euo pipefail
 
-if [[ ! -f "${CONF_PATH}" ]]; then
+if [[ ! -d "${CONF_PATH}" ]]; then
 	./storagenode setup
 fi
 
-RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
+RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}"
 
 if [ -n "${SATELLITE_ADDR:-}" ]; then
 	RUN_PARAMS="${RUN_PARAMS} --kademlia.bootstrap-addr $SATELLITE_ADDR"