diff --git a/.github/workflows/wp-phpunit.yml b/.github/workflows/wp-phpunit.yml
index da84703..35e6717 100644
--- a/.github/workflows/wp-phpunit.yml
+++ b/.github/workflows/wp-phpunit.yml
@@ -1,7 +1,9 @@
 name: WordPress Unit Testing
 on:
-    push:
-    pull_request:
+  push:
+    branches:
+      - main
+  pull_request:
 jobs:
   phpunit:
     runs-on: ubuntu-latest
@@ -23,8 +25,12 @@ jobs:
           - wp-version: '6.5'
             php-versions: '7.1'
     steps:
+      - name: Install svn
+        run: |
+          sudo apt-get update
+          sudo apt-get install subversion
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/includes/class-admin.php b/includes/class-admin.php
index e38cbad..c4601a1 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -417,6 +417,16 @@ public static function register_settings() {
 				'default'      => 1,
 			)
 		);
+		register_setting(
+			'webmention',
+			'webmention_avatar_store_enable',
+			array(
+				'type'         => 'int',
+				'description'  => esc_html__( 'Store Avatars Locally', 'webmention' ),
+				'show_in_rest' => true,
+				'default'      => 0,
+			)
+		);
 		register_setting(
 			'webmention',
 			'webmention_separate_comment',
diff --git a/templates/webmention-settings.php b/templates/webmention-settings.php
index b7c7d07..3ccb783 100644
--- a/templates/webmention-settings.php
+++ b/templates/webmention-settings.php
@@ -14,7 +14,7 @@
 				<td>
 					<fieldset>
 						<label for="webmention_disable_selfpings_same_url">
-							<input type="checkbox" name="webmention_disable_selfpings_same_url" id="webmention_disable_selfpings_same_url" value="1" <?php echo checked( true, get_option( 'webmention_disable_selfpings_same_url' ) ); ?> />
+							<input type="checkbox" name="webmention_disable_selfpings_same_url" id="webmention_disable_selfpings_same_url" value="1" <?php checked( true, get_option( 'webmention_disable_selfpings_same_url' ) ); ?> />
 							<?php esc_html_e( 'Disable self-pings on the same URL', 'webmention' ); ?>
 							<p class="description"><?php esc_html_e( '(for example "http://example.com/?p=123")', 'webmention' ); ?></p>
 						</label>
@@ -22,7 +22,7 @@
 						<br />
 
 						<label for="webmention_disable_selfpings_same_domain">
-							<input type="checkbox" name="webmention_disable_selfpings_same_domain" id="webmention_disable_selfpings_same_domain" value="1" <?php echo checked( true, get_option( 'webmention_disable_selfpings_same_domain' ) ); ?> />
+							<input type="checkbox" name="webmention_disable_selfpings_same_domain" id="webmention_disable_selfpings_same_domain" value="1" <?php checked( true, get_option( 'webmention_disable_selfpings_same_domain' ) ); ?> />
 							<?php esc_html_e( 'Disable self-pings on the same Domain', 'webmention' ); ?>
 							<p class="description"><?php esc_html_e( '(for example "example.com")', 'webmention' ); ?></p>
 						</label>
@@ -30,7 +30,7 @@
 						<br />
 
 						<label for="webmention_disable_media_mentions">
-							<input type="checkbox" name="webmention_disable_media_mentions" id="webmention_disable_media_mentions" value="1" <?php echo checked( true, get_option( 'webmention_disable_media_mentions' ) ); ?> />
+							<input type="checkbox" name="webmention_disable_media_mentions" id="webmention_disable_media_mentions" value="1" <?php checked( true, get_option( 'webmention_disable_media_mentions' ) ); ?> />
 							<?php esc_html_e( 'Disable sending Webmentions for media links (image, video, audio)', 'webmention' ); ?>
 						</label>
 					</fieldset>
@@ -57,7 +57,7 @@
 						<?php foreach ( $post_types as $post_type ) { ?>
 							<li>
 								<label for="webmention_support_post_types_<?php echo esc_attr( $post_type->name ); ?>">
-									<input type="checkbox" id="webmention_support_post_types_<?php echo esc_attr( $post_type->name ); ?>" name="webmention_support_post_types[]" value="<?php echo esc_attr( $post_type->name ); ?>" <?php echo checked( true, in_array( $post_type->name, $support_post_types, true ) ); ?> />
+									<input type="checkbox" id="webmention_support_post_types_<?php echo esc_attr( $post_type->name ); ?>" name="webmention_support_post_types[]" value="<?php echo esc_attr( $post_type->name ); ?>" <?php checked( true, in_array( $post_type->name, $support_post_types, true ) ); ?> />
 									<?php echo esc_html( $post_type->label ); ?>
 								</label>
 							</li>
@@ -110,7 +110,7 @@
 					<fieldset>
 						<p>
 							<label for="webmention_show_comment_form">
-								<input type="checkbox" name="webmention_show_comment_form" id="webmention_show_comment_form" value="1" <?php echo checked( true, get_option( 'webmention_show_comment_form' ) ); ?> />
+								<input type="checkbox" name="webmention_show_comment_form" id="webmention_show_comment_form" value="1" <?php checked( true, get_option( 'webmention_show_comment_form' ) ); ?> />
 								<?php esc_html_e( 'Show a Webmention form at the comment section, to allow anyone to notify you of a mention.', 'webmention' ); ?>
 							</label>
 						</p>
@@ -127,23 +127,34 @@
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Avatars', 'webmention' ); ?></th>
+				<th scope="row"><?php esc_html_e( 'Use Avatars', 'webmention' ); ?></th>
 				<td>
 					<fieldset>
 						<label for="webmention_avatars">
-							<input type="checkbox" name="webmention_avatars" id="webmention_avatars" value="1" <?php echo checked( true, get_option( 'webmention_avatars', 1 ) ); ?> />
+							<input type="checkbox" name="webmention_avatars" id="webmention_avatars" value="1" <?php checked( true, get_option( 'webmention_avatars', 1 ) ); ?> />
 							<?php esc_html_e( 'Show avatars on Webmentions if available.', 'webmention' ); ?>
 						</label>
 					</fieldset>
 				</td>
 			</tr>
+			<tr>
+				<th scope="row"><?php esc_html_e( 'Store Avatars', 'webmention' ); ?></th>
+				<td>
+					<fieldset>
+						<label for="webmention_avatar_store_enable">
+							<input type="checkbox" name="webmention_avatar_store_enable" id="webmention_avatar_store_enable" value="1" <?php checked( true, get_option( 'webmention_avatar_store_enable', 0 ) ); ?> />
+							<?php esc_html_e( 'Enable Local Caching of Avatars.', 'webmention' ); ?>
+						</label>
+					</fieldset>
+				</td>
+			</tr>
 			<tr>
 				<th scope="row"><?php esc_html_e( 'Display', 'webmention' ); ?></th>
 				<td>
 
 					<fieldset>
 						<label for="webmention_separate_comment">
-							<input type="checkbox" name="webmention_separate_comment" id="webmention_separate_comment" value="1" <?php echo checked( true, get_option( 'webmention_separate_comment', 1 ) ); ?> />
+							<input type="checkbox" name="webmention_separate_comment" id="webmention_separate_comment" value="1" <?php checked( true, get_option( 'webmention_separate_comment', 1 ) ); ?> />
 							<?php esc_html_e( 'Separate Webmention Types from Comments.', 'webmention' ); ?>
 						</label>
 					</fieldset>
diff --git a/webmention.php b/webmention.php
index a9e6083..f6fa26a 100755
--- a/webmention.php
+++ b/webmention.php
@@ -23,8 +23,6 @@
 defined( 'WEBMENTION_COMMENT_TYPE' ) || define( 'WEBMENTION_COMMENT_TYPE', 'webmention' );
 defined( 'WEBMENTION_GRAVATAR_CACHE_TIME' ) || define( 'WEBMENTION_GRAVATAR_CACHE_TIME', WEEK_IN_SECONDS );
 
-
-defined( 'WEBMENTION_LOCAL_AVATAR_STORE' ) || define( 'WEBMENTION_LOCAL_AVATAR_STORE', false );
 defined( 'WEBMENTION_AVATAR_QUALITY' ) || define( 'WEBMENTION_AVATAR_QUALITY', null );
 defined( 'WEBMENTION_AVATAR_SIZE' ) || define( 'WEBMENTION_AVATAR_SIZE', 256 );
 
@@ -121,7 +119,7 @@ function init() {
 	add_action( 'init', array( '\Webmention\Discovery', 'init' ) );
 
 	// load local avatar store.
-	if ( WEBMENTION_LOCAL_AVATAR_STORE ) {
+	if ( 1 === (int) get_option( 'webmention_avatar_store_enable', 0 ) ) {
 		require_once __DIR__ . '/includes/class-avatar-store.php';
 		add_action( 'init', array( '\Webmention\Avatar_Store', 'init' ) );
 	}