diff --git a/packages/apollo/eslint.config.mjs b/packages/apollo/eslint.config.mjs
index 421934ba..770268b9 100644
--- a/packages/apollo/eslint.config.mjs
+++ b/packages/apollo/eslint.config.mjs
@@ -45,7 +45,6 @@ export default [
 			},
 		},
 		"rules": {
-			"react/jsx-max-props-per-line": [1, { "maximum": 1 }],
 			"react/jsx-closing-bracket-location": [1, "line-aligned"],
 			"array-bracket-spacing": 0,
 			"space-before-function-paren": 0,
@@ -76,9 +75,8 @@ export default [
 				}
 			],
 			"max-depth": [1, 8],
-			"max-len": [1, 200],
+			"max-len": [1, 300],
 			"max-params": [1, 7],
-			"new-cap": 1,
 			"no-bitwise": 1,
 			"no-console": "off",
 			"no-multi-spaces": 1,
@@ -96,7 +94,6 @@ export default [
 			"no-var": 1,
 			"object-curly-spacing": [1, "always"],
 			"prefer-const": 0,
-			"quotes": [1, "single"],
 			"require-atomic-updates": 0,
 			"semi": [0, "always"],
 			"space-before-blocks": 1,
diff --git a/packages/apollo/src/components/Access/Access.js b/packages/apollo/src/components/Access/Access.js
index a24847b4..00289d46 100644
--- a/packages/apollo/src/components/Access/Access.js
+++ b/packages/apollo/src/components/Access/Access.js
@@ -784,11 +784,11 @@ export function AuthenticatedUsers(props) {
 			addItems={
 				props.isManager
 					? [
-							{
-								text: 'add_new_users',
-								fn: props.onAdd,
-							},
-						]
+						{
+							text: 'add_new_users',
+							fn: props.onAdd,
+						},
+					]
 					: []
 			}
 			selectItem={
@@ -894,11 +894,11 @@ export function ApiKeys(props) {
 			addItems={
 				props.isManager
 					? [
-							{
-								text: 'add_new_apikey',
-								fn: props.onAdd,
-							},
-						]
+						{
+							text: 'add_new_apikey',
+							fn: props.onAdd,
+						},
+					]
 					: []
 			}
 			selectItem={
diff --git a/packages/apollo/src/components/CADetails/CADetails.js b/packages/apollo/src/components/CADetails/CADetails.js
index 5787cff1..cd986905 100644
--- a/packages/apollo/src/components/CADetails/CADetails.js
+++ b/packages/apollo/src/components/CADetails/CADetails.js
@@ -633,14 +633,14 @@ export class CADetails extends Component {
 										this.props.details.isUpgradeAvailable &&
 										this.props.details.location === 'ibm_saas' &&
 										ActionsHelper.canCreateComponent(this.props.userInfo, this.props.feature_flags) ? (
-											<div className="ibp-details-patch-container">
-												<div className="ibp-patch-available-tag ibp-node-details" onClick={() => this.openCASettings('upgrade')}>
-													{translate('patch_available')}
+												<div className="ibp-details-patch-container">
+													<div className="ibp-patch-available-tag ibp-node-details" onClick={() => this.openCASettings('upgrade')}>
+														{translate('patch_available')}
+													</div>
 												</div>
-											</div>
-										) : (
-											''
-										)}
+											) : (
+												''
+											)}
 									</Tab>
 								)}
 							</TabList>
