diff --git a/modules/cloud_service_providers/aws_cloud/aws_cloud.install b/modules/cloud_service_providers/aws_cloud/aws_cloud.install
index 1361616..d0476b2 100644
--- a/modules/cloud_service_providers/aws_cloud/aws_cloud.install
+++ b/modules/cloud_service_providers/aws_cloud/aws_cloud.install
@@ -5,6 +5,8 @@
  * Install and updates for aws_cloud.
  */
 
+use Drupal\aws_cloud\Plugin\Field\Util\AwsCloudReservedKeyChecker;
+use Drupal\aws_cloud\Plugin\Field\Util\AwsCloudValueConverter;
 use Drupal\aws_cloud\Service\Pricing\PricingService;
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Config\FileStorage;
@@ -1719,49 +1721,17 @@ function aws_cloud_update_8199() {
         ->execute();
     }
 
+    // Uninstall tags.
     $field_storage_definition = $definition_update_manager->getFieldStorageDefinition(
       'tags',
       $entity_type
     );
-    if ($field_storage_definition) {
-      $definition_update_manager->uninstallFieldStorageDefinition($field_storage_definition);
-    }
-
-    // Install user data.
-    $field_storage_definition = BaseFieldDefinition::create('key_value')
-      ->setLabel(t('Tags'))
-      ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
-      ->setDescription(t('Tags'))
-      ->setDisplayOptions('view', [
-        'type' => 'key_value_formatter',
-        'weight' => -5,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'key_value_item',
-      ])
-      ->addConstraint('tags_data');
-
-    $definition_update_manager->installFieldStorageDefinition(
-      'tags',
-      $entity_type,
-      'aws_cloud',
-      $field_storage_definition
-    );
 
-    if ($db->schema()->fieldExists($entity_type, 'tags')) {
-      $db->update($entity_type)
-        ->fields(['tags' => NULL])
-        ->execute();
-    }
-
-    $field_storage_definition = $definition_update_manager->getFieldStorageDefinition(
-      'tags',
-      $entity_type
-    );
     if ($field_storage_definition) {
       $definition_update_manager->uninstallFieldStorageDefinition($field_storage_definition);
     }
 
+    // Install new tags.
     $field_storage_definition = BaseFieldDefinition::create('key_value')
       ->setLabel(t('Tags'))
       ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
@@ -1769,9 +1739,16 @@ function aws_cloud_update_8199() {
       ->setDisplayOptions('view', [
         'type' => 'key_value_formatter',
         'weight' => -5,
+        'settings' => [
+          'value_converter_class' => AwsCloudValueConverter::class,
+        ],
       ])
       ->setDisplayOptions('form', [
         'type' => 'key_value_item',
+        'settings' => [
+          'reserved_key_checker_class' => AwsCloudReservedKeyChecker::class,
+          'value_converter_class' => AwsCloudValueConverter::class,
+        ],
       ])
       ->addConstraint('tags_data');
 
@@ -1804,7 +1781,6 @@ function aws_cloud_update_8199() {
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')->loadConfigEntities('aws_ec2');
   foreach ($config_entities as $config_entity) {
     $ec2_service->setCloudContext($config_entity->getCloudContext());
-
     $ec2_service->updateInstancesWithoutBatch();
     $ec2_service->updateVpcsWithoutBatch();
     $ec2_service->updateSubnetsWithoutBatch();
diff --git a/modules/cloud_service_providers/aws_cloud/tests/src/Unit/Plugin/cloud/server_template/AwsCloudServerTemplatePluginTest.php b/modules/cloud_service_providers/aws_cloud/tests/src/Unit/Plugin/cloud/server_template/AwsCloudServerTemplatePluginTest.php
index d7fc7bd..ebbdc70 100644
--- a/modules/cloud_service_providers/aws_cloud/tests/src/Unit/Plugin/cloud/server_template/AwsCloudServerTemplatePluginTest.php
+++ b/modules/cloud_service_providers/aws_cloud/tests/src/Unit/Plugin/cloud/server_template/AwsCloudServerTemplatePluginTest.php
@@ -7,7 +7,7 @@ use Drupal\aws_cloud\Entity\Ec2\KeyPairInterface;
 use Drupal\aws_cloud\Entity\Ec2\NetworkInterfaceInterface;
 use Drupal\aws_cloud\Entity\Ec2\SecurityGroupInterface;
 use Drupal\aws_cloud\Plugin\cloud\server_template\AwsCloudServerTemplatePlugin;
-use Drupal\aws_cloud\Plugin\Field\FieldType\Tag;
+use Drupal\cloud\Plugin\Field\FieldType\KeyValue;
 use Drupal\aws_cloud\Service\Ec2\Ec2ServiceInterface;
 use Drupal\cloud\Entity\CloudServerTemplateInterface;
 use Drupal\cloud\Plugin\cloud\config\CloudConfigPluginManagerInterface;
@@ -395,7 +395,7 @@ class AwsCloudServerTemplatePluginTest extends UnitTestCase {
     $mock_tags = [];
     $count = rand(0, 5);
     for ($i = 0; $i < $count; $i++) {
-      $mock_tag = $this->getMockBuilder(Tag::class)
+      $mock_tag = $this->getMockBuilder(KeyValue::class)
         ->disableOriginalConstructor()
         ->getMock();