diff --git a/api_auth_docker/Dockerfile b/api_auth_docker/Dockerfile
index 0c54eda..6a534f6 100644
--- a/api_auth_docker/Dockerfile
+++ b/api_auth_docker/Dockerfile
@@ -10,12 +10,12 @@ RUN apk add --update --no-cache \
     jq \
     su-exec
 
-COPY auth.sh /etc/nginx/conf.d
+COPY auth.sh /etc/nginx/conf.d/
 COPY default-ssl.conf /etc/nginx/conf.d/default.conf
-COPY statuspage.html /etc/nginx/conf.d/status
+COPY statuspage.html /etc/nginx/conf.d/status/
 COPY entrypoint.sh entrypoint.sh
-COPY trace.sh /etc/nginx/conf.d
-COPY tests.sh /etc/nginx/conf.d
+COPY trace.sh /etc/nginx/conf.d/
+COPY tests.sh /etc/nginx/conf.d/
 
 RUN chmod +x /etc/nginx/conf.d/auth.sh entrypoint.sh
 
diff --git a/dist/setup.sh b/dist/setup.sh
index b14eb95..8f430f8 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -539,7 +539,7 @@ sanity_checks() {
     exit
   fi
 
-  if ! [ -x "$(command -v docker-compose)" ]; then
+  if [[ $DOCKER_MODE == 'compose' && ! -x "$(command -v docker-compose)" ]]; then
     echo "          docker-compose is not installed on your system. Please check https://docs.docker.com/compose/install/."
     exit
   fi
diff --git a/proxy_docker/Dockerfile.amd64 b/proxy_docker/Dockerfile.amd64
index 8f2ca4a..ff124f1 100644
--- a/proxy_docker/Dockerfile.amd64
+++ b/proxy_docker/Dockerfile.amd64
@@ -28,7 +28,7 @@ WORKDIR ${HOME}
 
 COPY app/data/* ./
 COPY app/script/* ./
-COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
+COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ./
 
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
  && chmod o+w . \
diff --git a/proxy_docker/Dockerfile.arm32v6 b/proxy_docker/Dockerfile.arm32v6
index dc91d97..ed8d44e 100644
--- a/proxy_docker/Dockerfile.arm32v6
+++ b/proxy_docker/Dockerfile.arm32v6
@@ -24,7 +24,7 @@ WORKDIR ${HOME}
 
 COPY app/data/* ./
 COPY app/script/* ./
-COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
+COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ./
 
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
  && chmod o+w . \