diff --git a/modules/acquia_cms_audio/acquia_cms_audio.info.yml b/modules/acquia_cms_audio/acquia_cms_audio.info.yml
index ee1330f4b..bf8817534 100644
--- a/modules/acquia_cms_audio/acquia_cms_audio.info.yml
+++ b/modules/acquia_cms_audio/acquia_cms_audio.info.yml
@@ -4,8 +4,8 @@ description: "Provides an Audio media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
   - drupal:media
   - drupal:media_library
+  - drupal:taxonomy
   - media_entity_soundcloud:media_entity_soundcloud
   - field_group:field_group
diff --git a/modules/acquia_cms_audio/acquia_cms_audio.install b/modules/acquia_cms_audio/acquia_cms_audio.install
index 07dde2b7f..1aa89a4ca 100644
--- a/modules/acquia_cms_audio/acquia_cms_audio.install
+++ b/modules/acquia_cms_audio/acquia_cms_audio.install
@@ -5,11 +5,20 @@
  * Install, update and uninstall functions for the acquia_cms_audio module.
  */
 
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
 /**
  * Implements hook_install().
  */
 function acquia_cms_audio_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite();
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_audio') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_audio']);
+    }
   }
 }
diff --git a/modules/acquia_cms_audio/composer.json b/modules/acquia_cms_audio/composer.json
index 80105f5a8..8ae18dd2c 100644
--- a/modules/acquia_cms_audio/composer.json
+++ b/modules/acquia_cms_audio/composer.json
@@ -4,9 +4,11 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
         "drupal/media_entity_soundcloud": "^3.1"
     },
