diff --git a/scripts/make_unix.sh b/scripts/make_unix.sh
index 765ac07e..b3a6f5a8 100755
--- a/scripts/make_unix.sh
+++ b/scripts/make_unix.sh
@@ -12,6 +12,8 @@ if [ -z "${BUILD_ARCH}" ]; then
   BUILD_ARCH=64_bit
 fi
 
+ln -sf ${SOURCE_DIR}/build/compile_commands.json ${SOURCE_DIR}/compile_commands.json
+
 docker stop repertory_${NAME}
 docker rm repertory_${NAME}
 docker build -t repertory:${NAME} - < ${SOURCE_DIR}/docker/${BUILD_ARCH}/${NAME} &&
diff --git a/scripts/make_unix_docker.sh b/scripts/make_unix_docker.sh
index 9649153d..2c1b86b6 100755
--- a/scripts/make_unix_docker.sh
+++ b/scripts/make_unix_docker.sh
@@ -41,6 +41,15 @@ cmake ../.. ${CMAKE_ADDITIONAL_OPTS} \
   -DREPERTORY_ENABLE_S3=ON \
   -DREPERTORY_ENABLE_S3_TESTING=ON || exit 1
 
+pushd ..
+ln -sf ${BUILD_FOLDER}/compile_commands.json .
+ln -sf ${BUILD_FOLDER}/repertory${EXE_EXT} .
+ln -sf ${BUILD_FOLDER}/unittests${EXE_EXT} .
+if [ "${IS_MINGW}" == "1" ]; then
+  ln -sf ${BUILD_FOLDER}/winfsp-x64.dll .
+fi
+popd
+
 if [ "${BUILD_CLEAN}" == "clean" ]; then
   make clean
 fi