diff --git a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.jsx b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.jsx
index e0aab2f4e5..0623ad7ab8 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.jsx
@@ -20,8 +20,8 @@ function JobTemplateAdd({ history, i18n }) {
     const {
       labels,
       organizationId,
-      addedInstanceGroups,
-      removedInstanceGroups,
+      instanceGroups,
+      initialInstanceGroups,
       ...remainingValues
     } = values;
 
@@ -32,7 +32,7 @@ function JobTemplateAdd({ history, i18n }) {
       } = await JobTemplatesAPI.create(remainingValues);
       await Promise.all([
         submitLabels(id, labels, organizationId),
-        submitInstanceGroups(id, addedInstanceGroups, removedInstanceGroups),
+        submitInstanceGroups(id, instanceGroups),
       ]);
       history.push(`/templates/${type}/${id}/details`);
     } catch (error) {
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index 0aa128fb55..a0cf904ab2 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -107,8 +107,8 @@ class JobTemplateEdit extends Component {
     const {
       labels,
       organizationId,
-      addedInstanceGroups,
-      removedInstanceGroups,
+      instanceGroups,
+      initialInstanceGroups,
       ...remainingValues
     } = values;
 
@@ -117,7 +117,7 @@ class JobTemplateEdit extends Component {
       await JobTemplatesAPI.update(template.id, remainingValues);
       await Promise.all([
         this.submitLabels(labels, organizationId),
-        this.submitInstanceGroups(addedInstanceGroups, removedInstanceGroups),
+        this.submitInstanceGroups(instanceGroups, initialInstanceGroups),
       ]);
       history.push(this.detailsUrl);
     } catch (formSubmitError) {
@@ -151,12 +151,13 @@ class JobTemplateEdit extends Component {
     return results;
   }
 
-  async submitInstanceGroups(addedGroups, removedGroups) {
+  async submitInstanceGroups(groups, initialGroups) {
     const { template } = this.props;
-    const associatePromises = addedGroups.map(group =>
+    const { added, removed } = getAddedAndRemoved(initialGroups, groups);
+    const associatePromises = added.map(group =>
       JobTemplatesAPI.associateInstanceGroup(template.id, group.id)
     );
-    const disassociatePromises = removedGroups.map(group =>
+    const disassociatePromises = removed.map(group =>
       JobTemplatesAPI.disassociateInstanceGroup(template.id, group.id)
     );
     return Promise.all([...associatePromises, ...disassociatePromises]);
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index a4e5227a2a..87cff2fa7e 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -74,20 +74,16 @@ class JobTemplateForm extends Component {
       contentError: false,
       project: props.template.summary_fields.project,
       inventory: props.template.summary_fields.inventory,
-      relatedInstanceGroups: [],
       allowCallbacks: !!props.template.host_config_key,
     };
     this.handleProjectValidation = this.handleProjectValidation.bind(this);
     this.loadRelatedInstanceGroups = this.loadRelatedInstanceGroups.bind(this);
-    this.handleInstanceGroupsChange = this.handleInstanceGroupsChange.bind(
-      this
-    );
   }
 
   componentDidMount() {
     const { validateField } = this.props;
     this.setState({ contentError: null, hasContentLoading: true });
-    // TODO: determine whene LabelSelect has finished loading labels
+    // TODO: determine when LabelSelect has finished loading labels
     Promise.all([this.loadRelatedInstanceGroups()]).then(() => {
       this.setState({ hasContentLoading: false });
       validateField('project');
@@ -95,16 +91,14 @@ class JobTemplateForm extends Component {
   }
 
   async loadRelatedInstanceGroups() {
-    const { template } = this.props;
+    const { setFieldValue, template } = this.props;
     if (!template.id) {
       return;
     }
     try {
       const { data } = await JobTemplatesAPI.readInstanceGroups(template.id);
-      this.setState({
-        initialInstanceGroups: data.results,
-        relatedInstanceGroups: [...data.results],
-      });
+      setFieldValue('initialInstanceGroups', data.results);
+      setFieldValue('instanceGroups', [...data.results]);
     } catch (err) {
       this.setState({ contentError: err });
     }
@@ -124,37 +118,12 @@ class JobTemplateForm extends Component {
     };
   }
 
-  handleInstanceGroupsChange(relatedInstanceGroups) {
-    const { setFieldValue } = this.props;
-    const { initialInstanceGroups } = this.state;
-    let added = [];
-    const removed = [];
-    if (initialInstanceGroups) {
-      initialInstanceGroups.forEach(group => {
-        if (!relatedInstanceGroups.find(g => g.id === group.id)) {
-          removed.push(group);
-        }
-      });
-      relatedInstanceGroups.forEach(group => {
-        if (!initialInstanceGroups.find(g => g.id === group.id)) {
-          added.push(group);
-        }
-      });
-    } else {
-      added = relatedInstanceGroups;
-    }
-    setFieldValue('addedInstanceGroups', added);
-    setFieldValue('removedInstanceGroups', removed);
-    this.setState({ relatedInstanceGroups });
-  }
-
   render() {
     const {
       contentError,
       hasContentLoading,
       inventory,
       project,
-      relatedInstanceGroups,
       allowCallbacks,
     } = this.state;
     const {
@@ -334,13 +303,13 @@ class JobTemplateForm extends Component {
                   content={i18n._(t`Optional labels that describe this job template,
                     such as 'dev' or 'test'. Labels can be used to group and filter
                     job templates and completed jobs.`)}
-                  />
-                  <LabelSelect
-                    value={field.value}
-                    onChange={labels => setFieldValue('labels', labels)}
-                    onError={err => this.setState({ contentError: err })}
-                  />
-                </FormGroup>
+                />
+                <LabelSelect
+                  value={field.value}
+                  onChange={labels => setFieldValue('labels', labels)}
+                  onError={err => this.setState({ contentError: err })}
+                />
+              </FormGroup>
             )}
           />
         </FormRow>
@@ -440,12 +409,17 @@ class JobTemplateForm extends Component {
               )}
             />
           </FormRow>
-          <InstanceGroupsLookup
-            css="margin-top: 20px"
-            value={relatedInstanceGroups}
-            onChange={this.handleInstanceGroupsChange}
-            tooltip={i18n._(t`Select the Instance Groups for this Organization
-              to run on.`)}
+          <Field
+            name="instanceGroups"
+            render={({ field, form }) => (
+              <InstanceGroupsLookup
+                css="margin-top: 20px"
+                value={field.value}
+                onChange={value => form.setFieldValue(field.name, value)}
+                tooltip={i18n._(t`Select the Instance Groups for this Organization
+                  to run on.`)}
+              />
+            )}
           />
           <Field
             name="job_tags"
@@ -576,10 +550,12 @@ class JobTemplateForm extends Component {
 const FormikApp = withFormik({
   mapPropsToValues(props) {
     const { template = {} } = props;
-    const { summary_fields = {
-      labels: { results: [] },
-      inventory: { organization: null },
-    } } = template;
+    const {
+      summary_fields = {
+        labels: { results: [] },
+        inventory: { organization: null },
+      },
+    } = template;
 
     return {
       name: template.name || '',
@@ -603,8 +579,8 @@ const FormikApp = withFormik({
       use_fact_cache: template.use_fact_cache || false,
       host_config_key: template.host_config_key || '',
       organizationId: summary_fields.inventory.organization_id || null,
-      addedInstanceGroups: [],
-      removedInstanceGroups: [],
+      initialInstanceGroups: [],
+      instanceGroups: [],
     };
   },
   handleSubmit: (values, { props }) => props.handleSubmit(values),