diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index f6051a3..86f78da 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -39,8 +39,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          pip install yapf tockloader
+          pip install 'yapf>=0.30.0' tockloader
       - name: Test code formatting with yapf
         run: |
           echo ::add-matcher::./.github/python_matcher.json
-          yapf --style=chromium --recursive --exclude third_party --diff .
+          yapf --style=yapf --recursive --exclude third_party --diff .
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1666683..138097a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,7 +15,7 @@
   // Try to make VSCode formating as close as possible to the Google style.
   "python.formatting.provider": "yapf",
   "python.formatting.yapfArgs": [
-    "--style=chromium"
+    "--style=yapf"
   ],
   "python.linting.enabled": true,
   "python.linting.lintOnSave": true,
diff --git a/deploy.py b/deploy.py
index f519885..6b552fa 100755
--- a/deploy.py
+++ b/deploy.py
@@ -291,8 +291,8 @@ class OpenSKInstaller:
       # empty value.
       target_toolchain.append("")
     current_version = self.checked_command_output(["rustc", "--version"])
-    if not all((target_toolchain[0] in current_version,
-                target_toolchain[1] in current_version)):
+    if not (target_toolchain[0] in current_version and
+            target_toolchain[1] in current_version):
       info("Updating rust toolchain to {}".format("-".join(target_toolchain)))
       # Need to update
       self.checked_command_output(