diff --git a/packages/apollo/src/components/ChannelDetails/ChannelDetails.js b/packages/apollo/src/components/ChannelDetails/ChannelDetails.js
index 0566b0e2..4e43f41e 100644
--- a/packages/apollo/src/components/ChannelDetails/ChannelDetails.js
+++ b/packages/apollo/src/components/ChannelDetails/ChannelDetails.js
@@ -1254,16 +1254,13 @@ class ChannelDetails extends Component {
 						<div className="ibp__channel--container">
 							<Tabs aria-label="Tabs">
 								<TabList contained>
-									<Tab id="ibp-channel-detail-chaincode"
-									>
+									<Tab id="ibp-channel-detail-chaincode">
 										{translate('chaincode_management')}
 									</Tab>
-									<Tab id="ibp-channel-detail-tab-overview"
-									>
+									<Tab id="ibp-channel-detail-tab-overview">
 										{translate('transaction_overview')}
 									</Tab>
-									<Tab id="ibp-channel-detail-tab-detail"
-									>
+									<Tab id="ibp-channel-detail-tab-detail">
 										{translate('channel_details')}
 									</Tab>
 								</TabList>
diff --git a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js
index 4cf25ad5..aa1b2d22 100644
--- a/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js
+++ b/packages/apollo/src/components/ChannelModal/Wizard/OrdererOrganizations/OrdererOrganizations.js
@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-import {TrashCan} from '@carbon/icons-react';
+import { TrashCan } from '@carbon/icons-react';
 import { Button, Checkbox } from "@carbon/react";
 import _ from 'lodash';
 import PropTypes from 'prop-types';
@@ -180,7 +180,7 @@ export class OrdererOrganizations extends Component {
 		) : [];
 
 		return (
-            <div className="ibp-channel-organizations">
+			<div className="ibp-channel-organizations">
 				<p className="ibp-channel-section-title">{translate('channel_orderer_organizations')}</p>
 				<p className="ibp-channel-section-desc">
 					{isChannelUpdate ? translate('update_channel_organization_desc') : translate('create_channel_orderer_org_desc')}
@@ -246,7 +246,7 @@ export class OrdererOrganizations extends Component {
 					{ordering_orgs &&
 						ordering_orgs.map((org, i) => {
 							return (
-                                <div key={'org_' + i}
+								<div key={'org_' + i}
 									className="ibp-add-orgs-table"
 								>
 									<div className="ibp-add-orgs-msp">
@@ -291,7 +291,7 @@ export class OrdererOrganizations extends Component {
 										}}
 									/>
 								</div>
-                            );
+							);
 						})}
 					{missingDefinitionError && (
 						<div className="ibp-missing-definition-error">
@@ -302,7 +302,7 @@ export class OrdererOrganizations extends Component {
 					)}
 				</div>
 			</div>
-        );
+		);
 	}
 }
 
diff --git a/packages/apollo/src/components/ChipInput.js b/packages/apollo/src/components/ChipInput.js
index 638e44a6..dc19c617 100644
--- a/packages/apollo/src/components/ChipInput.js
+++ b/packages/apollo/src/components/ChipInput.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
diff --git a/packages/apollo/src/components/GenerateMSPModal/GenerateMSPModal.js b/packages/apollo/src/components/GenerateMSPModal/GenerateMSPModal.js
index 37b1adb2..f95a698f 100644
--- a/packages/apollo/src/components/GenerateMSPModal/GenerateMSPModal.js
+++ b/packages/apollo/src/components/GenerateMSPModal/GenerateMSPModal.js
@@ -466,9 +466,9 @@ class GenerateMSPModal extends Component {
 					error: error.title
 						? error
 						: {
-								title: 'error_add_identity',
-								details: error.details ? error.details : error,
-							},
+							title: 'error_add_identity',
+							details: error.details ? error.details : error,
+						},
 					loadingCert: false,
 				});
 			});
@@ -959,11 +959,11 @@ class GenerateMSPModal extends Component {
 		} else {
 			const generatedCertAdmin = this.props.generatedCert.certificate
 				? [
-						{
-							cert: this.props.generatedCert.certificate,
-							isReadOnly: true,
-						},
-					]
+					{
+						cert: this.props.generatedCert.certificate,
+						isReadOnly: true,
+					},
+				]
 				: [];
 			this.props.updateState(SCOPE, {
 				identityType: 'new',
diff --git a/packages/apollo/src/components/ImportCAModal/ImportCAModal.js b/packages/apollo/src/components/ImportCAModal/ImportCAModal.js
index 81db329c..1fa5c30e 100644
--- a/packages/apollo/src/components/ImportCAModal/ImportCAModal.js
+++ b/packages/apollo/src/components/ImportCAModal/ImportCAModal.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-import {Add, Upload} from '@carbon/icons-react';
+import { Add, Upload } from '@carbon/icons-react';
 import { Checkbox, RadioTile, TileGroup } from "@carbon/react";
 import _ from 'lodash';
 import PropTypes from 'prop-types';
diff --git a/packages/apollo/src/components/ImportOrdererModal/ImportOrdererModal.js b/packages/apollo/src/components/ImportOrdererModal/ImportOrdererModal.js
index 0f65f4f4..944e3866 100644
--- a/packages/apollo/src/components/ImportOrdererModal/ImportOrdererModal.js
+++ b/packages/apollo/src/components/ImportOrdererModal/ImportOrdererModal.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-import {Add, Upload} from '@carbon/icons-react';
+import { Add, Upload } from '@carbon/icons-react';
 import { Checkbox, Loading, RadioTile, TileGroup, Toggle } from "@carbon/react";
 import _ from 'lodash';
 import PropTypes from 'prop-types';
diff --git a/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js b/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js
index b88a3f78..81f84c41 100644
--- a/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js
+++ b/packages/apollo/src/components/ImportPeerModal/ImportPeerModal.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-import {Add, Upload} from '@carbon/icons-react';
+import { Add, Upload } from '@carbon/icons-react';
 import { Checkbox, RadioTile, TileGroup } from "@carbon/react";
 import _ from 'lodash';
 import PropTypes from 'prop-types';
diff --git a/packages/apollo/src/components/Login/Login.js b/packages/apollo/src/components/Login/Login.js
index 7fecb49d..a0defd40 100644
--- a/packages/apollo/src/components/Login/Login.js
+++ b/packages/apollo/src/components/Login/Login.js
@@ -173,7 +173,8 @@ export class Login extends Component {
 								event.preventDefault();
 								onSubmit(event);
 							}
-						}}>
+						}}
+					>
 						<div className={`ibp-login-content ${this.props.changePassword ? 'ibp-change-password' : 'ibp-user-login'} `}>
 							<p className="ibp-login-content-title ibm-type-light">
 								{translate(this.props.changePassword ? 'change_your_password' : 'product_label_login')}
