diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75fb04699866e8..4c27da7801aace 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.0.0
+  rev: v4.0.1
   hooks:
     #- id: check-yaml
     #  args: [--allow-multiple-documents]
@@ -8,6 +8,11 @@ repos:
     - id: trailing-whitespace
     - id: check-symlinks
     - id: mixed-line-ending
+    - id: check-case-conflict
+    - id: check-executables-have-shebangs
+    - id: check-shebang-scripts-are-executable
+    - id: check-merge-conflict
+
 
 # keep fork in sync!
 - repo: https://github.com/gitpod-io/pre-commit-hooks
@@ -17,7 +22,8 @@ repos:
       exclude: |
         (?x)^(
           .*example-layer.tar.gz|
-          .*\.(png|svg|ico|gpg)
+          .*\.(png|svg|ico|gpg)|
+          dev/version-manifest/version-manifest
         )$
     - id: script-must-have-extension
     - id: shellcheck
diff --git a/.werft/build.ts b/.werft/build.ts
index 4d1d4b06a7d430..345560ee14afaa 100644
--- a/.werft/build.ts
+++ b/.werft/build.ts
@@ -50,7 +50,7 @@ export async function build(context, version) {
     werft.phase('validate-changes', 'validating changes');
 
     try {
-        exec(`pre-commit run --from-ref origin/HEAD --to-ref HEAD`);
+        exec(`pre-commit run --all-files --show-diff-on-failure`);
         werft.result("validate changes", "github-check-changes", "conclusion success");
         werft.done('validate-changes');
     } catch (err) {
diff --git a/chart/values.yaml b/chart/values.yaml
index d54b086a3acb5d..d97841bae1911f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -414,9 +414,10 @@ components:
         socket: /run/containerd/containerd.sock
       nodeRoots:
       - /var/lib
-      - /run/containerd/io.containerd.runtime.v1.linux/k8s.io
+      - /run/containerd/io.containerd.runtime.v2.task/k8s.io
       # On some hosts systems containerd uses different paths to store it's containers in, for example:
       # Find out by ssh onto a node and "mount | grep rootfs" and have a look at the paths
+      # - /run/containerd/io.containerd.runtime.v1.linux/k8s.io
       # - /run/containerd/io.containerd.runtime.v1.linux/moby
       # - /run/containerd/io.containerd.runtime.v2.task/k8s.io
     userNamespaces:
diff --git a/components/ide/code/bin/code b/components/ide/code/bin/code
old mode 100644
new mode 100755
diff --git a/components/ide/code/bin/gitpod-code b/components/ide/code/bin/gitpod-code
old mode 100644
new mode 100755
diff --git a/components/ide/code/bin/open b/components/ide/code/bin/open
old mode 100644
new mode 100755
diff --git a/components/ide/theia/bin/code b/components/ide/theia/bin/code
old mode 100644
new mode 100755
diff --git a/components/ide/theia/bin/open b/components/ide/theia/bin/open
old mode 100644
new mode 100755
diff --git a/components/image-builder/workspace-image-layer/tests/positive/verify.sh b/components/image-builder/workspace-image-layer/tests/positive/verify.sh
index 6cc34f8e017b0e..16bed08c4a0b45 100755
--- a/components/image-builder/workspace-image-layer/tests/positive/verify.sh
+++ b/components/image-builder/workspace-image-layer/tests/positive/verify.sh
@@ -6,11 +6,11 @@ if [ "$USER_ID" -ne 33333 ]; then
     exit 1
 fi
 
-if [ -z "$(which git)" ]; then
+if [ -z "$(command -v git)" ]; then
     echo "git not installed!"
 fi
 
-if [ -z "$(which bash)" ]; then
+if [ -z "$(command -v bash)" ]; then
     echo "bash not installed!"
 fi
 
diff --git a/components/local-app-api/typescript-grpcweb/build.sh b/components/local-app-api/typescript-grpcweb/build.sh
old mode 100644
new mode 100755
diff --git a/install/docker/examples/gitpod-gitlab/certs/create-letsencrypt-certs.sh b/install/docker/examples/gitpod-gitlab/certs/create-letsencrypt-certs.sh
old mode 100644
new mode 100755