diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 47dde670..b25cc877 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -94,7 +94,7 @@ jobs:
         id: get-latest-tag
         with:
           semver_only: true
-          initial_version: "2.0.1"
+          initial_version: "2.0.0"
       - id: script
         run: |
           echo "Injecting Environment Variables In Deployment Workflow ..."
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 4a9b4fd6..87b60112 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -40,14 +40,13 @@ jobs:
     uses: StanfordBDHG/.github/.github/workflows/markdown-link-check.yml@v2
     permissions:
       contents: read
-  # codeql:
-  #   name: CodeQL
-  #   uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
-  #   permissions:
-  #     security-events: write
-  #     actions: read
-  #     contents: read
-  #   with:
-  #     codeql: true
-  #     fastlanelane: codeql
-
+  codeql:
+    name: CodeQL
+    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
+    with:
+      codeql: true
+      fastlanelane: codeql
diff --git a/ENGAGEHF.xcodeproj/project.pbxproj b/ENGAGEHF.xcodeproj/project.pbxproj
index ab06a686..23c65235 100644
--- a/ENGAGEHF.xcodeproj/project.pbxproj
+++ b/ENGAGEHF.xcodeproj/project.pbxproj
@@ -1676,7 +1676,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1872,7 +1872,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1916,7 +1916,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.hrtex;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2092,7 +2092,7 @@
 			repositoryURL = "https://github.com/StanfordSpezi/SpeziFirebase.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 2.0.1;
+				minimumVersion = 2.0.2;
 			};
 		};
 		2FE5DC8229EDD934004B9AB4 /* XCRemoteSwiftPackageReference "SpeziQuestionnaire" */ = {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c697e3a1..9be64d96 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -12,7 +12,7 @@ APP_CONFIG = {
   default_environment: "staging",
   default_app_identifier: "edu.stanford.bdh.engagehf",
   default_provisioningProfile: "Stanford BDHG ENGAGE-HF",
-  default_version_name: "2.0.1",
+  default_version_name: "2.0.0",
   default_release_notes: "Bug fixes and performance improvements.",
   scheme: "ENGAGEHF",
   plist_path: "ENGAGEHF/Supporting Files/Info.plist"
@@ -84,6 +84,7 @@ platform :ios do
   lane :codeql do
     ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "320" # CodeQL runs on GitHub CI. We need much higher timeout here.
     build_app(
+      scheme: APP_CONFIG[:scheme],
       skip_archive: true,
       skip_codesigning: true,
       derived_data_path: ".derivedData",
@@ -97,6 +98,7 @@ platform :ios do
   desc "Build app"
   lane :build do
     build_app(
+      scheme: APP_CONFIG[:scheme],
       skip_archive: true,
       skip_codesigning: true,
       derived_data_path: ".derivedData",
@@ -118,6 +120,7 @@ platform :ios do
     )
 
     build_app(
+      scheme: APP_CONFIG[:scheme],
       derived_data_path: ".derivedData",
       xcargs: [
         "-skipPackagePluginValidation",