diff --git a/packages/apollo/src/components/PageContainer/PageContainer.js b/packages/apollo/src/components/PageContainer/PageContainer.js
index 2ad7a1e6..790bf9aa 100644
--- a/packages/apollo/src/components/PageContainer/PageContainer.js
+++ b/packages/apollo/src/components/PageContainer/PageContainer.js
@@ -26,12 +26,12 @@ const PageContainer = props => {
 };
 
 
-{/* <div id="main-content"
+{ /* <div id="main-content"
 className="ibp-page-container cds--grid"
 data-floating-menu-container
 >
 {props.children}
-</div> */}
+</div> */ }
 
 PageContainer.propTypes = {
 	children: PropTypes.node,
diff --git a/packages/apollo/src/components/PeerDetails/PeerDetails.js b/packages/apollo/src/components/PeerDetails/PeerDetails.js
index fa320dd7..c623b1b9 100644
--- a/packages/apollo/src/components/PeerDetails/PeerDetails.js
+++ b/packages/apollo/src/components/PeerDetails/PeerDetails.js
@@ -586,12 +586,12 @@ class PeerDetails extends Component {
 										{details.isUpgradeAvailable &&
 										details.location === 'ibm_saas' &&
 										ActionsHelper.canCreateComponent(this.props.userInfo, this.props.feature_flags) ? (
-											<div className="ibp-details-patch-container">
-												<div className="ibp-patch-available-tag ibp-node-details" onClick={() => this.openPeerSettings('upgrade')}>
-													{translate('patch_available')}
+												<div className="ibp-details-patch-container">
+													<div className="ibp-patch-available-tag ibp-node-details" onClick={() => this.openPeerSettings('upgrade')}>
+														{translate('patch_available')}
+													</div>
 												</div>
-											</div>
-										) : null}
+											) : null}
 									</Tab>
 								</TabList>
 								<TabPanels>
diff --git a/packages/apollo/src/components/ProposeChaincodeModal/ProposeChaincodeModal.js b/packages/apollo/src/components/ProposeChaincodeModal/ProposeChaincodeModal.js
index 53ddfaeb..362e0bf3 100644
--- a/packages/apollo/src/components/ProposeChaincodeModal/ProposeChaincodeModal.js
+++ b/packages/apollo/src/components/ProposeChaincodeModal/ProposeChaincodeModal.js
@@ -982,10 +982,10 @@ class ProposeChaincodeModal extends React.Component {
 									</>
 								)}
 								<Trans>{this.props.t('this_proposal')}
-								{/* , { */}
+									{/* , { */}
 									{/* org: this.props.propose_org ? <span className="ibp-highlight-msp">{this.props.propose_org.msp_id}</span> : null, */}
-								{/* })} */}
-								{this.props.propose_org ? <span className="ibp-highlight-msp">{this.props.propose_org.msp_id}</span>: null}
+									{/* })} */}
+									{this.props.propose_org ? <span className="ibp-highlight-msp">{this.props.propose_org.msp_id}</span>: null}
 								</Trans>
 							</>
 						}
