diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx
index 041f7d0590..53b9e2b577 100644
--- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx
+++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/AppNavigation.tsx
@@ -124,13 +124,13 @@ export const AppNavigation = () => {
         <Switch>
             <Route
                 path={[
-                    `${path}/:resourceType(${Object.values(EnvResourceType).join('|')})/:envId(\\d+)?`,
+                    `${path}/:resourceType(${Object.values(EnvResourceType).join('|')})`,
                     `${path}/${URLS.APP_ENV_OVERRIDE_CONFIG}/:envId(\\d+)/:resourceType(${Object.values(EnvResourceType).join('|')})`,
                 ]}
             >
                 {({ match }) => (
                     <EnvConfigurationsNav
-                        key={`env-configurations-nav-${match.params.envId}`}
+                        key={`env-configurations-nav-${'envId' in match.params ? match.params.envId : ''}`}
                         envConfig={envConfig}
                         fetchEnvConfig={fetchEnvConfig}
                         environments={environments.map(({ environmentName, environmentId }) => ({
diff --git a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx
index 725afc7298..fa5fa95a07 100644
--- a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx
+++ b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx
@@ -26,6 +26,8 @@ import {
     usePrompt,
     checkIfPathIsMatching,
     useUrlFilters,
+    UseFormErrorHandler,
+    UseFormSubmitHandler,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { URLS } from '@Config/routes'
@@ -682,7 +684,7 @@ export const ConfigMapSecretContainer = ({
         }
     }
 
-    const onSubmit: ConfigMapSecretFormProps['onSubmit'] = async (data) => {
+    const onSubmit: UseFormSubmitHandler<ConfigMapSecretUseFormProps> = async (data) => {
         const payloadData = getConfigMapSecretPayload(data)
 
         if (isApprovalPolicyConfigured) {
@@ -739,7 +741,7 @@ export const ConfigMapSecretContainer = ({
         }
     }
 
-    const onError: ConfigMapSecretFormProps['onError'] = (errors) => {
+    const onError: UseFormErrorHandler<ConfigMapSecretUseFormProps> = (errors) => {
         if (errors.currentData?.[0] === CONFIG_MAP_SECRET_NO_DATA_ERROR) {
             ToastManager.showToast({
                 variant: ToastVariantType.error,
@@ -755,6 +757,19 @@ export const ConfigMapSecretContainer = ({
         }
     }
 
+    const onDryRunError: UseFormErrorHandler<ConfigMapSecretUseFormProps> = (errors) => {
+        const hasErrors = Object.keys(errors).some((key) => !!errors[key])
+        if (hasErrors) {
+            ToastManager.showToast({
+                variant: ToastVariantType.error,
+                description: 'Please resolve form errors before saving.',
+            })
+        }
+    }
+
+    const formSubmitHandler = handleSubmit(onSubmit, onError)
+    const dryRunSubmitHandler = handleSubmit(onSubmit, onDryRunError)
+
     // CONFIG TOOLBAR POPUP MENU
     const toolbarPopupConfig: ConfigToolbarProps['popupConfig'] = {
         menuConfig: getConfigToolbarPopupConfig({
@@ -802,8 +817,7 @@ export const ConfigMapSecretContainer = ({
                 draftData={resolvedDraftData ?? draftData}
                 inheritedConfigMapSecretData={resolvedInheritedConfigMapSecretData ?? inheritedConfigMapSecretData}
                 id={id}
-                onError={onError}
-                onSubmit={onSubmit}
+                onSubmit={formSubmitHandler}
                 selectedProtectionViewTab={selectedProtectionViewTab}
                 updateCMSecret={updateCMSecret}
                 componentType={componentType}
@@ -826,8 +840,7 @@ export const ConfigMapSecretContainer = ({
                 isApprovalPolicyConfigured={isApprovalPolicyConfigured}
                 isSubmitting={isSubmitting}
                 disableDataTypeChange={isDeleteDisabled}
-                onSubmit={onSubmit}
-                onError={onError}
+                onSubmit={formSubmitHandler}
                 onCancel={onCancel}
                 areScopeVariablesResolving={resolvedScopeVariablesResLoading}
                 appChartRef={appChartRef}
@@ -886,7 +899,7 @@ export const ConfigMapSecretContainer = ({
                         handleChangeDryRunEditorMode={setDryRunEditorMode}
                         showCrudButtons={!showNoOverride}
                         isSubmitting={isSubmitting}
-                        onSubmit={onSubmit}
+                        onSubmit={dryRunSubmitHandler}
                         parentName={parentName}
                         updateCMSecret={updateCMSecret}
                         formData={resolvedFormData ?? formData}
diff --git a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretDryRun.tsx b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretDryRun.tsx
index 29962a96ce..d98797cbc3 100644
--- a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretDryRun.tsx
+++ b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretDryRun.tsx
@@ -144,9 +144,6 @@ export const ConfigMapSecretDryRun = ({
         isDryRunDataPresent && !hideManifest,
     )
 
-    // METHODS
-    const handleSubmit = () => onSubmit(formData)
-
     // RENDERERS
     const renderLHSContent = () => {
         if (publishedVersionDoesNotExist) {
@@ -264,7 +261,7 @@ export const ConfigMapSecretDryRun = ({
                     dataTestId="cm-secret-form-submit-btn"
                     text={`Save${!isCreateView ? ' Changes' : ''}${isApprovalPolicyConfigured ? '...' : ''}`}
                     size={ComponentSizeType.medium}
-                    onClick={handleSubmit}
+                    onClick={onSubmit}
                     isLoading={isSubmitting}
                     disabled={isSaveButtonDisabled}
                 />
diff --git a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretForm.tsx b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretForm.tsx
index b455fc2c8d..defe8ab244 100644
--- a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretForm.tsx
+++ b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretForm.tsx
@@ -65,14 +65,13 @@ export const ConfigMapSecretForm = ({
     areScopeVariablesResolving,
     useFormProps,
     onSubmit,
-    onError,
     onCancel,
 }: ConfigMapSecretFormProps) => {
     // HOOKS
     const location = useLocation()
 
     // FORM PROPS
-    const { data, errors, formState, setValue, register, handleSubmit } = useFormProps
+    const { data, errors, formState, setValue, register } = useFormProps
 
     // CONSTANTS
     const isCreateView = id === null
@@ -329,7 +328,7 @@ export const ConfigMapSecretForm = ({
                 dataTestId="cm-secret-form-submit-btn"
                 text={`Save${!isCreateView ? ' Changes' : ''}${isApprovalPolicyConfigured ? '...' : ''}`}
                 size={ComponentSizeType.medium}
-                onClick={handleSubmit(onSubmit, onError)}
+                onClick={onSubmit}
                 isLoading={isSubmitting}
                 disabled={isSubmitting || areScopeVariablesResolving || isFormDisabled}
             />
diff --git a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretProtected.tsx b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretProtected.tsx
index 2ccf114113..2285e79c98 100644
--- a/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretProtected.tsx
+++ b/src/Pages/Shared/ConfigMapSecret/ConfigMapSecretProtected.tsx
@@ -38,7 +38,6 @@ export const ConfigMapSecretProtected = ({
     parentName,
     inheritedConfigMapSecretData,
     areScopeVariablesResolving,
-    onError,
     onSubmit,
     updateCMSecret,
     shouldMergeTemplateWithPatches,
@@ -222,7 +221,6 @@ export const ConfigMapSecretProtected = ({
             disableDataTypeChange={disableDataTypeChange}
             isSubmitting={false}
             onCancel={noop}
-            onError={onError}
             onSubmit={onSubmit}
             areScopeVariablesResolving={areScopeVariablesResolving}
             useFormProps={useFormProps}
diff --git a/src/Pages/Shared/ConfigMapSecret/types.ts b/src/Pages/Shared/ConfigMapSecret/types.ts
index 5658791c75..2bd99d12c5 100644
--- a/src/Pages/Shared/ConfigMapSecret/types.ts
+++ b/src/Pages/Shared/ConfigMapSecret/types.ts
@@ -8,8 +8,6 @@ import {
     ProtectConfigTabsType,
     SelectPickerOptionType,
     useForm,
-    UseFormErrorHandler,
-    UseFormSubmitHandler,
     AppEnvDeploymentConfigDTO,
     DryRunEditorMode,
     ConfigHeaderTabType,
@@ -156,8 +154,7 @@ export interface ConfigMapSecretFormProps
     areScopeVariablesResolving: boolean
     isDraft?: boolean
     disableDataTypeChange: boolean
-    onSubmit: UseFormSubmitHandler<ConfigMapSecretUseFormProps>
-    onError: UseFormErrorHandler<ConfigMapSecretUseFormProps>
+    onSubmit: () => void
     onCancel: () => void
     useFormProps: ReturnType<typeof useForm<ConfigMapSecretUseFormProps>>
 }
@@ -217,7 +214,6 @@ export type ConfigMapSecretProtectedProps = Pick<ConfigMapSecretContainerProps,
         | 'isJob'
         | 'disableDataTypeChange'
         | 'id'
-        | 'onError'
         | 'onSubmit'
         | 'areScopeVariablesResolving'
         | 'appChartRef'