diff --git a/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html b/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html
index aed4ddf04da..a870d0590fa 100644
--- a/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html
+++ b/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html
@@ -4,14 +4,6 @@
   (click)="selectProduct.emit(product)"
 >
   <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    [container]="product?.images?.PRIMARY"
-    format="product"
-    [elementType]="'img'"
-    [alt]="product?.name ?? ''"
-  ></cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
     [container]="product?.images?.PRIMARY"
     format="product"
     [alt]="product?.name ?? ''"
diff --git a/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html b/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html
index 407f8412b02..ad2fb6b6c1e 100644
--- a/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html
+++ b/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html
@@ -38,15 +38,7 @@ <h3 id="asm-customer-360-title" class="modal-title">
               "
             >
               <div class="cx-avatar-image">
-                <cx-media
-                  *cxFeature="'useExtendedMediaComponentConfiguration'"
-                  [container]="avatarImage"
-                  [elementType]="'img'"
-                ></cx-media>
-                <cx-media
-                  *cxFeature="'!useExtendedMediaComponentConfiguration'"
-                  [container]="avatarImage"
-                ></cx-media>
+                <cx-media [container]="avatarImage"></cx-media>
               </div>
             </ng-container>
 
diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html
index cf91d6e2041..16df0befbfc 100644
--- a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html
+++ b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html
@@ -14,13 +14,6 @@
         tabindex="0"
       >
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          [elementType]="'img'"
-          [container]="item.product?.images?.PRIMARY"
-          format="cartIcon"
-        ></cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           [container]="item.product?.images?.PRIMARY"
           format="cartIcon"
         ></cx-media>
diff --git a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html
index cf8dafde3de..7af182f121d 100644
--- a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html
+++ b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html
@@ -12,13 +12,6 @@
         tabindex="0"
       >
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          [container]="item.product?.images?.PRIMARY"
-          [elementType]="'img'"
-          format="cartIcon"
-        ></cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           [container]="item.product?.images?.PRIMARY"
           format="cartIcon"
         ></cx-media>
diff --git a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
index 26e7f19333a..82564346715 100644
--- a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
+++ b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
@@ -82,29 +82,14 @@
           class="quick-order-results-product"
           role="option"
         >