diff --git a/packages/apollo/src/components/SidePanel/__mocks__/SidePanel.js b/packages/apollo/src/components/SidePanel/__mocks__/SidePanel.js
index 06d205d6..20f5b56a 100644
--- a/packages/apollo/src/components/SidePanel/__mocks__/SidePanel.js
+++ b/packages/apollo/src/components/SidePanel/__mocks__/SidePanel.js
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-/* eslint-disable react/prop-types */
+
+// /* eslint-disable react/prop-types */
 
 /**
  * this file is used to return a mock implementation of the SidePanel component
diff --git a/packages/apollo/src/components/SidePanelInlineConfirmation/SidePanelInlineConfirmation.js b/packages/apollo/src/components/SidePanelInlineConfirmation/SidePanelInlineConfirmation.js
index 63184ffa..25c5a906 100644
--- a/packages/apollo/src/components/SidePanelInlineConfirmation/SidePanelInlineConfirmation.js
+++ b/packages/apollo/src/components/SidePanelInlineConfirmation/SidePanelInlineConfirmation.js
@@ -15,7 +15,7 @@
 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Close} from '@carbon/icons-react';
+import { Close } from '@carbon/icons-react';
 
 const SidePanelInlineConfirmation = props => {
 	return (
diff --git a/packages/apollo/src/components/SignatureDetailModal/SignatureDetailModal.js b/packages/apollo/src/components/SignatureDetailModal/SignatureDetailModal.js
index d87b6c9e..7d4e4224 100644
--- a/packages/apollo/src/components/SignatureDetailModal/SignatureDetailModal.js
+++ b/packages/apollo/src/components/SignatureDetailModal/SignatureDetailModal.js
@@ -253,7 +253,7 @@ class SignatureDetailModal extends React.Component {
 				name: orderer.msp_id,
 				type: 'dropdown',
 				options: orderer.identities || this.props.identities,
-				label: RenderParamHTML(translate, 'signature_for_msp',{
+				label: RenderParamHTML(translate, 'signature_for_msp', {
 					msp: (
 						<CodeSnippet
 							type="inline"
diff --git a/packages/apollo/src/components/Timeline/Timeline.js b/packages/apollo/src/components/Timeline/Timeline.js
index b41a7a6a..f05cce35 100644
--- a/packages/apollo/src/components/Timeline/Timeline.js
+++ b/packages/apollo/src/components/Timeline/Timeline.js
@@ -17,7 +17,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import TimelineCancelButton from '../TimelineCancelButton/TimelineCancelButton';
-import {CheckmarkOutline} from '@carbon/icons-react';
+import { CheckmarkOutline } from '@carbon/icons-react';
 
 const Timeline = ({ steps, onClose, selectedTimelineStep, header, estTime, progressWithChecks, t: translate }) => {
 	return (
diff --git a/packages/apollo/src/hoc/withRouter.jsx b/packages/apollo/src/hoc/withRouter.jsx
index 6041f574..2e8857a1 100644
--- a/packages/apollo/src/hoc/withRouter.jsx
+++ b/packages/apollo/src/hoc/withRouter.jsx
@@ -7,7 +7,7 @@ const withRouter = (Component) => {
 		const navigate = useNavigate();
 		const history = {
 			push: (to, options) => {
-				if(!to.includes("undefined")) {
+				if (!to.includes("undefined")) {
 					navigate(to, options)
 				}
 			},
diff --git a/packages/apollo/src/registerServiceWorker.js b/packages/apollo/src/registerServiceWorker.js
index 29023371..7a9eda11 100644
--- a/packages/apollo/src/registerServiceWorker.js
+++ b/packages/apollo/src/registerServiceWorker.js
@@ -22,8 +22,8 @@
 
 // To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
 // This link also includes instructions on opting out of this behavior.
-/* eslint-disable no-console, no-param-reassign */
-/* eslint-disable no-undef */
+// /* eslint-disable no-console, no-param-reassign */
+// /* eslint-disable no-undef */
 
 const isLocalhost = Boolean(
 	window.location.hostname === 'localhost' ||
diff --git a/packages/apollo/src/rest/PeerRestApi.js b/packages/apollo/src/rest/PeerRestApi.js
index b93f701a..026eac1f 100644
--- a/packages/apollo/src/rest/PeerRestApi.js
+++ b/packages/apollo/src/rest/PeerRestApi.js
@@ -449,7 +449,7 @@ class PeerRestApi {
 			if (!_.get(exportedPeer, 'msp.tlsca.root_certs')) {
 				_.set(exportedPeer, 'msp.tlsca.root_certs', [some_peer_record.tls_ca_root_cert || some_peer_record.pem]);
 			}
-			if(some_peer_record.node_ou) {
+			if (some_peer_record.node_ou) {
 				exportedPeer.node_ou = some_peer_record.node_ou;
 			}
 			return NodeRestApi.importComponent(exportedPeer);
diff --git a/packages/apollo/src/utils/helper.js b/packages/apollo/src/utils/helper.js
index 9cfe8e08..15c18b46 100644
--- a/packages/apollo/src/utils/helper.js
+++ b/packages/apollo/src/utils/helper.js
@@ -236,7 +236,7 @@ const Helper = {
 				tls_ca_root_cert: _.get(node, 'msp.tlsca.root_certs[0]'),
 			};
 
-			if(node.node_ou) {
+			if (node.node_ou) {
 				exportNode.node_ou = node.node_ou;
 			}
 
diff --git a/packages/athena/public/releaseNotes.json b/packages/athena/public/releaseNotes.json
index 8b91194f..2bbfdabd 100644
--- a/packages/athena/public/releaseNotes.json
+++ b/packages/athena/public/releaseNotes.json
@@ -1,6 +1,6 @@
 [
 	{
-		"version": "1.0.9-20",
+		"version": "1.0.9-21",
 		"date": "04 July 2024",
 		"description": [
 			{