diff --git a/.swiftlint.yml b/.swiftlint.yml
index 88159664..9ac39cff 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -15,6 +15,7 @@ opt_in_rules:
 
 disabled_rules:
   - anonymous_argument_in_multiline_closure
+  - anyobject_protocol # Deprecated.
   - balanced_xctest_lifecycle
   - discouraged_none_name
   - discouraged_object_literal
@@ -35,6 +36,7 @@ disabled_rules:
   - function_body_length
   - implicitly_unwrapped_optional
   - indentation_width
+  - inert_defer # Deprecated.
   - legacy_objc_type
   - line_length
   - missing_docs
@@ -49,10 +51,12 @@ disabled_rules:
   - prohibited_super_call
   - required_deinit
   - self_binding
+  - sorted_enum_cases # Wait for an auto-fix.
   - sorted_imports # Managed by SwiftFormat.
   - type_body_length
   - type_contents_order
   - unowned_variable_capture
+  - unused_capture_list # Deprecated.
   - vertical_whitespace_between_cases # Additional whitespace not needed because of visible indentation.
 
 ## Configuration for specific rules
@@ -73,3 +77,7 @@ trailing_closure:
   only_single_muted_parameter: true
 trailing_comma:
   mandatory_comma: true
+xct_specific_matcher:
+  matchers: 
+    - two-argument-asserts
+
diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 2b6c23b9..e6a65389 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -491,9 +491,8 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     override func tableView(_: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         if tableData[section].header != nil {
             return 30
-        } else {
-            return UITableView.automaticDimension
         }
+        return UITableView.automaticDimension
     }
 
     override func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index e7e14296..86876cfd 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -209,13 +209,11 @@ class PasswordEditorTableViewController: UITableViewController {
         if sectionHeaderTitles[section] != nil {
             if UIDevice.current.userInterfaceIdiom == .phone {
                 return 30
-            } else {
-                // Fix covered section header in macOS
-                return 36
             }
-        } else {
-            return UITableView.automaticDimension
+            // Fix covered section header in macOS
+            return 36
         }
+        return UITableView.automaticDimension
     }
 
     override func tableView(_: UITableView, heightForFooterInSection _: Int) -> CGFloat {
diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift
index 81c92826..6722b0c8 100644
--- a/pass/Controllers/PasswordNavigationViewController.swift
+++ b/pass/Controllers/PasswordNavigationViewController.swift
@@ -59,7 +59,7 @@ class PasswordNavigationViewController: UIViewController {
         let addPasswordButton = UIButton(type: .system)
         let plusImage = UIImage(systemName: "plus.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .regular))
         addPasswordButton.setImage(plusImage, for: .normal)
-        addPasswordButton.addTarget(self, action: #selector(self.addPasswordAction), for: .touchDown)
+        addPasswordButton.addTarget(self, action: #selector(addPasswordAction), for: .touchDown)
         addPasswordUIBarButtonItem.customView = addPasswordButton
         return addPasswordUIBarButtonItem
     }()
diff --git a/passExtension/Controllers/ExtensionViewController.swift b/passExtension/Controllers/ExtensionViewController.swift
index 7877651b..cb84443b 100644
--- a/passExtension/Controllers/ExtensionViewController.swift
+++ b/passExtension/Controllers/ExtensionViewController.swift
@@ -105,7 +105,8 @@ extension NSDictionary {
                 return host
             }
             return value
-        } else if let value = self[NSExtensionJavaScriptPreprocessingResultsKey] as? String {
+        }
+        if let value = self[NSExtensionJavaScriptPreprocessingResultsKey] as? String {
             if let host = URL(string: value)?.host {
                 return host
             }
diff --git a/scripts/swiftlint.sh b/scripts/swiftlint.sh
index cd3a6ce4..a5c83a53 100755
--- a/scripts/swiftlint.sh
+++ b/scripts/swiftlint.sh
@@ -1,6 +1,6 @@
 export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}"
 
-SWIFTLINT_VERSION="0.51.*"
+SWIFTLINT_VERSION="0.52.*"
 
 if [[  "${CI}" == "true" ]]; then
   echo "Running in a Continuous Integration environment. Linting is skipped."