diff --git a/bootstrap.php b/bootstrap.php
index 330f484bc..400d36628 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -204,6 +204,7 @@ function () {
 require BLUEHOST_PLUGIN_DIR . '/inc/RestApi/rest-api.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/settings.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/updates.php';
+require BLUEHOST_PLUGIN_DIR . '/inc/YoastAI.php';
 
 /* WordPress Admin Page & Features */
 if ( is_admin() ) {
diff --git a/inc/YoastAI.php b/inc/YoastAI.php
new file mode 100644
index 000000000..f16dc2541
--- /dev/null
+++ b/inc/YoastAI.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Bluehost;
+
+/**
+ * Class YoastAI
+ *
+ * @package Bluehost
+ */
+class YoastAI
+{
+    /*
+    * Initialize the Yoast AI class.
+    */
+    public static function init()
+    {
+        add_action( 'init', array( __CLASS__, 'on_yoast_plugin_activation' ) );
+        add_filter( 'http_request_args', array( __CLASS__,'modify_http_request_args' ), 10, 2 );
+    }
+
+    /*
+    * Register Yoast plugin activation hook to enable the Yoast AI generator on new activations.
+    */
+    public static function on_yoast_plugin_activation()
+    {
+        register_activation_hook( 'wordpress-seo/wp-seo.php', array( __CLASS__, 'enable_on_new_activations' ) );
+    }
+
+    /*
+    * Filter Yoast SEO default settings to enable AI on new installations/activations
+    */
+    public static function enable_on_new_activations()
+    {
+        add_filter(
+            'wpseo_option_wpseo_defaults',
+            function ( $defaults ) {
+                if ( ! is_array( $defaults ) || ! isset( $defaults['enable_ai_generator'] ) ) {
+                    return $defaults;
+                }
+                $defaults['enable_ai_generator'] = true;
+                return $defaults;
+            }
+        );
+    }
+
+    /*
+    * Add a custom header to outbound Yoast AI requests for Bluehost customers.
+    */
+    public static function modify_http_request_args( $parsed_args, $url )
+    {
+        $parsed_url = parse_url( $url );
+		if ( ! is_array( $parsed_url ) ) {
+			return $parsed_args;
+		}
+		if ( $parsed_url['host'] !== 'ai.yoa.st' ) {
+			return $parsed_args;
+		}
+		if ( is_array( $parsed_args['headers'] ) ) {
+			$parsed_args['headers']['X-Yst-Cohort'] = 'Bluehost';
+		}
+		return $parsed_args;
+    }
+}
+
+YoastAI::init();
diff --git a/inc/upgrades/3.1.1.php b/inc/upgrades/3.1.1.php
new file mode 100644
index 000000000..50a0e1af5
--- /dev/null
+++ b/inc/upgrades/3.1.1.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Handle updates for version 3.1.1
+ *
+ * @package Bluehost
+ */
+
+// Enable Yoast AI on existing Yoast SEO installs
+if ( function_exists( 'yoastseo' ) ) {
+    // Only enable the enable_ai_generator setting if we have a stored value.
+	if ( yoastseo()->helpers->options->get( 'enable_ai_generator', null ) !== null ) {
+		yoastseo()->helpers->options->set( 'enable_ai_generator', true );
+	}
+}