+    "require-dev": {
+        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
+    },
     "repositories": {
         "assets": {
             "type": "composer",
diff --git a/modules/acquia_cms_audio/config/optional/field.field.media.audio.field_media_soundcloud.yml b/modules/acquia_cms_audio/config/install/field.field.media.audio.field_media_soundcloud.yml
similarity index 100%
rename from modules/acquia_cms_audio/config/optional/field.field.media.audio.field_media_soundcloud.yml
rename to modules/acquia_cms_audio/config/install/field.field.media.audio.field_media_soundcloud.yml
diff --git a/modules/acquia_cms_audio/config/optional/field.storage.media.field_media_soundcloud.yml b/modules/acquia_cms_audio/config/install/field.storage.media.field_media_soundcloud.yml
similarity index 100%
rename from modules/acquia_cms_audio/config/optional/field.storage.media.field_media_soundcloud.yml
rename to modules/acquia_cms_audio/config/install/field.storage.media.field_media_soundcloud.yml
diff --git a/modules/acquia_cms_audio/config/optional/media.type.audio.yml b/modules/acquia_cms_audio/config/install/media.type.audio.yml
similarity index 100%
rename from modules/acquia_cms_audio/config/optional/media.type.audio.yml
rename to modules/acquia_cms_audio/config/install/media.type.audio.yml
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.default.yml b/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.default.yml
index fe2f61432..f5ea33589 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.default.yml
+++ b/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.default.yml
@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - field_group
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.media_library.yml b/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.media_library.yml
index b9d92969e..babf798b2 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.media_library.yml
+++ b/modules/acquia_cms_audio/config/optional/core.entity_form_display.media.audio.media_library.yml
@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_form_mode.media.media_library
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - field_group
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.default.yml b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.default.yml
index d2d283135..5117313e8 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.default.yml
+++ b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.default.yml
@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - media_entity_soundcloud
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.embedded.yml b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.embedded.yml
index 2d03dc14e..fe91b8953 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.embedded.yml
+++ b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.embedded.yml
@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.embedded
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - media.type.audio
   module:
     - media_entity_soundcloud
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.media_library.yml b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.media_library.yml
index 7c9fb61d3..6d704ef2f 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.media_library.yml
+++ b/modules/acquia_cms_audio/config/optional/core.entity_view_display.media.audio.media_library.yml
@@ -3,9 +3,7 @@ status: false
 dependencies:
   config:
     - core.entity_view_mode.media.media_library
-    - field.field.media.audio.field_categories
     - field.field.media.audio.field_media_soundcloud
-    - field.field.media.audio.field_tags
     - image.style.medium
     - media.type.audio
   module:
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_view_mode.media.media_library.yml b/modules/acquia_cms_audio/config/optional/core.entity_view_mode.media.media_library.yml
deleted file mode 100644
index d96dd313f..000000000
--- a/modules/acquia_cms_audio/config/optional/core.entity_view_mode.media.media_library.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-  enforced:
-    module:
-      - media_library
-id: media.media_library
-label: 'Media library'
-targetEntityType: media
-cache: true
diff --git a/modules/acquia_cms_audio/config/optional/field.storage.media.field_categories.yml b/modules/acquia_cms_audio/config/optional/field.storage.media.field_categories.yml
new file mode 100644
index 000000000..88e2ad3eb
--- /dev/null
+++ b/modules/acquia_cms_audio/config/optional/field.storage.media.field_categories.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_common/config/install/field.storage.media.field_tags.yml b/modules/acquia_cms_audio/config/optional/field.storage.media.field_tags.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/field.storage.media.field_tags.yml
rename to modules/acquia_cms_audio/config/optional/field.storage.media.field_tags.yml
diff --git a/modules/acquia_cms_common/config/install/taxonomy.vocabulary.categories.yml b/modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.categories.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/taxonomy.vocabulary.categories.yml
rename to modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.categories.yml
diff --git a/modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.tags.yml b/modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.tags.yml
new file mode 100644
index 000000000..2dce29541
--- /dev/null
+++ b/modules/acquia_cms_audio/config/optional/taxonomy.vocabulary.tags.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_audio/tests/src/Functional/AudioTest.php b/modules/acquia_cms_audio/tests/src/Functional/AudioTest.php
index 9951ff2c5..52a32b9c4 100644
--- a/modules/acquia_cms_audio/tests/src/Functional/AudioTest.php
+++ b/modules/acquia_cms_audio/tests/src/Functional/AudioTest.php
@@ -19,7 +19,10 @@ class AudioTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_audio'];
+  protected static $modules = [
+    'acquia_cms_audio',
+    'acquia_cms_common'
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_audio/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php b/modules/acquia_cms_audio/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
index 2a14fc773..34ee1de53 100644
--- a/modules/acquia_cms_audio/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
+++ b/modules/acquia_cms_audio/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
@@ -19,6 +19,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    */
   protected static $modules = [
     'acquia_cms_audio',
+    'acquia_cms_common',
   ];
 
   /**
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.embedded.yml b/modules/acquia_cms_common/config/optional/core.entity_view_mode.media.embedded.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.embedded.yml
rename to modules/acquia_cms_common/config/optional/core.entity_view_mode.media.embedded.yml
diff --git a/modules/acquia_cms_common/config/optional/taxonomy.vocabulary.categories.yml b/modules/acquia_cms_common/config/optional/taxonomy.vocabulary.categories.yml
new file mode 100644
index 000000000..64e07442a
--- /dev/null
+++ b/modules/acquia_cms_common/config/optional/taxonomy.vocabulary.categories.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_document/acquia_cms_document.info.yml b/modules/acquia_cms_document/acquia_cms_document.info.yml
index 398eb9973..f7817e1c1 100644
--- a/modules/acquia_cms_document/acquia_cms_document.info.yml
+++ b/modules/acquia_cms_document/acquia_cms_document.info.yml
@@ -4,7 +4,8 @@ description: "Provides a Document media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
+  - drupal:file
   - drupal:media
   - drupal:media_library
-  - acquia_cms_common:acquia_cms_common
+  - drupal:taxonomy
   - field_group:field_group
diff --git a/modules/acquia_cms_document/acquia_cms_document.install b/modules/acquia_cms_document/acquia_cms_document.install
index 0eaf8c8ac..324ff33c7 100644
--- a/modules/acquia_cms_document/acquia_cms_document.install
+++ b/modules/acquia_cms_document/acquia_cms_document.install
@@ -5,11 +5,20 @@
  * Install, update and uninstall functions for the acquia_cms_document module.
  */
 
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
 /**
  * Implements hook_install().
  */
 function acquia_cms_document_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite();
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_document') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_document']);
+    }
   }
 }
