diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1aae3a57..8ae54550 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,9 +25,9 @@ jobs:
 
     - name: Cache Composer dependencies
       id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/config/application.pantheon.php b/config/application.pantheon.php
new file mode 100644
index 00000000..ae7adca1
--- /dev/null
+++ b/config/application.pantheon.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Pantheon platform application settings.
+ *
+ * IMPORTANT NOTE:
+ * Do not modify this file. This file is maintained by Pantheon.
+ *
+ * Site-specific modifications belong in config/application.php, not this file.
+ * This file may change in future releases and modifications would cause
+ * conflicts when attempting to apply upstream updates.
+ */
+
+use Roots\WPConfig\Config;
+use function Env\env;
+
+if ( isset( $_ENV['PANTHEON_ENVIRONMENT'] ) && ! isset( $_ENV['LANDO'] ) ) {
+	// We can use PANTHEON_SITE_NAME here because it's safe to assume we're on a Pantheon environment if PANTHEON_ENVIRONMENT is set.
+	$sitename = $_ENV['PANTHEON_SITE_NAME'];
+	$baseurl = $_ENV['PANTHEON_ENVIRONMENT'] . '-' . $sitename . '.pantheonsite.io';
+
+	$scheme = 'http';
+	if ( isset( $_SERVER['HTTPS'] ) && 'on' === $_SERVER['HTTPS'] ) {
+		$scheme = 'https';
+	}
+
+	// Define the WP_HOME and WP_SITEURL constants if they aren't already defined.
+	if ( ! env( 'WP_HOME' ) ) {
+		// If HTTP_HOST is set, use that as the base URL. It's probably more accurate.
+		if ( isset( $_SERVER['HTTP_HOST'] ) ) {
+			$baseurl = $_SERVER['HTTP_HOST'];
+		}
+
+		$homeurl = $scheme . '://' . $baseurl;
+		Config::define( 'WP_HOME', $homeurl );
+		putenv( 'WP_HOME=' . $homeurl );
+
+		if ( ! env( 'WP_SITEURL' ) ) {
+			Config::define( 'WP_SITEURL', $homeurl . '/wp' );
+			putenv( 'WP_SITEURL=' . $homeurl . '/wp' );
+		}
+	}
+}
diff --git a/config/application.php b/config/application.php
index 98e5ab49..58db64bb 100644
--- a/config/application.php
+++ b/config/application.php
@@ -37,7 +37,7 @@
 	// Check if a .env file exists.
 	file_exists( $root_dir . '/.env' ) ||
 	// Also check if we're using Lando and a .env.local file exists.
-	( file_exists( $root_dir . '/.env.local' ) && 'lando' === $_ENV['PANTHEON_ENVIRONMENT'] )
+	( file_exists( $root_dir . '/.env.local' ) && isset( $_ENV['LANDO'] ) && 'ON' === $_ENV['LANDO'] )
 ) {
 	$dotenv->load();
 	if ( ! env( 'DATABASE_URL' ) ) {
@@ -45,6 +45,11 @@
 	}
 }
 
+/**
+ * Include Pantheon application settings.
+ */
+require_once __DIR__ . '/application.pantheon.php';
+
 /**
  * Set up our global environment constant and load its config first
  * Default: production
@@ -74,7 +79,7 @@
 /**
  * Pantheon modifications
  */
-if ( isset( $_ENV['PANTHEON_ENVIRONMENT'] ) && 'lando' !== $_ENV['PANTHEON_ENVIRONMENT'] ) {
+if ( isset( $_ENV['PANTHEON_ENVIRONMENT'] ) && ! isset( $_ENV['LANDO'] ) ) {
 	Config::define( 'DB_HOST', $_ENV['DB_HOST'] . ':' . $_ENV['DB_PORT'] );
 } else {
 	/**
diff --git a/phpcs.xml b/phpcs.xml
index 16bde090..55c0466f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -38,9 +38,21 @@
     <exclude name="WordPress.WP.GlobalVariablesOverride.Prohibited">
       <exclude-pattern>config/application.php</exclude-pattern>
     </exclude>
+    <exclude name="WordPress.Files.FileName.NotHyphenatedLowercase">
+      <exclude-pattern>config/application.pantheon.php</exclude-pattern>
+    </exclude>
+    <exclude name="WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration_putenv">
+      <exclude-pattern>config/application.pantheon.php</exclude-pattern>
+    </exclude>
   </rule>
   <!-- End Pantheon addition -->
 
+  <!--
+  Prevent errors caused by WordPress Coding Standards not supporting PHP 8.0+.
+  See https://github.com/WordPress/WordPress-Coding-Standards/issues/2035
+  -->
+  <ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED" />
+
   <!-- Show colors in console -->
   <arg value="-colors"/>