diff --git a/.buildkite/scripts/dra_release.sh b/.buildkite/scripts/dra_release.sh
index 04caf7d7c..769470467 100755
--- a/.buildkite/scripts/dra_release.sh
+++ b/.buildkite/scripts/dra_release.sh
@@ -41,9 +41,7 @@ mkdir -p ${BASE_DIR}/reports
 ./dev-tools/dependencies-report --csv ${BASE_DIR}/reports/dependencies-${VERSION}.csv
 cd ${BASE_DIR}/reports && shasum -a 512 dependencies-${VERSION}.csv > dependencies-${VERSION}.csv.sha512
 
-cd ${WORKSPACE}
+cd $(dirname ${WORKSPACE})
 export FOLDER="${FOLDER_PATH}"
 export OUTPUT_FILE="${DRA_OUTPUT}"
-echo "$(pwd)"
-ls -la
 ./.buildkite/scripts/release-manager.sh          #TODO use "echo" for rollback
diff --git a/.buildkite/scripts/release-manager.sh b/.buildkite/scripts/release-manager.sh
index 15e586303..4c4a89194 100755
--- a/.buildkite/scripts/release-manager.sh
+++ b/.buildkite/scripts/release-manager.sh
@@ -21,6 +21,7 @@ readonly TYPE=${TYPE:-snapshot}
 readonly OUTPUT_FILE=${OUTPUT_FILE:-release-manager-report.out}
 
 # set required permissions on artifacts and directory
+cd ${WORKSPACE}
 chmod -R a+r "$FOLDER"/*
 chmod -R a+w "$FOLDER"