diff --git a/modules/acquia_cms_document/composer.json b/modules/acquia_cms_document/composer.json
index fcb3f4de2..40c8436b5 100644
--- a/modules/acquia_cms_document/composer.json
+++ b/modules/acquia_cms_document/composer.json
@@ -3,7 +3,7 @@
     "description": "Provides a Document media type and related configuration.",
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
-    "require": {
+    "require-dev": {
         "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
     },
     "repositories": {
diff --git a/modules/acquia_cms_document/config/optional/field.field.media.document.field_media_file.yml b/modules/acquia_cms_document/config/install/field.field.media.document.field_media_file.yml
similarity index 100%
rename from modules/acquia_cms_document/config/optional/field.field.media.document.field_media_file.yml
rename to modules/acquia_cms_document/config/install/field.field.media.document.field_media_file.yml
diff --git a/modules/acquia_cms_document/config/optional/field.storage.media.field_media_file.yml b/modules/acquia_cms_document/config/install/field.storage.media.field_media_file.yml
similarity index 100%
rename from modules/acquia_cms_document/config/optional/field.storage.media.field_media_file.yml
rename to modules/acquia_cms_document/config/install/field.storage.media.field_media_file.yml
diff --git a/modules/acquia_cms_document/config/optional/media.type.document.yml b/modules/acquia_cms_document/config/install/media.type.document.yml
similarity index 100%
rename from modules/acquia_cms_document/config/optional/media.type.document.yml
rename to modules/acquia_cms_document/config/install/media.type.document.yml
diff --git a/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.default.yml b/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.default.yml
index faee57124..dd64c61b7 100644
--- a/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.default.yml
+++ b/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.default.yml
@@ -2,9 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - field_group
diff --git a/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.media_library.yml b/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.media_library.yml
index 3dbb931ec..2e45127c9 100644
--- a/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.media_library.yml
+++ b/modules/acquia_cms_document/config/optional/core.entity_form_display.media.document.media_library.yml
@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_form_mode.media.media_library
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - field_group
diff --git a/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.default.yml b/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.default.yml
index 8b0c5cafe..1b51c46bf 100644
--- a/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.default.yml
+++ b/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.default.yml
@@ -2,10 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
-    - image.style.card
     - media.type.document
   module:
     - image
diff --git a/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.embedded.yml b/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.embedded.yml
index cd457433c..b34a4c723 100644
--- a/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.embedded.yml
+++ b/modules/acquia_cms_document/config/optional/core.entity_view_display.media.document.embedded.yml
@@ -3,9 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.embedded
-    - field.field.media.document.field_categories
     - field.field.media.document.field_media_file
-    - field.field.media.document.field_tags
     - media.type.document
   module:
     - file
diff --git a/modules/acquia_cms_document/config/optional/field.storage.media.field_categories.yml b/modules/acquia_cms_document/config/optional/field.storage.media.field_categories.yml
new file mode 100644
index 000000000..88e2ad3eb
--- /dev/null
+++ b/modules/acquia_cms_document/config/optional/field.storage.media.field_categories.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_document/config/optional/field.storage.media.field_tags.yml b/modules/acquia_cms_document/config/optional/field.storage.media.field_tags.yml
new file mode 100644
index 000000000..07883d27e
--- /dev/null
+++ b/modules/acquia_cms_document/config/optional/field.storage.media.field_tags.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_tags
+field_name: field_tags
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.categories.yml b/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.categories.yml
new file mode 100644
index 000000000..64e07442a
--- /dev/null
+++ b/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.categories.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.tags.yml b/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.tags.yml
new file mode 100644
index 000000000..2dce29541
--- /dev/null
+++ b/modules/acquia_cms_document/config/optional/taxonomy.vocabulary.tags.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_document/tests/src/Functional/DocumentPermissionsTest.php b/modules/acquia_cms_document/tests/src/Functional/DocumentPermissionsTest.php
index e42415c90..ff91825f6 100644
--- a/modules/acquia_cms_document/tests/src/Functional/DocumentPermissionsTest.php
+++ b/modules/acquia_cms_document/tests/src/Functional/DocumentPermissionsTest.php
@@ -18,6 +18,7 @@ class DocumentPermissionsTest extends MediaPermissionsTestBase {
    */
   protected static $modules = [
     'acquia_cms_document',
+    'acquia_cms_common',
   ];
 
   /**
diff --git a/modules/acquia_cms_document/tests/src/Functional/DocumentTest.php b/modules/acquia_cms_document/tests/src/Functional/DocumentTest.php
index 76e0e20d2..9cf2d6611 100644
--- a/modules/acquia_cms_document/tests/src/Functional/DocumentTest.php
+++ b/modules/acquia_cms_document/tests/src/Functional/DocumentTest.php
@@ -19,7 +19,10 @@ class DocumentTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_document'];
+  protected static $modules = [
+    'acquia_cms_document',
+    'acquia_cms_common',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_document/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php b/modules/acquia_cms_document/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
index 91f876b64..9dbca4b0a 100644
--- a/modules/acquia_cms_document/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
+++ b/modules/acquia_cms_document/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
@@ -19,6 +19,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    */
   protected static $modules = [
     'acquia_cms_document',
+    'acquia_cms_common',
   ];
 
   /**
diff --git a/modules/acquia_cms_document/tests/src/FunctionalJavascript/DocumentEmbedTest.php b/modules/acquia_cms_document/tests/src/FunctionalJavascript/DocumentEmbedTest.php
index e075ead3a..a126a6bb7 100644
--- a/modules/acquia_cms_document/tests/src/FunctionalJavascript/DocumentEmbedTest.php
+++ b/modules/acquia_cms_document/tests/src/FunctionalJavascript/DocumentEmbedTest.php
@@ -18,7 +18,10 @@ class DocumentEmbedTest extends MediaEmbedTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_document'];
+  protected static $modules = [
+    'acquia_cms_document',
+    'acquia_cms_common',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_image/acquia_cms_image.info.yml b/modules/acquia_cms_image/acquia_cms_image.info.yml
index 6cc77aca5..33c906267 100644
--- a/modules/acquia_cms_image/acquia_cms_image.info.yml
+++ b/modules/acquia_cms_image/acquia_cms_image.info.yml
@@ -4,10 +4,11 @@ description: "Provides an Image media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
+  - drupal:file
+  - drupal:image
   - drupal:media
   - drupal:media_library
+  - drupal:taxonomy
   - imce:imce
-  - drupal:image
   - field_group:field_group
   - focal_point:focal_point
diff --git a/modules/acquia_cms_image/acquia_cms_image.install b/modules/acquia_cms_image/acquia_cms_image.install
index 8f4b9c462..0fcdf1140 100644
--- a/modules/acquia_cms_image/acquia_cms_image.install
+++ b/modules/acquia_cms_image/acquia_cms_image.install
@@ -6,6 +6,9 @@
  */
 
 use Drupal\acquia_cms_image\SiteLogo;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Installer\InstallerKernel;
 use Drupal\image\Entity\ImageStyle;
 
@@ -14,7 +17,12 @@ use Drupal\image\Entity\ImageStyle;
  */
 function acquia_cms_image_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite(TRUE);
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_image') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_image']);
+    }
     \Drupal::classResolver(SiteLogo::class)->createLogo()->setLogo();
   }
 }
