diff --git a/src/components/index.js b/src/components/index.js
index 3116bc8..8829fa9 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -60,7 +60,7 @@ export {default as MuiChipNotify} from './mui/chip-notify'
 export {default as MuiChipSelectInput} from './mui/chip-select-input'
 export {default as MuiConfirmDialog} from './mui/confirm-dialog'
 export {GlobalConfirmDialog} from './mui/showConfirmDialog'
-export {default as MuiCustomAlert} from './mui/custom-alert'
+export {default as MuiCustomAlert} from './mui/CustomAlert'
 export {default as MuiDropdownCheckbox} from './mui/dropdown-checkbox'
 export {default as MuiMenuButton} from './mui/menu-button'
 export {default as MuiSearchInput} from './mui/search-input'
diff --git a/src/components/mui/__tests__/custom-alert.test.js b/src/components/mui/__tests__/custom-alert.test.js
deleted file mode 100644
index 33be010..0000000
--- a/src/components/mui/__tests__/custom-alert.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2026 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * */
-
-import React from "react";
-import { render, screen } from "@testing-library/react";
-import "@testing-library/jest-dom";
-import CustomAlert from "../custom-alert";
-
-describe("CustomAlert", () => {
-  test("renders the message", () => {
-    render(<CustomAlert message="Hello world" />);
-    expect(screen.getByText("Hello world")).toBeInTheDocument();
-  });
-
-  test("renders without crashing when no props provided", () => {
-    const { container } = render(<CustomAlert />);
-    expect(container.firstChild).toBeInTheDocument();
-  });
-
-  test("renders with error severity", () => {
-    render(<CustomAlert severity="error" message="Error message" />);
-    expect(screen.getByText("Error message")).toBeInTheDocument();
-  });
-
-  test("renders with success severity", () => {
-    render(<CustomAlert severity="success" message="Success!" />);
-    expect(screen.getByText("Success!")).toBeInTheDocument();
-  });
-
-  test("renders with warning severity", () => {
-    render(<CustomAlert severity="warning" message="Warning!" />);
-    expect(screen.getByText("Warning!")).toBeInTheDocument();
-  });
-});
diff --git a/src/components/mui/custom-alert.js b/src/components/mui/custom-alert.js
deleted file mode 100644
index 56a841f..0000000
--- a/src/components/mui/custom-alert.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2026 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * */
-
-import React from "react";
-import { Alert } from "@mui/material";
-
-const CustomAlert = ({ severity = "info", message = "", hideIcon = false }) => (
-  <Alert
-    severity={severity}
-    icon={!hideIcon}
-    sx={{
-      justifyContent: "start",
-      alignItems: "center",
-      mb: 2
-    }}
-  >
-    {message}
-  </Alert>
-);
-
-export default CustomAlert;
diff --git a/webpack.common.js b/webpack.common.js
index e555fe3..c908c97 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -84,7 +84,7 @@ module.exports = {
         'components/mui/chip-notify': './src/components/mui/chip-notify.js',
         'components/mui/chip-select-input': './src/components/mui/chip-select-input.js',
         'components/mui/confirm-dialog': './src/components/mui/confirm-dialog.js',
-        'components/mui/custom-alert': './src/components/mui/custom-alert.js',
+        'components/mui/custom-alert': './src/components/mui/CustomAlert/index.js',
         'components/mui/dnd-list': './src/components/mui/dnd-list.js',
         'components/mui/dropdown-checkbox': './src/components/mui/dropdown-checkbox.js',
         'components/mui/menu-button': './src/components/mui/menu-button.js',