diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e768ccd1c3..dfc2fea68b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.3
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Node.js modules cache, repository
diff --git a/.github/workflows/vuln_scan.yml b/.github/workflows/vuln_scan.yml
index 610ff461b4..8f327e6c7b 100644
--- a/.github/workflows/vuln_scan.yml
+++ b/.github/workflows/vuln_scan.yml
@@ -17,7 +17,7 @@ jobs:
           trivy-config: .github/trivy.yaml
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'scan_result.sarif'
 
diff --git a/frontend/src/concepts/pipelines/content/createRun/useRunFormData.ts b/frontend/src/concepts/pipelines/content/createRun/useRunFormData.ts
index 11fad9ef67..3e20a3241b 100644
--- a/frontend/src/concepts/pipelines/content/createRun/useRunFormData.ts
+++ b/frontend/src/concepts/pipelines/content/createRun/useRunFormData.ts
@@ -144,7 +144,7 @@ const useRunFormData = (
   const { project } = usePipelinesAPI();
   const { pipeline, version, experiment, nameDesc } = initialFormData || {};
 
-  const formState = useGenericObjectState<RunFormData>({
+  const formState = useGenericObjectState<RunFormData>(() => ({
     project,
     nameDesc: nameDesc ?? { name: '', description: '' },
     pipeline: pipeline ?? null,
@@ -161,7 +161,7 @@ const useRunFormData = (
         {},
       ),
     ...initialFormData,
-  });
+  }));
   const [, setFormValue] = formState;
 
   useUpdateExperimentFormData(formState, experiment);
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
index 78ec983789..5bf60dc589 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
@@ -16,8 +16,7 @@ import { Link } from 'react-router-dom';
 import FormSection from '~/components/pf-overrides/FormSection';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/pages/modelRegistry/screens/routeUtils';
-import { ValueOf } from '~/typeHelpers';
-import { useRegisterModelData, RegistrationCommonFormData } from './useRegisterModelData';
+import { useRegisterModelData } from './useRegisterModelData';
 import { isRegisterModelSubmitDisabled, registerModel } from './utils';
 import RegistrationCommonFormSections from './RegistrationCommonFormSections';
 import { useRegistrationCommonState } from './useRegistrationCommonState';
@@ -90,10 +89,7 @@ const RegisterModel: React.FC = () => {
               </FormSection>
               <RegistrationCommonFormSections
                 formData={formData}
-                setData={(
-                  propKey: keyof RegistrationCommonFormData,
-                  propValue: ValueOf<RegistrationCommonFormData>,
-                ) => setData(propKey, propValue)}
+                setData={setData}
                 isFirstVersion
               />
             </StackItem>
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
index 257998be4c..f6bbf50b1d 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
@@ -16,8 +16,7 @@ import ApplicationsPage from '~/pages/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/pages/modelRegistry/screens/routeUtils';
 import useRegisteredModels from '~/concepts/modelRegistry/apiHooks/useRegisteredModels';
 import { filterLiveModels } from '~/concepts/modelRegistry/utils';
-import { ValueOf } from '~/typeHelpers';
-import { RegistrationCommonFormData, useRegisterVersionData } from './useRegisterModelData';
+import { useRegisterVersionData } from './useRegisterModelData';
 import { isRegisterVersionSubmitDisabled, registerVersion } from './utils';
 import RegistrationCommonFormSections from './RegistrationCommonFormSections';
 import { useRegistrationCommonState } from './useRegistrationCommonState';
@@ -119,10 +118,7 @@ const RegisterVersion: React.FC = () => {
             <StackItem>
               <RegistrationCommonFormSections
                 formData={formData}
-                setData={(
-                  propKey: keyof RegistrationCommonFormData,
-                  propValue: ValueOf<RegistrationCommonFormData>,
-                ) => setData(propKey, propValue)}
+                setData={setData}
                 isFirstVersion={false}
                 latestVersion={latestVersion}
               />
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
index 19618234d8..9041268205 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
@@ -22,22 +22,28 @@ import { ModelVersion } from '~/concepts/modelRegistry/types';
 import { ModelLocationType, RegistrationCommonFormData } from './useRegisterModelData';
 import { ConnectionModal } from './ConnectionModal';
 
-type RegistrationCommonFormSectionsProps = {
-  formData: RegistrationCommonFormData;
-  setData: UpdateObjectAtPropAndValue<RegistrationCommonFormData>;
+type RegistrationCommonFormSectionsProps<D extends RegistrationCommonFormData> = {
+  formData: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   isFirstVersion: boolean;
   latestVersion?: ModelVersion;
 };
 
-const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsProps> = ({
+const RegistrationCommonFormSections = <D extends RegistrationCommonFormData>({
   formData,
   setData,
   isFirstVersion,
   latestVersion,
-}) => {
+}: RegistrationCommonFormSectionsProps<D>): React.ReactNode => {
   const [isAutofillModalOpen, setAutofillModalOpen] = React.useState(false);
 
-  const connectionDataMap: Record<string, keyof RegistrationCommonFormData> = {
+  const connectionDataMap: Record<
+    string,
+    keyof Pick<
+      RegistrationCommonFormData,
+      'modelLocationEndpoint' | 'modelLocationBucket' | 'modelLocationRegion'
+    >
+  > = {
     AWS_S3_ENDPOINT: 'modelLocationEndpoint',
     AWS_S3_BUCKET: 'modelLocationBucket',
     AWS_DEFAULT_REGION: 'modelLocationRegion',
diff --git a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/InferenceServiceServingRuntimeSection.tsx b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/InferenceServiceServingRuntimeSection.tsx
index c62eaa2ebd..e3a947f01a 100644
--- a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/InferenceServiceServingRuntimeSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/InferenceServiceServingRuntimeSection.tsx
@@ -66,7 +66,9 @@ const InferenceServiceServingRuntimeSection: React.FC<
         }
         onChange={(option) => {
           setData('servingRuntimeName', option);
-          setData('format', '');
+          setData('format', {
+            name: '',
+          });
         }}
       />
     </FormGroup>
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
index e365356048..1c09124365 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
@@ -11,28 +11,23 @@ import {
 } from '@patternfly/react-core';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
-import {
-  CreatingInferenceServiceObject,
-  CreatingServingRuntimeObject,
-} from '~/pages/modelServing/screens/types';
+import { CreatingModelServingObjectCommon } from '~/pages/modelServing/screens/types';
 
 import ServingRuntimeTokenSection from './ServingRuntimeTokenSection';
 
-type AuthServingRuntimeSectionProps = {
-  data: CreatingServingRuntimeObject | CreatingInferenceServiceObject;
-  setData:
-    | UpdateObjectAtPropAndValue<CreatingServingRuntimeObject>
-    | UpdateObjectAtPropAndValue<CreatingInferenceServiceObject>;
+type AuthServingRuntimeSectionProps<D extends CreatingModelServingObjectCommon> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   allowCreate: boolean;
   publicRoute?: boolean;
 };
 
-const AuthServingRuntimeSection: React.FC<AuthServingRuntimeSectionProps> = ({
+const AuthServingRuntimeSection = <D extends CreatingModelServingObjectCommon>({
   data,
   setData,
   allowCreate,
   publicRoute,
-}) => {
+}: AuthServingRuntimeSectionProps<D>): React.ReactNode => {
   const createNewToken = React.useCallback(() => {
     const name = 'default-name';
     const duplicated = data.tokens.filter((token) => token.name === name);
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeExpandedField.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeExpandedField.tsx
index 398c3da730..99599aaf36 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeExpandedField.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeExpandedField.tsx
@@ -2,27 +2,22 @@ import * as React from 'react';
 import { FormGroup, Grid } from '@patternfly/react-core';
 import IndentSection from '~/pages/projects/components/IndentSection';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
-import {
-  CreatingInferenceServiceObject,
-  CreatingServingRuntimeObject,
-} from '~/pages/modelServing/screens/types';
+import { CreatingModelServingObjectCommon } from '~/pages/modelServing/screens/types';
 import { ContainerResourceAttributes, ContainerResources } from '~/types';
 import CPUField from '~/components/CPUField';
 import MemoryField from '~/components/MemoryField';
 
-type ServingRuntimeSizeExpandedFieldProps = {
-  data: CreatingServingRuntimeObject | CreatingInferenceServiceObject;
-  setData:
-    | UpdateObjectAtPropAndValue<CreatingServingRuntimeObject>
-    | UpdateObjectAtPropAndValue<CreatingInferenceServiceObject>;
+type ServingRuntimeSizeExpandedFieldProps<D extends CreatingModelServingObjectCommon> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
 };
 
 type ResourceKeys = keyof ContainerResources;
 
-const ServingRuntimeSizeExpandedField: React.FC<ServingRuntimeSizeExpandedFieldProps> = ({
+const ServingRuntimeSizeExpandedField = <D extends CreatingModelServingObjectCommon>({
   data,
   setData,
-}) => {
+}: ServingRuntimeSizeExpandedFieldProps<D>): React.ReactNode => {
   const handleChange = (
     type: ContainerResourceAttributes.CPU | ContainerResourceAttributes.MEMORY,
     variant: ResourceKeys,
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeSection.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeSection.tsx
index 0d2286cf30..635037914e 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeSection.tsx
@@ -3,8 +3,7 @@ import { FormGroup, Stack, StackItem, Popover, Icon } from '@patternfly/react-co
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
 import {
-  CreatingInferenceServiceObject,
-  CreatingServingRuntimeObject,
+  CreatingModelServingObjectCommon,
   ModelServingSize,
 } from '~/pages/modelServing/screens/types';
 import { ServingRuntimeKind } from '~/k8sTypes';
@@ -17,11 +16,9 @@ import { AcceleratorProfileState } from '~/utilities/useAcceleratorProfileState'
 import SimpleSelect from '~/components/SimpleSelect';
 import ServingRuntimeSizeExpandedField from './ServingRuntimeSizeExpandedField';
 
-type ServingRuntimeSizeSectionProps = {
-  data: CreatingServingRuntimeObject | CreatingInferenceServiceObject;
-  setData:
-    | UpdateObjectAtPropAndValue<CreatingServingRuntimeObject>
-    | UpdateObjectAtPropAndValue<CreatingInferenceServiceObject>;
+type ServingRuntimeSizeSectionProps<D extends CreatingModelServingObjectCommon> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   sizes: ModelServingSize[];
   servingRuntimeSelected?: ServingRuntimeKind;
   acceleratorProfileState: AcceleratorProfileState;
@@ -30,7 +27,7 @@ type ServingRuntimeSizeSectionProps = {
   infoContent?: string;
 };
 
-const ServingRuntimeSizeSection: React.FC<ServingRuntimeSizeSectionProps> = ({
+const ServingRuntimeSizeSection = <D extends CreatingModelServingObjectCommon>({
   data,
   setData,
   sizes,
@@ -39,7 +36,7 @@ const ServingRuntimeSizeSection: React.FC<ServingRuntimeSizeSectionProps> = ({
   selectedAcceleratorProfile,
   setSelectedAcceleratorProfile,
   infoContent,
-}) => {
+}: ServingRuntimeSizeSectionProps<D>): React.ReactNode => {
   const [supportedAcceleratorProfiles, setSupportedAcceleratorProfiles] = React.useState<
     string[] | undefined
   >();
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenInput.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenInput.tsx
index 4e6cb115ad..94366915af 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenInput.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenInput.tsx
@@ -13,27 +13,24 @@ import {
 import { ExclamationCircleIcon, MinusCircleIcon } from '@patternfly/react-icons';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
 import {
-  CreatingInferenceServiceObject,
-  CreatingServingRuntimeObject,
+  CreatingModelServingObjectCommon,
   ServingRuntimeToken,
 } from '~/pages/modelServing/screens/types';
 import { translateDisplayNameForK8s } from '~/concepts/k8s/utils';
 
-type ServingRuntimeTokenInputProps = {
-  data: CreatingServingRuntimeObject | CreatingInferenceServiceObject;
-  setData:
-    | UpdateObjectAtPropAndValue<CreatingServingRuntimeObject>
-    | UpdateObjectAtPropAndValue<CreatingInferenceServiceObject>;
+type ServingRuntimeTokenInputProps<D extends CreatingModelServingObjectCommon> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   token: ServingRuntimeToken;
   disabled?: boolean;
 };
 
-const ServingRuntimeTokenInput: React.FC<ServingRuntimeTokenInputProps> = ({
+const ServingRuntimeTokenInput = <D extends CreatingModelServingObjectCommon>({
   data,
   setData,
   token,
   disabled,
-}) => {
+}: ServingRuntimeTokenInputProps<D>): React.ReactNode => {
   const checkDuplicates = (name: string): boolean => {
     const duplicates = data.tokens.filter(
       (currentToken) =>
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
index 363a4ddd5f..d40aa85197 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
@@ -3,27 +3,22 @@ import { Alert, Button, Checkbox, FormGroup, Stack, StackItem } from '@patternfl
 import { PlusCircleIcon } from '@patternfly/react-icons';
 import IndentSection from '~/pages/projects/components/IndentSection';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
-import {
-  CreatingInferenceServiceObject,
-  CreatingServingRuntimeObject,
-} from '~/pages/modelServing/screens/types';
+import { CreatingModelServingObjectCommon } from '~/pages/modelServing/screens/types';
 import ServingRuntimeTokenInput from './ServingRuntimeTokenInput';
 
-type ServingRuntimeTokenSectionProps = {
-  data: CreatingServingRuntimeObject | CreatingInferenceServiceObject;
-  setData:
-    | UpdateObjectAtPropAndValue<CreatingServingRuntimeObject>
-    | UpdateObjectAtPropAndValue<CreatingInferenceServiceObject>;
+type ServingRuntimeTokenSectionProps<D extends CreatingModelServingObjectCommon> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   allowCreate: boolean;
   createNewToken: () => void;
 };
 
-const ServingRuntimeTokenSection: React.FC<ServingRuntimeTokenSectionProps> = ({
+const ServingRuntimeTokenSection = <D extends CreatingModelServingObjectCommon>({
   data,
   setData,
   allowCreate,
   createNewToken,
-}) => (
+}: ServingRuntimeTokenSectionProps<D>): React.ReactNode => (
   <FormGroup
     label="Token authentication"
     data-testid="auth-section"
diff --git a/frontend/src/pages/modelServing/screens/types.ts b/frontend/src/pages/modelServing/screens/types.ts
index f443d593de..6a33c6adce 100644
--- a/frontend/src/pages/modelServing/screens/types.ts
+++ b/frontend/src/pages/modelServing/screens/types.ts
@@ -40,14 +40,9 @@ export type SupportedModelFormatsInfo = {
   priority?: number;
 };
 
-export type CreatingServingRuntimeObject = {
-  name: string;
+export type CreatingServingRuntimeObject = CreatingModelServingObjectCommon & {
   servingRuntimeTemplateName: string;
   numReplicas: number;
-  modelSize: ModelServingSize;
-  externalRoute: boolean;
-  tokenAuth: boolean;
-  tokens: ServingRuntimeToken[];
   imageName?: string;
   supportedModelFormatsInfo?: SupportedModelFormatsInfo;
 };
@@ -64,19 +59,22 @@ export type ModelServingSize = {
   resources: ContainerResources;
 };
 
-export type CreatingInferenceServiceObject = {
-  name: string;
+export type CreatingInferenceServiceObject = CreatingModelServingObjectCommon & {
   project: string;
   servingRuntimeName: string;
   storage: InferenceServiceStorage;
-  modelSize: ModelServingSize;
   format: InferenceServiceFormat;
   maxReplicas: number;
   minReplicas: number;
+  labels?: Record<string, string>;
+};
+
+export type CreatingModelServingObjectCommon = {
+  name: string;
+  modelSize: ModelServingSize;
   externalRoute: boolean;
   tokenAuth: boolean;
   tokens: ServingRuntimeToken[];
-  labels?: Record<string, string>;
 };
 
 export enum InferenceServiceStorageType {
diff --git a/frontend/src/pages/projects/screens/detail/storage/ManageStorageModal.tsx b/frontend/src/pages/projects/screens/detail/storage/ManageStorageModal.tsx
index cb5d4ccd67..807fb54607 100644
--- a/frontend/src/pages/projects/screens/detail/storage/ManageStorageModal.tsx
+++ b/frontend/src/pages/projects/screens/detail/storage/ManageStorageModal.tsx
@@ -174,7 +174,7 @@ const ManageStorageModal: React.FC<AddStorageModalProps> = ({ existingData, isOp
           <StackItem>
             <CreateNewStorageSection
               data={createData}
-              setData={(key, value) => setCreateData(key, value)}
+              setData={setCreateData}
               currentSize={existingData?.status?.capacity?.storage}
               autoFocusName
               disableStorageClassSelect={!!existingData}
diff --git a/frontend/src/pages/projects/screens/spawner/storage/CreateNewStorageSection.tsx b/frontend/src/pages/projects/screens/spawner/storage/CreateNewStorageSection.tsx
index 57117d87ad..ca59d342be 100644
--- a/frontend/src/pages/projects/screens/spawner/storage/CreateNewStorageSection.tsx
+++ b/frontend/src/pages/projects/screens/spawner/storage/CreateNewStorageSection.tsx
@@ -6,23 +6,23 @@ import NameDescriptionField from '~/concepts/k8s/NameDescriptionField';
 import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 import StorageClassSelect from './StorageClassSelect';
 
-type CreateNewStorageSectionProps = {
-  data: CreatingStorageObject;
-  setData: UpdateObjectAtPropAndValue<CreatingStorageObject>;
+type CreateNewStorageSectionProps<D extends CreatingStorageObject> = {
+  data: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   currentSize?: string;
   autoFocusName?: boolean;
   menuAppendTo?: HTMLElement;
   disableStorageClassSelect?: boolean;
 };
 
-const CreateNewStorageSection: React.FC<CreateNewStorageSectionProps> = ({
+const CreateNewStorageSection = <D extends CreatingStorageObject>({
   data,
   setData,
   currentSize,
   menuAppendTo,
   autoFocusName,
   disableStorageClassSelect,
-}) => {
+}: CreateNewStorageSectionProps<D>): React.ReactNode => {
   const isStorageClassesAvailable = useIsAreaAvailable(SupportedArea.STORAGE_CLASSES).status;
 
   return (
diff --git a/frontend/src/pages/projects/types.ts b/frontend/src/pages/projects/types.ts
index 1c892902fa..b882168ca7 100644
--- a/frontend/src/pages/projects/types.ts
+++ b/frontend/src/pages/projects/types.ts
@@ -9,14 +9,16 @@ import {
   Volume,
   VolumeMount,
 } from '~/types';
-import { ValueOf } from '~/typeHelpers';
 import { AWSSecretKind } from '~/k8sTypes';
 import { AcceleratorProfileState } from '~/utilities/useAcceleratorProfileState';
 import { AcceleratorProfileSelectFieldState } from '~/pages/notebookController/screens/server/AcceleratorProfileSelectField';
 import { K8sNameDescriptionFieldData } from '~/concepts/k8s/K8sNameDescriptionField/types';
 import { AwsKeys } from './dataConnections/const';
 
-export type UpdateObjectAtPropAndValue<T> = (propKey: keyof T, propValue: ValueOf<T>) => void;
+export type UpdateObjectAtPropAndValue<T> = <K extends keyof T>(
+  propKey: K,
+  propValue: T[K],
+) => void;
 
 export type NameDescType = {
   name: string;
diff --git a/frontend/src/utilities/useGenericObjectState.ts b/frontend/src/utilities/useGenericObjectState.ts
index ae2808256d..b5b985fd83 100644
--- a/frontend/src/utilities/useGenericObjectState.ts
+++ b/frontend/src/utilities/useGenericObjectState.ts
@@ -7,14 +7,14 @@ export type GenericObjectState<T> = [
   resetDefault: () => void,
 ];
 
-const useGenericObjectState = <T>(defaultData: T): GenericObjectState<T> => {
+const useGenericObjectState = <T>(defaultData: T | (() => T)): GenericObjectState<T> => {
   const [value, setValue] = React.useState<T>(defaultData);
 
   const setPropValue = React.useCallback<UpdateObjectAtPropAndValue<T>>((propKey, propValue) => {
     setValue((oldValue) => ({ ...oldValue, [propKey]: propValue }));
   }, []);
 
-  const defaultDataRef = React.useRef(defaultData);
+  const defaultDataRef = React.useRef(value);
   const resetToDefault = React.useCallback(() => {
     setValue(defaultDataRef.current);
   }, []);