diff --git a/src/coreform/BaseForm.tsx b/src/coreform/BaseForm.tsx
index 77296fc..916b799 100644
--- a/src/coreform/BaseForm.tsx
+++ b/src/coreform/BaseForm.tsx
@@ -122,7 +122,7 @@ const BaseForm = (props: BaseFormProps) => {
         {
           props => (
             <Form>
-              <ManifestForm id={props.values.id} />
+              <ManifestForm manifest={props.values} />
               <Divider />
               <div className={classes.root}>
                 <Tabs orientation="vertical" variant="scrollable" value={currentTab} onChange={handleTabChange}
diff --git a/src/coreform/ManifestForm.tsx b/src/coreform/ManifestForm.tsx
index 82b7124..5ce3ce5 100644
--- a/src/coreform/ManifestForm.tsx
+++ b/src/coreform/ManifestForm.tsx
@@ -3,7 +3,6 @@ import {Box, Grid, makeStyles} from '@material-ui/core';
 import {toMenuItems} from './FormUtil';
 import {FormikTextField} from '../components/common/FormikTextField';
 import * as _m from '../models/Manifest'
-import {useEffect} from "react";
 
 const environments = ["dev", "qa", "perf", "prod"]
 
@@ -24,7 +23,12 @@ const useStyles = makeStyles({
 
 const ManifestForm = (props: any) => {
     const classes = useStyles();
-    const [id] = React.useState(props.id);
+    const id = props.manifest.id;
+    const team = props.manifest.team.name;
+    let teams: string[] = _m.teams;
+    if (!(team in _m.teams) && team != "") {
+        teams = [..._m.teams, team]
+    }
     const disableNameAndEnvironment = id !== undefined;
     return (
         <Box className={classes.box}>
@@ -36,7 +40,7 @@ const ManifestForm = (props: any) => {
                     {toMenuItems(environments)}
                 </FormikTextField>
                 <FormikTextField className={classes.field} select label="Team" name="team.name">
-                    {toMenuItems(_m.teams)}
+                    {toMenuItems(teams)}
                 </FormikTextField>
             </Grid>
         </Box>
diff --git a/src/models/Manifest.ts b/src/models/Manifest.ts
index 6908395..809c8c4 100644
--- a/src/models/Manifest.ts
+++ b/src/models/Manifest.ts
@@ -23,7 +23,7 @@ export const namespaces = {
 }
 
 export const teams = {
-    lending: ['Accounting', 'LoanManagement', 'LoanOrigination', 'Camunda', 'Kafka', 'Infra', 'DataPlatform', 'DataScience'],
+    lending: ['Infra', 'DataPlatform', 'DataScience', 'PLOrigination', 'HLOrigination', 'UnderwritingAndFraudDetection', 'OpsTech','CBP'],
     gi: ['GI'],
 }[window.config.INFRA_VERTICAL]