diff --git a/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php b/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php
index bcf097609a..fc7cc5b4f7 100644
--- a/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php
+++ b/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php
@@ -48,19 +48,18 @@ class profilefield_youtube_update extends \phpbb\db\migration\migration
 		$profile_fields = $this->table_prefix . 'profile_fields';
 		$profile_fields_data = $this->table_prefix . 'profile_fields_data';
 
-		$field_validation = $this->db->sql_escape(self::$youtube_url_matcher);
+		$field_data = [
+			'field_length'		=> 40,
+			'field_minlen'		=> strlen('https://youtube.com/c/') + 1,
+			'field_maxlen'		=> 255,
+			'field_validation'	=> self::$youtube_url_matcher,
+			'field_contact_url'	=> '%s'
+		];
 
-		$min_length = strlen('https://youtube.com/c/') + 1;
-
-		$this->db->sql_query(
-			"UPDATE $profile_fields SET
-				field_length = '40',
-				field_minlen = '$min_length',
-				field_maxlen = '255',
-				field_validation = '$field_validation',
-				field_contact_url = '%s'
-				WHERE field_name = 'phpbb_youtube'"
-		);
+		$sql = 'UPDATE ' . $profile_fields . '
+			SET ' . $this->db->sql_build_array('UPDATE', $field_data) . "
+			WHERE field_name = 'phpbb_youtube'";
+		$this->db->sql_query($sql);
 
 		$yt_profile_field = 'pf_phpbb_youtube';
 		$prepend_legacy_youtube_url = $this->db->sql_concatenate(
diff --git a/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php b/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
index 722a962d73..73cd98353a 100644
--- a/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
+++ b/phpBB/phpbb/db/migration/data/v33x/profilefields_update.php
@@ -70,18 +70,19 @@ class profilefields_update extends \phpbb\db\migration\migration
 		$profile_fields_data = $this->table_prefix . 'profile_fields_data';
 		$end_time = time() + 5; // allow up to 5 seconds for migration to run
 
-		$field_validation = $this->db->sql_escape($this->youtube_url_matcher);
+		$field_data = [
+			'field_length'			=> 20,
+			'field_minlen'			=> 3,
+			'field_maxlen'			=> 60,
+			'field_validation'		=> $this->youtube_url_matcher,
+			'field_contact_url'		=> 'https://youtube.com/%s',
+			'field_contact_desc'	=> 'VIEW_YOUTUBE_PROFILE',
+		];
 
-		$this->db->sql_query(
-			"UPDATE $profile_fields
-				SET field_length = '20',
-					field_minlen = '3',
-					field_maxlen = '60',
-					field_validation = '$field_validation',
-					field_contact_url = 'https://youtube.com/%s'
-					field_contact_desc = 'VIEW_YOUTUBE_PROFILE'
-				WHERE field_name = 'phpbb_youtube'"
-		);
+		$sql = 'UPDATE ' . $profile_fields . '
+			SET ' . $this->db->sql_build_array('UPDATE', $field_data) . "
+			WHERE field_name = 'phpbb_youtube'";
+		$this->db->sql_query($sql);
 
 		$yt_profile_field = 'pf_phpbb_youtube';
 		$has_youtube_url = $this->db->sql_like_expression($this->db->get_any_char() . 'youtube.com/' . $this->db->get_any_char());
@@ -138,19 +139,18 @@ class profilefields_update extends \phpbb\db\migration\migration
 		$profile_fields = $this->table_prefix . 'profile_fields';
 		$profile_fields_data = $this->table_prefix . 'profile_fields_data';
 
-		$old_field_validation = $this->db->sql_escape(profilefield_youtube_update::$youtube_url_matcher);
+		$field_data = [
+			'field_length'		=> 40,
+			'field_minlen'		=> strlen('https://youtube.com/c/') + 1,
+			'field_maxlen'		=> 255,
+			'field_validation'	=> profilefield_youtube_update::$youtube_url_matcher,
+			'field_contact_url'	=> '%s'
+		];
 
-		$min_length = strlen('https://youtube.com/c/') + 1;
-
-		$this->db->sql_query(
-			"UPDATE $profile_fields SET
-				field_length = '40',
-				field_minlen = '$min_length',
-				field_maxlen = '255',
-				field_validation = '$old_field_validation',
-				field_contact_url = '%s'
-				WHERE field_name = 'phpbb_youtube'"
-		);
+		$sql = 'UPDATE ' . $profile_fields . '
+			SET ' . $this->db->sql_build_array('UPDATE', $field_data) . "
+			WHERE field_name = 'phpbb_youtube'";
+		$this->db->sql_query($sql);
 
 		$yt_profile_field = 'pf_phpbb_youtube';
 		$prepend_legacy_youtube_url = $this->db->sql_concatenate(