diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 639c7420f0..be0d5e404c 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,10 +1,6 @@
 steps:
   - label: ":eslint: Lint"
     command:
-      # TODO: Remove hacky chmod for BuildKite
-      - "echo '--- Setup'"
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh"
       - "yarn lintwithexclusions"
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
old mode 100644
new mode 100755
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
old mode 100644
new mode 100755
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
old mode 100644
new mode 100755
diff --git a/scripts/ci/riot-unit-tests.sh b/scripts/ci/riot-unit-tests.sh
old mode 100644
new mode 100755
diff --git a/scripts/ci/unit-tests.sh b/scripts/ci/unit-tests.sh
old mode 100644
new mode 100755