diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9ed47aff83..b84533723f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,4 +44,4 @@ jobs:
       run: docker compose exec -T appwrite test --debug
 
     - name: Run Benchmark
-      run: docker run --rm -v $PWD:/app composer benchmark-compare
+      run: docker compose exec -T appwrite benchmark --ref=baseline
diff --git a/Dockerfile b/Dockerfile
index a7cae38502..29eeaf58a8 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -330,28 +330,7 @@ RUN mkdir -p /storage/uploads && \
     chown -Rf www-data.www-data /storage/debug && chmod -Rf 0755 /storage/debug
 
 # Executables
-RUN chmod +x /usr/local/bin/doctor && \
-    chmod +x /usr/local/bin/maintenance && \
-    chmod +x /usr/local/bin/usage && \
-    chmod +x /usr/local/bin/install && \
-    chmod +x /usr/local/bin/migrate && \
-    chmod +x /usr/local/bin/realtime && \
-    chmod +x /usr/local/bin/executor && \
-    chmod +x /usr/local/bin/schedule && \
-    chmod +x /usr/local/bin/sdks && \
-    chmod +x /usr/local/bin/specs && \
-    chmod +x /usr/local/bin/ssl && \
-    chmod +x /usr/local/bin/test && \
-    chmod +x /usr/local/bin/vars && \
-    chmod +x /usr/local/bin/worker-audits && \
-    chmod +x /usr/local/bin/worker-certificates && \
-    chmod +x /usr/local/bin/worker-databases && \
-    chmod +x /usr/local/bin/worker-deletes && \
-    chmod +x /usr/local/bin/worker-functions && \
-    chmod +x /usr/local/bin/worker-builds && \
-    chmod +x /usr/local/bin/worker-mails && \
-    chmod +x /usr/local/bin/worker-messaging && \
-    chmod +x /usr/local/bin/worker-webhooks
+RUN chmod +x /usr/local/bin/*
 
 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
diff --git a/bin/benchmark b/bin/benchmark
new file mode 100755
index 0000000000..de9bee100c
--- /dev/null
+++ b/bin/benchmark
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+/usr/src/code/vendor/bin/phpbench run --config /usr/src/code/phpbench.json --report appwrite $@
\ No newline at end of file
diff --git a/composer.json b/composer.json
index cf057464e6..8f271f60bb 100644
--- a/composer.json
+++ b/composer.json
@@ -15,17 +15,14 @@
         "format": "vendor/bin/phpcbf",
         "benchmark": [
             "Composer\\Config::disableProcessTimeout",
-            "git config --global --add safe.directory /app",
             "vendor/bin/phpbench run --report=appwrite"
         ],
         "benchmark-tag": [
             "Composer\\Config::disableProcessTimeout",
-            "git config --global --add safe.directory /app",
             "vendor/bin/phpbench run --report=appwrite --tag=baseline"
         ],
         "benchmark-compare": [
             "Composer\\Config::disableProcessTimeout",
-            "git config --global --add safe.directory /app",
             "vendor/bin/phpbench run --report=appwrite --ref=baseline"
         ]
     },
diff --git a/docker-compose.yml b/docker-compose.yml
index ea9241a9d3..823cbdaf44 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,6 +78,8 @@ services:
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
+      - ./phpbench.json:/usr/src/code/phpbench.json
+      - ./.phpbench:/usr/src/code/.phpbench
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
       - ./docs:/usr/src/code/docs