diff --git a/modules/acquia_cms_image/composer.json b/modules/acquia_cms_image/composer.json
index 1368ed317..0babc7dee 100644
--- a/modules/acquia_cms_image/composer.json
+++ b/modules/acquia_cms_image/composer.json
@@ -4,11 +4,13 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
         "drupal/focal_point": "^2.1",
         "drupal/imagemagick": "^3.4 || ^4.0",
         "drupal/imce": "^2.2 || ^3.0"
     },
+    "require-dev": {
+        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
+    },
     "repositories": {
         "assets": {
             "type": "composer",
diff --git a/modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.default.yml b/modules/acquia_cms_image/config/install/core.entity_form_display.media.image.default.yml
similarity index 95%
rename from modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.default.yml
rename to modules/acquia_cms_image/config/install/core.entity_form_display.media.image.default.yml
index a3e91fb7a..7fdbb74d2 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.default.yml
+++ b/modules/acquia_cms_image/config/install/core.entity_form_display.media.image.default.yml
@@ -2,8 +2,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
     - image.style.medium
     - media.type.image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.media_library.yml b/modules/acquia_cms_image/config/install/core.entity_form_display.media.image.media_library.yml
similarity index 95%
rename from modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.media_library.yml
rename to modules/acquia_cms_image/config/install/core.entity_form_display.media.image.media_library.yml
index 8625fe4a3..958d8ab42 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_form_display.media.image.media_library.yml
+++ b/modules/acquia_cms_image/config/install/core.entity_form_display.media.image.media_library.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   config:
     - core.entity_form_mode.media.media_library
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
     - image.style.medium
     - media.type.image
diff --git a/modules/acquia_cms_image/config/optional/field.field.media.image.image.yml b/modules/acquia_cms_image/config/install/field.field.media.image.image.yml
similarity index 100%
rename from modules/acquia_cms_image/config/optional/field.field.media.image.image.yml
rename to modules/acquia_cms_image/config/install/field.field.media.image.image.yml
diff --git a/modules/acquia_cms_image/config/optional/field.storage.media.image.yml b/modules/acquia_cms_image/config/install/field.storage.media.image.yml
similarity index 100%
rename from modules/acquia_cms_image/config/optional/field.storage.media.image.yml
rename to modules/acquia_cms_image/config/install/field.storage.media.image.yml
diff --git a/modules/acquia_cms_image/config/optional/media.type.image.yml b/modules/acquia_cms_image/config/install/media.type.image.yml
similarity index 100%
rename from modules/acquia_cms_image/config/optional/media.type.image.yml
rename to modules/acquia_cms_image/config/install/media.type.image.yml
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.default.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.default.yml
index 4142b4033..b261251b4 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.default.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.default.yml
@@ -2,10 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_x_large
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.embedded.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.embedded.yml
index d3af85f10..19278999b 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.embedded.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.embedded.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.embedded
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_medium
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.full.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.full.yml
index 35632bbbc..6ed29a2c2 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.full.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.full.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.full
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_x_large
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large.yml
index 6cebb111f..2ceab0b98 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.large
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_x_large
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_landscape.yml
index f2a51611e..19ae0f6bb 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_landscape.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_landscape.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.large_landscape
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_x_large_landscape
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_super_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_super_landscape.yml
index 43fcacb11..cbe317d18 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_super_landscape.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.large_super_landscape.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.large_super_landscape
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_x_large_super_landscape
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium.yml
index cd88aca55..b65899c71 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.medium
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_medium
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium_landscape.yml
index 356c2b9da..89a13aba9 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium_landscape.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.medium_landscape.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.medium_landscape
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_medium_landscape
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small.yml
index 53cfa7d35..099ed214a 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.small
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_small
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small_landscape.yml
index 89a019ec6..78788e0ff 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small_landscape.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.small_landscape.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.small_landscape
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.coh_small_landscape
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.teaser.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.teaser.yml
index 6c678acd7..a754f724d 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.teaser.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.teaser.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.teaser
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.x_small_landscape
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.x_small_square.yml b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.x_small_square.yml
index 99bcbb81b..d8b7e4af5 100644
--- a/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.x_small_square.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_display.media.image.x_small_square.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.x_small_square
-    - field.field.media.image.field_categories
-    - field.field.media.image.field_tags
     - field.field.media.image.image
-    - image.style.x_small_square
     - media.type.image
   module:
     - image
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.card.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.card.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.card.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.card.yml
diff --git a/modules/acquia_cms_audio/config/optional/core.entity_form_mode.media.media_library.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.embedded.yml
similarity index 51%
rename from modules/acquia_cms_audio/config/optional/core.entity_form_mode.media.media_library.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.embedded.yml
index d96dd313f..d952d04aa 100644
--- a/modules/acquia_cms_audio/config/optional/core.entity_form_mode.media.media_library.yml
+++ b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.embedded.yml
@@ -3,10 +3,7 @@ status: true
 dependencies:
   module:
     - media
-  enforced:
-    module:
-      - media_library
-id: media.media_library
-label: 'Media library'
+id: media.embedded
+label: Embedded
 targetEntityType: media
 cache: true
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.large.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.large.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.large.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.large.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.large_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.large_landscape.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.large_landscape.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.large_landscape.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.medium.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.medium.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.medium.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.medium.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.medium_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.medium_landscape.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.medium_landscape.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.medium_landscape.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.small.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.small.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.small.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.small.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.small_landscape.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.small_landscape.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.small_landscape.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.small_landscape.yml
diff --git a/modules/acquia_cms_common/config/install/core.entity_view_mode.media.thumbnail.yml b/modules/acquia_cms_image/config/optional/core.entity_view_mode.media.thumbnail.yml
similarity index 100%
rename from modules/acquia_cms_common/config/install/core.entity_view_mode.media.thumbnail.yml
rename to modules/acquia_cms_image/config/optional/core.entity_view_mode.media.thumbnail.yml
diff --git a/modules/acquia_cms_image/config/optional/field.storage.media.field_categories.yml b/modules/acquia_cms_image/config/optional/field.storage.media.field_categories.yml
new file mode 100644
index 000000000..88e2ad3eb
--- /dev/null
+++ b/modules/acquia_cms_image/config/optional/field.storage.media.field_categories.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_image/config/optional/field.storage.media.field_tags.yml b/modules/acquia_cms_image/config/optional/field.storage.media.field_tags.yml
new file mode 100644
index 000000000..07883d27e
--- /dev/null
+++ b/modules/acquia_cms_image/config/optional/field.storage.media.field_tags.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_tags
+field_name: field_tags
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.categories.yml b/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.categories.yml
new file mode 100644
index 000000000..64e07442a
--- /dev/null
+++ b/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.categories.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.tags.yml b/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.tags.yml
new file mode 100644
index 000000000..2dce29541
--- /dev/null
+++ b/modules/acquia_cms_image/config/optional/taxonomy.vocabulary.tags.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_image/tests/src/Functional/ImageFormatterTest.php b/modules/acquia_cms_image/tests/src/Functional/ImageFormatterTest.php
index 83db67e3d..4748f3c47 100644
--- a/modules/acquia_cms_image/tests/src/Functional/ImageFormatterTest.php
+++ b/modules/acquia_cms_image/tests/src/Functional/ImageFormatterTest.php
@@ -13,6 +13,7 @@ class ImageFormatterTest extends BrowserTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'acquia_cms_common',
     'acquia_cms_image',
   ];
 
diff --git a/modules/acquia_cms_image/tests/src/Functional/ImagePermissionsTest.php b/modules/acquia_cms_image/tests/src/Functional/ImagePermissionsTest.php
index c63040de6..90f9704ff 100644
--- a/modules/acquia_cms_image/tests/src/Functional/ImagePermissionsTest.php
+++ b/modules/acquia_cms_image/tests/src/Functional/ImagePermissionsTest.php
@@ -17,6 +17,7 @@ class ImagePermissionsTest extends MediaPermissionsTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'acquia_cms_common',
     'acquia_cms_image',
   ];
 