-          <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-            <cx-media
-              *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
-              [elementType]="'img'"
-              [alt]="product.name"
-              [container]="product.images?.PRIMARY"
-              class="media"
-              format="thumbnail"
-              role="presentation"
-            ></cx-media>
-          </ng-container>
-
-          <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-            <cx-media
-              *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
-              [alt]="product.name"
-              [container]="product.images?.PRIMARY"
-              class="media"
-              format="thumbnail"
-              role="presentation"
-            ></cx-media>
-          </ng-container>
-
+          <cx-media
+            *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
+            [alt]="product.name"
+            [container]="product.images?.PRIMARY"
+            class="media"
+            format="thumbnail"
+            role="presentation"
+          ></cx-media>
           <div class="name" [innerHTML]="product.name"></div>
           <span class="id">
             {{
@@ -154,31 +139,14 @@
             class="quick-order-results-product"
             role="option"
           >
-            <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-              <cx-media
-                *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
-                [alt]="product.name"
-                [elementType]="'img'"
-                [container]="product.images?.PRIMARY"
-                class="media"
-                format="thumbnail"
-                role="presentation"
-              ></cx-media>
-            </ng-container>
-
-            <ng-container
-              *cxFeature="'!useExtendedMediaComponentConfiguration'"
-            >
-              <cx-media
-                *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
-                [alt]="product.name"
-                [container]="product.images?.PRIMARY"
-                class="media"
-                format="thumbnail"
-                role="presentation"
-              ></cx-media>
-            </ng-container>
-
+            <cx-media
+              *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
+              [alt]="product.name"
+              [container]="product.images?.PRIMARY"
+              class="media"
+              format="thumbnail"
+              role="presentation"
+            ></cx-media>
             <div class="name" [innerHTML]="product.name"></div>
             <span class="id">
               {{
diff --git a/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html b/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html
index 48ef7e0e2a6..2f6ace69729 100644
--- a/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html
+++ b/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html
@@ -9,15 +9,6 @@
       tabindex="-1"
     >
       <cx-media
-        *cxFeature="'useExtendedMediaComponentConfiguration'"
-        [container]="entry?.product?.images?.PRIMARY"
-        [elementType]="'img'"
-        [alt]="entry?.product?.name"
-        format="cartIcon"
-      ></cx-media>
-
-      <cx-media
-        *cxFeature="'!useExtendedMediaComponentConfiguration'"
         [container]="entry?.product?.images?.PRIMARY"
         [alt]="entry?.product?.name"
         format="cartIcon"
diff --git a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html
index 36ab1536834..c068fb0db74 100644
--- a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html
+++ b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html
@@ -6,13 +6,6 @@
       tabindex="-1"
     >
       <cx-media
-        *cxFeature="'useExtendedMediaComponentConfiguration'"
-        [container]="cartEntry.product?.images?.PRIMARY"
-        [elementType]="'img'"
-        format="thumbnail"
-      ></cx-media>
-      <cx-media
-        *cxFeature="'!useExtendedMediaComponentConfiguration'"
         [container]="cartEntry.product?.images?.PRIMARY"
         format="thumbnail"
       ></cx-media>
diff --git a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html
index 648baffd69f..f58e4660990 100644
--- a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html
+++ b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html
@@ -54,13 +54,6 @@
         <td role="cell">
           <div class="cx-table-item-container">
             <cx-media
-              *cxFeature="'useExtendedMediaComponentConfiguration'"
-              [container]="item.product.images?.PRIMARY"
-              [elementType]="'img'"
-              format="thumbnail"
-            ></cx-media>
-            <cx-media
-              *cxFeature="'!useExtendedMediaComponentConfiguration'"
               [container]="item.product.images?.PRIMARY"
               format="thumbnail"
             ></cx-media>
diff --git a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html
index edbfa2c9b2d..596ae775554 100644
--- a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html
+++ b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html
@@ -60,15 +60,6 @@
               <div class="cx-my-account-view-order-column-1">
                 <div class="cx-my-account-view-order-column-1-image">
                   <cx-media
-                    *cxFeature="'useExtendedMediaComponentConfiguration'"
-                    [container]="product.images?.PRIMARY"
-                    [elementType]="'img'"
-                    class="cx-my-account-view-order-img"
-                    format="thumbnail"
-                    role="presentation"
-                  ></cx-media>
-                  <cx-media
-                    *cxFeature="'!useExtendedMediaComponentConfiguration'"
                     [container]="product.images?.PRIMARY"
                     class="cx-my-account-view-order-img"
                     format="thumbnail"
diff --git a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html
index b29f9671d8a..16a247da489 100644
--- a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html
+++ b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html
@@ -193,15 +193,6 @@
     <ng-container *ngIf="order.entries">
       <ng-container *ngFor="let item of getProductImages(order.entries)">
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          [elementType]="'img'"
-          [container]="item.PRIMARY"
-          class="cx-order-img"
-          format="thumbnail"
-          role="presentation"
-        ></cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           [container]="item.PRIMARY"
           class="cx-order-img"
           format="thumbnail"
diff --git a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.html b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.html
index ad59bedd26d..1aebb5d1046 100644
--- a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.html
+++ b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.html
@@ -34,13 +34,6 @@
         <!-- Item Image -->
         <div class="cx-table-item-container">
           <cx-media
-            *cxFeature="'useExtendedMediaComponentConfiguration'"
-            [elementType]="'img'"
-            [container]="returnEntry.orderEntry?.product.images?.PRIMARY"
-            format="thumbnail"
-          ></cx-media>
-          <cx-media
-            *cxFeature="'!useExtendedMediaComponentConfiguration'"
             [container]="returnEntry.orderEntry?.product.images?.PRIMARY"
             format="thumbnail"
           ></cx-media>
diff --git a/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.html b/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.html
index 565da143b6c..7ad7482ea39 100644
--- a/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.html
+++ b/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.html
@@ -61,13 +61,6 @@
           <div class="col-2 cx-image-container col-offset-1">
             <a tabindex="0">
               <cx-media
-                *cxFeature="'useExtendedMediaComponentConfiguration'"
-                [elementType]="'img'"
-                [container]="item.product?.images?.PRIMARY"
-                format="cartIcon"
-              ></cx-media>
-              <cx-media
-                *cxFeature="'!useExtendedMediaComponentConfiguration'"
                 [container]="item.product?.images?.PRIMARY"
                 format="cartIcon"
               ></cx-media>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
index ec7fcfd3810..955df782949 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
@@ -15,14 +15,6 @@
     <div class="cx-product-card-rows">
       <div class="cx-product-card-imgs">
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          [elementType]="'img'"
-          [container]="product.images?.PRIMARY"
-          format="product"
-          aria-hidden="true"
-        ></cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           [container]="product.images?.PRIMARY"
           format="product"
           aria-hidden="true"
diff --git a/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html b/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html
index afdcb0f34b2..0495d6e5a4b 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html
+++ b/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html
@@ -2,14 +2,6 @@
   <div class="cx-value-container">
     <div class="cx-thumbnail">
       <cx-media
-        *cxFeature="'useExtendedMediaComponentConfiguration'"
-        [container]="getProductPrimaryImage(product)"
-        [elementType]="'img'"
-        format="product"
-        aria-hidden="true"
-      ></cx-media>
-      <cx-media
-        *cxFeature="'!useExtendedMediaComponentConfiguration'"
         [container]="getProductPrimaryImage(product)"
         format="product"
         aria-hidden="true"
diff --git a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
index 814aeb6fe9c..bff0a0866c9 100644
--- a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
+++ b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
@@ -35,13 +35,6 @@
     <div class="cx-details" [class.open]="showMore">
       <div class="cx-details-image" aria-hidden="true">
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          [container]="product?.images?.PRIMARY"
-          format="product"
-          [elementType]="'img'"
-        ></cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           [container]="product?.images?.PRIMARY"
           format="product"
         ></cx-media>
diff --git a/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.html b/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.html
index 94d00b7f745..3ac5c4e3aa5 100644
--- a/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.html
+++ b/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.html
@@ -21,17 +21,7 @@
               (click)="changeVariant(option.code)"
               [cxFocus]="{ key: option.code }"
             >
-              <cx-media
-                *cxFeature="'useExtendedMediaComponentConfiguration'"
-                [container]="option.image"
-                role="img"
-                [elementType]="'img'"
-              />
-              <cx-media
-                *cxFeature="'!useExtendedMediaComponentConfiguration'"
-                [container]="option.image"
-                role="img"
-              />
+              <cx-media [container]="option.image" role="img" />
             </button>
           </div>
         </div>
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html
index 84fc5689741..23560540696 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html
@@ -1,15 +1,5 @@
 <ng-container *ngIf="mainImage$ | async as main">
-  <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    [container]="main"
-    (click)="triggerZoom(true)"
-    [elementType]="'img'"
-  ></cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
-    [container]="main"
-    (click)="triggerZoom(true)"
-  ></cx-media>
+  <cx-media [container]="main" (click)="triggerZoom(true)"></cx-media>
   <cx-product-image-zoom-trigger
     [expandImage]="expandImage.value"
     [galleryIndex]="selectedIndex"
@@ -36,49 +26,23 @@
 </ng-container>
 
 <ng-template #thumb let-item="item">
-  <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-    <cx-media
-      *cxFeature="'a11yCarouselArrowKeysNavigation'"
-      [elementType]="'img'"
-      cxFocusableCarouselItem
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-      format="product"
-    >
-    </cx-media>
-    <cx-media
-      *cxFeature="'!a11yCarouselArrowKeysNavigation'"
-      [elementType]="'img'"
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-      format="product"
-    >
-    </cx-media>
-  </ng-container>
-
-  <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-    <cx-media
-      *cxFeature="'a11yCarouselArrowKeysNavigation'"
-      cxFocusableCarouselItem
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-      format="product"
-    >
-    </cx-media>
-    <cx-media
-      *cxFeature="'!a11yCarouselArrowKeysNavigation'"
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-      format="product"
-    >
-    </cx-media>
-  </ng-container>
+  <cx-media
+    *cxFeature="'a11yCarouselArrowKeysNavigation'"
+    cxFocusableCarouselItem
+    [container]="item.container"
+    tabindex="0"
+    (focus)="openImage(item.container)"
+    [class.is-active]="isActive(item.container) | async"
+    format="product"
+  >
+  </cx-media>
+  <cx-media
+    *cxFeature="'!a11yCarouselArrowKeysNavigation'"
+    [container]="item.container"
+    tabindex="0"
+    (focus)="openImage(item.container)"
+    [class.is-active]="isActive(item.container) | async"
+    format="product"
+  >
+  </cx-media>
 </ng-template>
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-thumbnails/product-image-zoom-thumbnails.component.html b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-thumbnails/product-image-zoom-thumbnails.component.html
index b46b7e38c31..dd8fe29952d 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-thumbnails/product-image-zoom-thumbnails.component.html
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-thumbnails/product-image-zoom-thumbnails.component.html
@@ -10,45 +10,21 @@
 </ng-container>
 
 <ng-template #thumb let-item="item">
-  <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-    <cx-media
-      *cxFeature="'a11yCarouselArrowKeysNavigation'"
-      [elementType]="'img'"
-      cxFocusableCarouselItem
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-    >
-    </cx-media>
-    <cx-media
-      *cxFeature="'!a11yCarouselArrowKeysNavigation'"
-      [elementType]="'img'"
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-    >
-    </cx-media>
-  </ng-container>
-
-  <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-    <cx-media
-      *cxFeature="'a11yCarouselArrowKeysNavigation'"
-      cxFocusableCarouselItem
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-    >
-    </cx-media>
-    <cx-media
-      *cxFeature="'!a11yCarouselArrowKeysNavigation'"
-      [container]="item.container"
-      tabindex="0"
-      (focus)="openImage(item.container)"
-      [class.is-active]="isActive(item.container) | async"
-    >
-    </cx-media>
-  </ng-container>
+  <cx-media
+    *cxFeature="'a11yCarouselArrowKeysNavigation'"
+    cxFocusableCarouselItem
+    [container]="item.container"
+    tabindex="0"
+    (focus)="openImage(item.container)"
+    [class.is-active]="isActive(item.container) | async"
+  >
+  </cx-media>
+  <cx-media
+    *cxFeature="'!a11yCarouselArrowKeysNavigation'"
+    [container]="item.container"
+    tabindex="0"
+    (focus)="openImage(item.container)"
+    [class.is-active]="isActive(item.container) | async"
+  >
+  </cx-media>
 </ng-template>
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.html b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.html
index 27761e3364a..b849ffcac9a 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.html
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.html
@@ -11,43 +11,16 @@
     </div>
     <!-- TODO: (CXSPA-7492) - Remove feature flag next major release. -->
     <div *cxFeature="'a11yKeyboardAccessibleZoom'" class="cx-image-container">
-      <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="!isZoomed"
-          [elementType]="'img'"
-          #defaultImage
-          class="cx-default-image-zoom"
-          (loaded)="onImageLoad()"
-          [container]="main"
-        >
-        </cx-media>
-      </ng-container>
-      <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="!isZoomed"
-          #defaultImage
-          class="cx-default-image-zoom"
-          (loaded)="onImageLoad()"
-          [container]="main"
-        >
-        </cx-media>
-      </ng-container>
-
+      <cx-media
+        #defaultImage
+        class="cx-default-image-zoom"
+        (loaded)="onImageLoad()"
+        *ngIf="!isZoomed"
+        [container]="main"
+      >
+      </cx-media>
       <div #zoomContainer class="cx-zoom-container" *ngIf="isZoomed">
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          #zoomedImage
-          [elementType]="'img'"
-          class="cx-image-zoomed"
-          [container]="main"
-          (mousemove)="pointerMove($event)"
-          (touchmove)="touchMove($event)"
-          (touchend)="clearTouch()"
-          (loaded)="onImageLoad()"
-        >
-        </cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           #zoomedImage
           class="cx-image-zoomed"
           [container]="main"
@@ -87,40 +60,15 @@
       </button>
     </div>
     <ng-container *cxFeature="'!a11yKeyboardAccessibleZoom'">
-      <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="!isZoomed"
-          [elementType]="'img'"
-          #defaultImage
-          class="cx-default-image-zoom"
-          [container]="main"
-        >
-        </cx-media>
-      </ng-container>
-      <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="!isZoomed"
-          #defaultImage
-          class="cx-default-image-zoom"
-          [container]="main"
-        >
-        </cx-media>
-      </ng-container>
-
+      <cx-media
+        #defaultImage
+        class="cx-default-image-zoom"
+        *ngIf="!isZoomed"
+        [container]="main"
+      >
+      </cx-media>
       <div #zoomContainer class="cx-zoom-container" *ngIf="isZoomed">
         <cx-media
-          *cxFeature="'useExtendedMediaComponentConfiguration'"
-          #zoomedImage
-          class="cx-image-zoomed"
-          [elementType]="'img'"
-          [container]="main"
-          (mousemove)="pointerMove($event)"
-          (touchmove)="touchMove($event)"
-          (touchend)="clearTouch()"
-        >
-        </cx-media>
-        <cx-media
-          *cxFeature="'!useExtendedMediaComponentConfiguration'"
           #zoomedImage
           class="cx-image-zoomed"
           [container]="main"
diff --git a/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.html b/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.html
index 8a4ee68619b..e29a50b19d2 100644
--- a/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.html
+++ b/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.html
@@ -27,24 +27,12 @@
         onMerchandisingCarouselItemClick(merchandisingCarouselModel, item)
       "
     >
-      <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="item.images?.PRIMARY"
-          [elementType]="'img'"
-          [container]="item.images.PRIMARY"
-          format="product"
-        >
-        </cx-media>
-      </ng-container>
-      <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-        <cx-media
-          *ngIf="item.images?.PRIMARY"
-          [container]="item.images.PRIMARY"
-          format="product"
-        >
-        </cx-media>
-      </ng-container>
-
+      <cx-media
+        *ngIf="item.images?.PRIMARY"
+        [container]="item.images.PRIMARY"
+        format="product"
+      >
+      </cx-media>
       <h4>{{ item.name }}</h4>
       <div class="price">
         {{ item.price?.formattedValue }}
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.html b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.html
index 0545e2a2b41..ed500dd6f9c 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.html
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.html
@@ -43,13 +43,6 @@
       <div class="thumbnail-container">
         <div class="thumbnail" [class.selected]="item.selected">
           <cx-media
-            *cxFeature="'useExtendedMediaComponentConfiguration'"
-            [container]="item.product.images?.PRIMARY"
-            format="thumbnail"
-            [elementType]="'img'"
-          ></cx-media>
-          <cx-media
-            *cxFeature="'!useExtendedMediaComponentConfiguration'"
             [container]="item.product.images?.PRIMARY"
             format="thumbnail"
           ></cx-media>
diff --git a/projects/storefrontlib/cms-components/myaccount/my-interests/my-interests.component.html b/projects/storefrontlib/cms-components/myaccount/my-interests/my-interests.component.html
index 6f979e72381..268f30b9107 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-interests/my-interests.component.html
+++ b/projects/storefrontlib/cms-components/myaccount/my-interests/my-interests.component.html
@@ -87,13 +87,6 @@ <h2>{{ 'myInterests.header' | cxTranslate }}</h2>
                       "
                     >
                       <cx-media
-                        *cxFeature="'useExtendedMediaComponentConfiguration'"
-                        [container]="product.images?.PRIMARY"
-                        [elementType]="'img'"
-                        format="thumbnail"
-                      ></cx-media>
-                      <cx-media
-                        *cxFeature="'!useExtendedMediaComponentConfiguration'"
                         [container]="product.images?.PRIMARY"
                         format="thumbnail"
                       ></cx-media>
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
index f9384c60b88..00f34cd74cc 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
@@ -209,24 +209,12 @@ <h3 *ngIf="result.products?.length">
             })
           "
         >
-          <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
-            <cx-media
-              *ngIf="config.displayProductImages"
-              [elementType]="'img'"
-              [container]="product.images?.PRIMARY"
-              format="thumbnail"
-              role="presentation"
-            ></cx-media>
-          </ng-container>
-          <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
-            <cx-media
-              *ngIf="config.displayProductImages"
-              [container]="product.images?.PRIMARY"
-              format="thumbnail"
-              role="presentation"
-            ></cx-media>
-          </ng-container>
-
+          <cx-media
+            *ngIf="config.displayProductImages"
+            [container]="product.images?.PRIMARY"
+            format="thumbnail"
+            role="presentation"
+          ></cx-media>
           <div class="name" [innerHTML]="product.nameHtml"></div>
           <span class="price">{{ product.price?.formattedValue }}</span>
         </a>
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.html b/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.html
index 3dd6b7fe773..f087339239e 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.html
+++ b/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.html
@@ -1,13 +1,5 @@
 <a tabindex="0" [routerLink]="{ cxRoute: 'product', params: item } | cxUrl">
   <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    [container]="item.images?.PRIMARY"
-    format="product"
-    [alt]="item.name ?? ''"
-    [elementType]="'img'"
-  ></cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
     [container]="item.images?.PRIMARY"
     format="product"
     [alt]="item.name ?? ''"
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.html b/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.html
index 72c831ef865..0871cfa197f 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.html
+++ b/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.html
@@ -8,17 +8,7 @@
 
 <ng-template #carouselItem let-item="item">
   <a tabindex="0" [routerLink]="{ cxRoute: 'product', params: item } | cxUrl">
-    <cx-media
-      *cxFeature="'useExtendedMediaComponentConfiguration'"
-      [container]="item.images?.PRIMARY"
-      format="product"
-      [elementType]="'img'"
-    ></cx-media>
-    <cx-media
-      *cxFeature="'!useExtendedMediaComponentConfiguration'"
-      [container]="item.images?.PRIMARY"
-      format="product"
-    ></cx-media>
+    <cx-media [container]="item.images?.PRIMARY" format="product"></cx-media>
     <h4>{{ item.name }}</h4>
     <div class="price">{{ item.price?.formattedValue }}</div>
   </a>
diff --git a/projects/storefrontlib/cms-components/product/product-images/product-images.component.html b/projects/storefrontlib/cms-components/product/product-images/product-images.component.html
index ce81637cc5a..0d0298b60ca 100644
--- a/projects/storefrontlib/cms-components/product/product-images/product-images.component.html
+++ b/projects/storefrontlib/cms-components/product/product-images/product-images.component.html
@@ -1,13 +1,5 @@
 <ng-container *ngIf="mainImage$ | async as main">
-  <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    [elementType]="'img'"
-    [container]="main"
-  ></cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
-    [container]="main"
-  ></cx-media>
+  <cx-media [container]="main"></cx-media>
 </ng-container>
 
 <ng-container *ngIf="thumbs$ | async as thumbs">
@@ -23,17 +15,6 @@
 
 <ng-template #thumb let-item="item">
   <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    [container]="item.container"
-    [elementType]="'img'"
-    tabindex="0"
-    (focus)="openImage(item.container)"
-    [class.is-active]="isActive(item.container) | async"
-    format="product"
-  >
-  </cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
     [container]="item.container"
     tabindex="0"
     (focus)="openImage(item.container)"
diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html
index 17357ac3876..cbfce92adfd 100644
--- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html
+++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html
@@ -4,15 +4,6 @@
   tabindex="-1"
 >
   <cx-media
-    *cxFeature="'useExtendedMediaComponentConfiguration'"
-    class="cx-product-image"
-    [elementType]="'img'"
-    [container]="product.images?.PRIMARY"
-    format="product"
-    [alt]="product.summary"
-  ></cx-media>
-  <cx-media
-    *cxFeature="'!useExtendedMediaComponentConfiguration'"
     class="cx-product-image"
     [container]="product.images?.PRIMARY"
     format="product"
diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
index 951dacaa219..c54dbe95eb2 100644
--- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
+++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
@@ -11,15 +11,6 @@
       class="cx-product-image-container"
     >
       <cx-media
-        *cxFeature="'useExtendedMediaComponentConfiguration'"
-        class="cx-product-image"
-        [elementType]="'img'"
-        [container]="product.images?.PRIMARY"
-        format="product"
-        [alt]="product.name || product.summary"
-      ></cx-media>
-      <cx-media
-        *cxFeature="'!useExtendedMediaComponentConfiguration'"
         class="cx-product-image"
         [container]="product.images?.PRIMARY"
         format="product"