diff --git a/plugins/xcmetrics/src/components/AccordionComponent/index.ts b/plugins/xcmetrics/src/components/AccordionComponent/index.ts
index 1e71dc81ca..33632d6828 100644
--- a/plugins/xcmetrics/src/components/AccordionComponent/index.ts
+++ b/plugins/xcmetrics/src/components/AccordionComponent/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './AccordionComponent';
+export { AccordionComponent } from './AccordionComponent';
diff --git a/plugins/xcmetrics/src/components/BuildDetailsComponent/index.ts b/plugins/xcmetrics/src/components/BuildDetailsComponent/index.ts
index 574b29f32e..4e50cf23a0 100644
--- a/plugins/xcmetrics/src/components/BuildDetailsComponent/index.ts
+++ b/plugins/xcmetrics/src/components/BuildDetailsComponent/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './BuildDetailsComponent';
+export { BuildDetailsComponent, withRequest } from './BuildDetailsComponent';
diff --git a/plugins/xcmetrics/src/components/BuildTimelineComponent/index.ts b/plugins/xcmetrics/src/components/BuildTimelineComponent/index.ts
index 2a6a612acf..fe294f8467 100644
--- a/plugins/xcmetrics/src/components/BuildTimelineComponent/index.ts
+++ b/plugins/xcmetrics/src/components/BuildTimelineComponent/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './BuildTimelineComponent';
+export { BuildTimelineComponent } from './BuildTimelineComponent';
diff --git a/plugins/xcmetrics/src/components/BuildsPage/index.ts b/plugins/xcmetrics/src/components/BuildsPage/index.ts
index d04503499c..47fe9166df 100644
--- a/plugins/xcmetrics/src/components/BuildsPage/index.ts
+++ b/plugins/xcmetrics/src/components/BuildsPage/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './BuildsPage';
+export { BuildsPage } from './BuildsPage';
diff --git a/plugins/xcmetrics/src/components/PreformattedTextComponent/index.ts b/plugins/xcmetrics/src/components/PreformattedTextComponent/index.ts
index e923eeb224..dbc27dd869 100644
--- a/plugins/xcmetrics/src/components/PreformattedTextComponent/index.ts
+++ b/plugins/xcmetrics/src/components/PreformattedTextComponent/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './PreformattedTextComponent';
+export { PreformattedTextComponent } from './PreformattedTextComponent';
diff --git a/plugins/xcmetrics/src/components/StatusIconComponent/index.ts b/plugins/xcmetrics/src/components/StatusIconComponent/index.ts
index e680e6177c..b69415bd78 100644
--- a/plugins/xcmetrics/src/components/StatusIconComponent/index.ts
+++ b/plugins/xcmetrics/src/components/StatusIconComponent/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './StatusIconComponent';
+export { StatusIconComponent } from './StatusIconComponent';