diff --git a/modules/acquia_cms_image/tests/src/Functional/ImageTest.php b/modules/acquia_cms_image/tests/src/Functional/ImageTest.php
index 38b7580da..d70530a10 100644
--- a/modules/acquia_cms_image/tests/src/Functional/ImageTest.php
+++ b/modules/acquia_cms_image/tests/src/Functional/ImageTest.php
@@ -18,7 +18,10 @@ class ImageTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_image'];
+  protected static $modules = [
+    'acquia_cms_common',
+    'acquia_cms_image',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_image/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php b/modules/acquia_cms_image/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
index 64b87d72b..3c6ae3269 100644
--- a/modules/acquia_cms_image/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
+++ b/modules/acquia_cms_image/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
@@ -18,6 +18,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'acquia_cms_common',
     'acquia_cms_image',
   ];
 
diff --git a/modules/acquia_cms_image/tests/src/FunctionalJavascript/ImageEmbedTest.php b/modules/acquia_cms_image/tests/src/FunctionalJavascript/ImageEmbedTest.php
index a48728426..d2ca77bdb 100644
--- a/modules/acquia_cms_image/tests/src/FunctionalJavascript/ImageEmbedTest.php
+++ b/modules/acquia_cms_image/tests/src/FunctionalJavascript/ImageEmbedTest.php
@@ -18,7 +18,11 @@ class ImageEmbedTest extends MediaEmbedTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_common', 'acquia_cms_image', 'focal_point'];
+  protected static $modules = [
+    'acquia_cms_common',
+    'acquia_cms_image',
+    'focal_point',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_video/acquia_cms_video.info.yml b/modules/acquia_cms_video/acquia_cms_video.info.yml
index 8264b0145..be479e9ef 100644
--- a/modules/acquia_cms_video/acquia_cms_video.info.yml
+++ b/modules/acquia_cms_video/acquia_cms_video.info.yml
@@ -4,7 +4,8 @@ description: "Provides a Video media type and related configuration."
 type: module
 core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
+  - drupal:file
   - drupal:media
   - drupal:media_library
+  - drupal:taxonomy
   - field_group:field_group
diff --git a/modules/acquia_cms_video/acquia_cms_video.install b/modules/acquia_cms_video/acquia_cms_video.install
index 3dd8dd47e..94a15121e 100644
--- a/modules/acquia_cms_video/acquia_cms_video.install
+++ b/modules/acquia_cms_video/acquia_cms_video.install
@@ -5,12 +5,21 @@
  * Install, update and uninstall functions for the acquia_cms_video module.
  */
 
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
 /**
  * Implements hook_install().
  */
 function acquia_cms_video_install($is_syncing) {
   if (!$is_syncing) {
-    _acquia_cms_common_editor_config_rewrite();
+    $optional_install_path = \Drupal::service('extension.path.resolver')->getPath('module', 'acquia_cms_video') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+    if (is_dir($optional_install_path)) {
+      $config_installer = \Drupal::service('config.installer');
+      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+      $config_installer->installOptionalConfig($storage, ['module' => 'acquia_cms_video']);
+    }
   }
 }
 
diff --git a/modules/acquia_cms_video/composer.json b/modules/acquia_cms_video/composer.json
index a3d9da69f..e3d98db7b 100644
--- a/modules/acquia_cms_video/composer.json
+++ b/modules/acquia_cms_video/composer.json
@@ -3,7 +3,7 @@
     "description": "Provides a Video media type and related configuration.",
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
-    "require": {
+    "require-dev": {
         "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1"
     },
     "repositories": {
diff --git a/modules/acquia_cms_video/config/optional/field.field.media.video.field_media_oembed_video.yml b/modules/acquia_cms_video/config/install/field.field.media.video.field_media_oembed_video.yml
similarity index 100%
rename from modules/acquia_cms_video/config/optional/field.field.media.video.field_media_oembed_video.yml
rename to modules/acquia_cms_video/config/install/field.field.media.video.field_media_oembed_video.yml
diff --git a/modules/acquia_cms_video/config/optional/field.storage.media.field_media_oembed_video.yml b/modules/acquia_cms_video/config/install/field.storage.media.field_media_oembed_video.yml
similarity index 100%
rename from modules/acquia_cms_video/config/optional/field.storage.media.field_media_oembed_video.yml
rename to modules/acquia_cms_video/config/install/field.storage.media.field_media_oembed_video.yml
diff --git a/modules/acquia_cms_video/config/optional/media.type.video.yml b/modules/acquia_cms_video/config/install/media.type.video.yml
similarity index 100%
rename from modules/acquia_cms_video/config/optional/media.type.video.yml
rename to modules/acquia_cms_video/config/install/media.type.video.yml
diff --git a/modules/acquia_cms_video/config/optional/field.storage.media.field_categories.yml b/modules/acquia_cms_video/config/optional/field.storage.media.field_categories.yml
new file mode 100644
index 000000000..88e2ad3eb
--- /dev/null
+++ b/modules/acquia_cms_video/config/optional/field.storage.media.field_categories.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_categories
+field_name: field_categories
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_video/config/optional/field.storage.media.field_tags.yml b/modules/acquia_cms_video/config/optional/field.storage.media.field_tags.yml
new file mode 100644
index 000000000..07883d27e
--- /dev/null
+++ b/modules/acquia_cms_video/config/optional/field.storage.media.field_tags.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - taxonomy
+id: media.field_tags
+field_name: field_tags
+entity_type: media
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.categories.yml b/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.categories.yml
new file mode 100644
index 000000000..64e07442a
--- /dev/null
+++ b/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.categories.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Categories
+vid: categories
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.tags.yml b/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.tags.yml
new file mode 100644
index 000000000..2dce29541
--- /dev/null
+++ b/modules/acquia_cms_video/config/optional/taxonomy.vocabulary.tags.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+name: Tags
+vid: tags
+description: 'Descriptive metadata, for categorizing content and making search engines happy.'
+weight: 0
diff --git a/modules/acquia_cms_video/tests/src/Functional/VideoPermissionsTest.php b/modules/acquia_cms_video/tests/src/Functional/VideoPermissionsTest.php
index 32b7c2765..288df2761 100644
--- a/modules/acquia_cms_video/tests/src/Functional/VideoPermissionsTest.php
+++ b/modules/acquia_cms_video/tests/src/Functional/VideoPermissionsTest.php
@@ -17,6 +17,7 @@ class VideoPermissionsTest extends MediaPermissionsTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'acquia_cms_common',
     'acquia_cms_video',
   ];
 
diff --git a/modules/acquia_cms_video/tests/src/Functional/VideoTest.php b/modules/acquia_cms_video/tests/src/Functional/VideoTest.php
index 70bbe499d..9c506b239 100644
--- a/modules/acquia_cms_video/tests/src/Functional/VideoTest.php
+++ b/modules/acquia_cms_video/tests/src/Functional/VideoTest.php
@@ -20,7 +20,10 @@ class VideoTest extends MediaTypeTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_video'];
+  protected static $modules = [
+    'acquia_cms_common',
+    'acquia_cms_video',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
diff --git a/modules/acquia_cms_video/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php b/modules/acquia_cms_video/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
index 57f6a5cbb..df344bca3 100644
--- a/modules/acquia_cms_video/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
+++ b/modules/acquia_cms_video/tests/src/FunctionalJavascript/Ckeditor5ConfigurationTest.php
@@ -18,6 +18,7 @@ class Ckeditor5ConfigurationTest extends Ckeditor5ConfigurationTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'acquia_cms_common',
     'acquia_cms_video',
   ];
 
diff --git a/modules/acquia_cms_video/tests/src/FunctionalJavascript/VideoEmbedTest.php b/modules/acquia_cms_video/tests/src/FunctionalJavascript/VideoEmbedTest.php
index cad79ecb9..c336885ba 100644
--- a/modules/acquia_cms_video/tests/src/FunctionalJavascript/VideoEmbedTest.php
+++ b/modules/acquia_cms_video/tests/src/FunctionalJavascript/VideoEmbedTest.php
@@ -18,7 +18,10 @@ class VideoEmbedTest extends MediaEmbedTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['acquia_cms_video'];
+  protected static $modules = [
+    'acquia_cms_common',
+    'acquia_cms_video',
+  ];
 
   /**
    * Disable strict config schema checks in this test.
@@ -44,9 +47,6 @@ class VideoEmbedTest extends MediaEmbedTestBase {
    * {@inheritdoc}
    */
   public function testEmbedMedia(): void {
-    if (AcquiaDrupalEnvironmentDetector::isAhIdeEnv()) {
-      $this->markTestSkipped('This cannot be run in a Cloud IDE right now');
-    }
     $node_type = $this->drupalCreateContentType()->id();
     user_role_grant_permissions('content_author', [
       "create $node_type content",