diff --git a/locales/en/common.json b/locales/en/common.json
index 1e82835fe..5b601005f 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -20,6 +20,7 @@
   "DESCRIPTION": "Description",
   "DEVELOPMENT": "DEVELOPMENT",
   "DOWNLOAD": "Download",
+  "EDIT": "Edit",
   "FILTER_NAME": "Name",
   "HELP": "Help",
   "HOUR": "Hour",
@@ -54,7 +55,6 @@
   "SUBMITTING": "Submitting",
   "SUGGESTED": "Suggested",
   "TEMPLATE": "Template",
-  "TEMPLATE_HELPER_TEXT_INVALID": "Template must be selected",
   "TIME": "Time",
   "UPLOAD": "Upload",
   "USER_SUBMITTED": "User-submitted",
diff --git a/locales/en/public.json b/locales/en/public.json
index 60ca3974e..cb3cc5db8 100644
--- a/locales/en/public.json
+++ b/locales/en/public.json
@@ -72,8 +72,12 @@
     }
   },
   "AutomatedAnalysisConfigForm": {
-    "ERROR_TITLE": "Error displaying recording configuration settings",
+    "CURRENT_CONFIG": "Current Configuration",
     "FORM_TITLE": "Profiling Recording Configuration",
+    "FORMATTED_TEMPLATE": "Name: {{template.name}}, Type: {{template.type}}",
+    "MAXIMUM_AGE": "Maximum age ({{unit}})",
+    "MAXIMUM_SIZE": "Maximum size ({{unit}})",
+    "SAVE_CHANGES": "Save changes",
     "TEMPLATE_HELPER_TEXT": "The Event Template to be applied to Automated Analysis recordings.",
     "TEMPLATE_INVALID_WARNING": "WARNING: Setting a Target Template as a default template type configuration may not apply to all Target JVMs if the JVMs do not support them."
   },
@@ -230,6 +234,9 @@
     "ERROR_MESSAGE": "Reason: {{message}}",
     "RESOLVE_MESSAGE": "Reload the page and try again. If the error still persists, see the list of <issue>{{knownIssue}}</issue> or <report>{{fileReport}}</report>."
   },
+  "ErrorView": {
+    "EVENT_TEMPLATES": "Error retrieving event templates"
+  },
   "JvmDetailsCard": {
     "CARD_DESCRIPTION": "Display details about the selected target JVM.",
     "CARD_DESCRIPTION_FULL": "View information such as the connection URL, labels, and annotations belonging to the selected target JVM.",
diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx
index c1b4f4ab3..09aa582e0 100644
--- a/src/app/AppLayout/AppLayout.tsx
+++ b/src/app/AppLayout/AppLayout.tsx
@@ -619,7 +619,12 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
         >
           {children}
         </Page>
-        <AuthModal visible={showAuthModal} onDismiss={dismissAuthModal} onSave={authModalOnSave} />
+        <AuthModal
+          visible={showAuthModal}
+          onDismiss={dismissAuthModal}
+          onSave={authModalOnSave}
+          targetObs={serviceContext.target.target()}
+        />
         <SslErrorModal visible={showSslErrorModal} onDismiss={dismissSslErrorModal} />
       </CryostatJoyride>
     </GlobalQuickStartDrawer>
diff --git a/src/app/AppLayout/AuthModal.tsx b/src/app/AppLayout/AuthModal.tsx
index 1230ea954..856c9379d 100644
--- a/src/app/AppLayout/AuthModal.tsx
+++ b/src/app/AppLayout/AuthModal.tsx
@@ -36,21 +36,22 @@
  * SOFTWARE.
  */
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { NO_TARGET } from '@app/Shared/Services/Target.service';
+import { NO_TARGET, Target } from '@app/Shared/Services/Target.service';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { Modal, ModalVariant, Text } from '@patternfly/react-core';
 import * as React from 'react';
 import { Link } from 'react-router-dom';
-import { filter, first, map, mergeMap } from 'rxjs';
+import { Observable, filter, first, map, mergeMap } from 'rxjs';
 import { CredentialAuthForm } from './CredentialAuthForm';
 
 export interface AuthModalProps {
   visible: boolean;
   onDismiss: () => void;
   onSave: () => void;
+  targetObs: Observable<Target>;
 }
 
-export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onPropsSave, ...props }) => {
+export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onPropsSave, targetObs, ...props }) => {
   const context = React.useContext(ServiceContext);
   const [loading, setLoading] = React.useState(false);
   const addSubscription = useSubscriptions();
@@ -59,8 +60,7 @@ export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onProps
     (username: string, password: string) => {
       setLoading(true);
       addSubscription(
-        context.target
-          .target()
+        targetObs
           .pipe(
             filter((target) => target !== NO_TARGET),
             first(),
@@ -75,7 +75,7 @@ export const AuthModal: React.FC<AuthModalProps> = ({ onDismiss, onSave: onProps
           })
       );
     },
-    [addSubscription, context.authCredentials, context.target, setLoading, onPropsSave]
+    [addSubscription, context.authCredentials, targetObs, setLoading, onPropsSave]
   );
 
   return (
diff --git a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.tsx b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.tsx
index 916d2cfca..f1c9e6d41 100644
--- a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.tsx
+++ b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.tsx
@@ -35,152 +35,156 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+import { AuthModal } from '@app/AppLayout/AuthModal';
 import { EventTemplate } from '@app/CreateRecording/CreateRecording';
 import { authFailMessage, ErrorView, isAuthFail } from '@app/ErrorView/ErrorView';
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { SelectTemplateSelectorForm } from '@app/Shared/SelectTemplateSelectorForm';
 import {
   AutomatedAnalysisRecordingConfig,
   automatedAnalysisRecordingName,
+  isHttpError,
   TemplateType,
 } from '@app/Shared/Services/Api.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { NO_TARGET, Target } from '@app/Shared/Services/Target.service';
+import { TargetSelect } from '@app/Shared/TargetSelect';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import {
+  Button,
+  Card,
+  CardActions,
+  CardBody,
+  CardHeader,
+  CardTitle,
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
   Form,
   FormGroup,
   FormSection,
   FormSelect,
   FormSelectOption,
+  Grid,
+  GridItem,
   HelperText,
   HelperTextItem,
+  Spinner,
   Split,
   SplitItem,
+  Stack,
+  StackItem,
   Text,
   TextInput,
   TextVariants,
-  ValidatedOptions,
+  Title,
 } from '@patternfly/react-core';
+import { CloseIcon, PencilAltIcon } from '@patternfly/react-icons';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { concatMap, filter, first, Observable, take } from 'rxjs';
+import { first, iif, of, ReplaySubject, take } from 'rxjs';
 
 interface AutomatedAnalysisConfigFormProps {
   useTitle?: boolean;
-  targetObs?: Observable<Target>;
+  inlineForm?: boolean;
+}
+
+interface FormConfig {
+  maxAge: number;
+  maxAgeUnits: number;
+  maxSize: number;
+  maxSizeUnits: number;
+  template: Pick<Partial<EventTemplate>, 'name' | 'type'>;
 }
 
 export const AutomatedAnalysisConfigForm: React.FC<AutomatedAnalysisConfigFormProps> = ({
   useTitle = false,
-  targetObs,
+  inlineForm = false,
 }) => {
   const context = React.useContext(ServiceContext);
   const addSubscription = useSubscriptions();
   const { t } = useTranslation();
 
-  const parseEventString = React.useMemo((): Pick<Partial<EventTemplate>, 'name' | 'type'> => {
-    const eventString = context.settings.automatedAnalysisRecordingConfig().template;
-    if (!eventString) {
-      return {};
-    }
-    const templateName = eventString.split(',')[0].split('=')[1];
-    const templateType = eventString.split(',')[1].split('=')[1];
-    if (!(templateType === 'TARGET' || templateType === 'CUSTOM')) {
-      console.error(`Invalid template type ${templateType}`);
-      return {};
-    }
-    return {
-      name: templateName,
-      type: templateType,
-    };
-  }, [context.settings]);
+  const targetSubjectRef = React.useRef(new ReplaySubject<Target>(1));
+  const targetSubject = targetSubjectRef.current;
 
   const [recordingConfig, setRecordingConfig] = React.useState<AutomatedAnalysisRecordingConfig>(
     context.settings.automatedAnalysisRecordingConfig()
   );
+  const [formConfig, setFormConfig] = React.useState<FormConfig>({
+    maxAge: context.settings.automatedAnalysisRecordingConfig().maxAge,
+    maxAgeUnits: 1,
+    maxSize: context.settings.automatedAnalysisRecordingConfig().maxSize,
+    maxSizeUnits: 1,
+    template: context.settings.automatedAnalysisRecordingConfig().template,
+  });
 
   const [templates, setTemplates] = React.useState<EventTemplate[]>([]);
-  const [template, setTemplate] = React.useState<Pick<Partial<EventTemplate>, 'name' | 'type'>>(parseEventString);
-  const [maxAge, setMaxAge] = React.useState(recordingConfig.maxAge);
-  const [maxAgeUnits, setMaxAgeUnits] = React.useState(1);
-  const [maxSize, setMaxSize] = React.useState(recordingConfig.maxSize);
-  const [maxSizeUnits, setMaxSizeUnits] = React.useState(1);
   const [errorMessage, setErrorMessage] = React.useState('');
-  const [isLoading, setIsLoading] = React.useState(true);
-
-  const refreshTemplates = React.useCallback(() => {
-    setIsLoading(true);
-    addSubscription(
-      (targetObs ? targetObs : context.target.target())
-        .pipe(
-          filter((target) => target !== NO_TARGET),
-          take(1), // first() will throw EmptyError
-          concatMap((target) =>
-            context.api
-              .doGet<EventTemplate[]>(`targets/${encodeURIComponent(target.connectUrl)}/templates`)
-              .pipe(first())
-          )
-        )
-        .subscribe({
-          next: (templates) => {
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [editing, setEditing] = React.useState(false);
+  const [isAuthModalOpen, setIsAuthModalOpen] = React.useState(false);
+  const refreshTemplates = React.useCallback(
+    (target: Target) => {
+      setIsLoading(true);
+      addSubscription(
+        iif(
+          () => {
+            return target === NO_TARGET;
+          },
+          of([]),
+          context.api
+            .doGet<EventTemplate[]>(
+              `targets/${encodeURIComponent(target.connectUrl)}/templates`,
+              'v1',
+              undefined,
+              undefined,
+              true
+            )
+            .pipe(first())
+        ).subscribe({
+          next: (templates: EventTemplate[]) => {
             setErrorMessage('');
             setTemplates(templates);
-            setTemplate((old) => {
-              const matched = templates.find((t) => t.name === old.name && t.type === t.type);
-              return matched ? { name: matched.name, type: matched.type } : {};
+            setFormConfig((old) => {
+              const oldTemplate = old.template;
+              const matched = templates.find((t) => t.name === oldTemplate.name && t.type === t.type);
+              return {
+                ...old,
+                template: matched ? { name: matched.name, type: matched.type } : {},
+              };
             });
+            setIsLoading(false);
           },
           error: (err) => {
-            setErrorMessage(err.message);
             setTemplates([]);
-            setTemplate({});
+            setIsLoading(false);
+            if (isHttpError(err) && err.httpResponse.status === 427) {
+              setErrorMessage(authFailMessage);
+              setIsAuthModalOpen(true);
+            } else {
+              setErrorMessage(err.message);
+            }
           },
         })
-    );
-  }, [
-    addSubscription,
-    context.target,
-    context.api,
-    setErrorMessage,
-    setTemplates,
-    setTemplate,
-    setIsLoading,
-    targetObs,
-  ]);
-
-  React.useEffect(() => {
-    addSubscription(
-      context.target.authFailure().subscribe(() => {
-        setErrorMessage(authFailMessage);
-        setTemplates([]);
-        setIsLoading(false);
-      })
-    );
-  }, [addSubscription, context.target, setErrorMessage, setTemplates, setIsLoading]);
+      );
+    },
+    [addSubscription, context.api, setErrorMessage, setTemplates, setFormConfig, setIsLoading, setIsAuthModalOpen]
+  );
 
   React.useEffect(() => {
     addSubscription(
-      (targetObs ? targetObs : context.target.target()).subscribe(() => {
-        refreshTemplates();
-        setIsLoading(false);
+      targetSubject.subscribe((target) => {
+        refreshTemplates(target);
       })
     );
-  }, [addSubscription, targetObs, refreshTemplates, setIsLoading, context.target]);
-
-  const getEventString = React.useCallback((templateName: string, templateType: string) => {
-    let str = '';
-    if (templateName) {
-      str += `template=${templateName}`;
-    }
-    if (templateType) {
-      str += `,type=${templateType}`;
-    }
-    return str;
-  }, []);
+  }, [targetSubject, addSubscription, refreshTemplates, setIsLoading, editing]);
 
   const setAAConfig = React.useCallback(
     (config: AutomatedAnalysisRecordingConfig) => {
+      if (!config.template) {
+        return;
+      }
       setRecordingConfig(config);
       context.settings.setAutomatedAnalysisRecordingConfig(config);
     },
@@ -189,183 +193,316 @@ export const AutomatedAnalysisConfigForm: React.FC<AutomatedAnalysisConfigFormPr
 
   const handleMaxAgeChange = React.useCallback(
     (evt) => {
-      setMaxAge(Number(evt));
-      setAAConfig({ ...recordingConfig, maxAge: Number(evt) * maxAgeUnits });
+      setFormConfig((old) => {
+        return {
+          ...old,
+          maxAge: Number(evt),
+        };
+      });
     },
-    [setMaxAge, setAAConfig, recordingConfig, maxAgeUnits]
+    [setFormConfig]
   );
 
   const handleMaxAgeUnitChange = React.useCallback(
     (evt) => {
-      setMaxAgeUnits(Number(evt));
-      setAAConfig({ ...recordingConfig, maxAge: Number(evt) * maxAge });
+      setFormConfig((old) => {
+        return {
+          ...old,
+          maxAgeUnits: Number(evt),
+        };
+      });
     },
-    [setMaxAgeUnits, setAAConfig, recordingConfig, maxAge]
+    [setFormConfig]
   );
 
   const handleMaxSizeChange = React.useCallback(
     (evt) => {
-      setMaxSize(Number(evt));
-      setAAConfig({ ...recordingConfig, maxSize: Number(evt) * maxSizeUnits });
+      setFormConfig((old) => {
+        return {
+          ...old,
+          maxSize: Number(evt),
+        };
+      });
     },
-    [setMaxSize, setAAConfig, recordingConfig, maxSizeUnits]
+    [setFormConfig]
   );
 
   const handleMaxSizeUnitChange = React.useCallback(
     (evt) => {
-      setMaxSizeUnits(Number(evt));
-      setAAConfig({ ...recordingConfig, maxSize: Number(evt) * maxSize });
+      setFormConfig((old) => {
+        return {
+          ...old,
+          maxSizeUnits: Number(evt),
+        };
+      });
     },
-    [setMaxSizeUnits, setAAConfig, recordingConfig, maxSize]
+    [setFormConfig]
   );
 
   const handleTemplateChange = React.useCallback(
     (templateName?: string, templateType?: TemplateType) => {
-      setTemplate({
-        name: templateName,
-        type: templateType,
-      });
-      setAAConfig({
-        ...recordingConfig,
-        template: getEventString(templateName || '', templateType || ''),
+      setFormConfig((old) => {
+        return {
+          ...old,
+          template: {
+            name: templateName,
+            type: templateType,
+          },
+        };
       });
     },
-    [setTemplate, recordingConfig, getEventString, setAAConfig]
+    [setFormConfig]
   );
 
+  const handleSubmit = React.useCallback(() => {
+    const { template, maxSize, maxSizeUnits, maxAge, maxAgeUnits } = formConfig;
+    setAAConfig({
+      template: template as Pick<EventTemplate, 'name' | 'type'>,
+      maxSize: maxSize * maxSizeUnits,
+      maxAge: maxAge * maxAgeUnits,
+    });
+    setEditing(false);
+  }, [setAAConfig, setEditing, formConfig]);
+
   const authRetry = React.useCallback(() => {
-    context.target.setAuthRetry();
-  }, [context.target]);
+    setIsAuthModalOpen(true);
+  }, [setIsAuthModalOpen]);
 
   const selectedSpecifier = React.useMemo(() => {
-    const { name, type } = template;
+    const { name, type } = formConfig.template;
     if (name && type) {
       return `${name},${type}`;
     }
     return '';
-  }, [template]);
+  }, [formConfig.template]);
+
+  const targetSelect = React.useMemo(() => {
+    return editing && <TargetSelect simple onSelect={(target) => targetSubject.next(target)} />;
+  }, [editing, targetSubject]);
+
+  const configData = React.useMemo(() => {
+    if (editing) {
+      return (
+        <Grid hasGutter lg={4} md={12}>
+          <GridItem>
+            <FormGroup
+              label={t(`TEMPLATE`, { ns: 'common' })}
+              isRequired
+              fieldId="recording-template"
+              helperText={
+                <>
+                  <HelperText className={`${automatedAnalysisRecordingName}-config-save-template-warning-helper`}>
+                    <HelperTextItem>{t('AutomatedAnalysisConfigForm.TEMPLATE_HELPER_TEXT')}</HelperTextItem>
+                    {formConfig.template.type == 'TARGET' && errorMessage === '' && (
+                      <HelperTextItem variant="warning">
+                        <Text component={TextVariants.p}>
+                          {t('AutomatedAnalysisConfigForm.TEMPLATE_INVALID_WARNING')}
+                        </Text>
+                      </HelperTextItem>
+                    )}
+                  </HelperText>
+                </>
+              }
+            >
+              {isLoading ? (
+                <Spinner size="md" />
+              ) : errorMessage != '' ? (
+                <ErrorView
+                  title={t('ErrorView.EVENT_TEMPLATES')}
+                  message={errorMessage}
+                  retry={isAuthFail(errorMessage) ? authRetry : undefined}
+                />
+              ) : (
+                <SelectTemplateSelectorForm
+                  templates={templates}
+                  onSelect={handleTemplateChange}
+                  selected={selectedSpecifier}
+                />
+              )}
+            </FormGroup>
+          </GridItem>
+          <GridItem>
+            <FormGroup
+              label={t('MAXIMUM_SIZE', { ns: 'common' })}
+              fieldId="maxSize"
+              helperText={t('MAXIMUM_SIZE_HELPER_TEXT', { ns: 'common' })}
+            >
+              <Split hasGutter={true}>
+                <SplitItem isFilled>
+                  <TextInput
+                    value={formConfig.maxSize}
+                    isRequired
+                    type="number"
+                    id="maxSize"
+                    aria-label={t('AriaLabels.MAXIMUM_SIZE', { ns: 'common' })}
+                    onChange={handleMaxSizeChange}
+                    min="0"
+                  />
+                </SplitItem>
+                <SplitItem>
+                  <FormSelect
+                    value={formConfig.maxSizeUnits}
+                    onChange={handleMaxSizeUnitChange}
+                    aria-label={t('AriaLabels.MAXIMUM_SIZE_UNITS_INPUT', { ns: 'common' })}
+                  >
+                    <FormSelectOption key="1" value="1" label="B" />
+                    <FormSelectOption key="2" value={1024} label="KiB" />
+                    <FormSelectOption key="3" value={1024 * 1024} label="MiB" />
+                  </FormSelect>
+                </SplitItem>
+              </Split>
+            </FormGroup>
+          </GridItem>
+          <GridItem>
+            <FormGroup
+              label={t('MAXIMUM_AGE', { ns: 'common' })}
+              fieldId="maxAge"
+              helperText={t('MAXIMUM_AGE_HELPER_TEXT', { ns: 'common' })}
+            >
+              <Split hasGutter={true}>
+                <SplitItem isFilled>
+                  <TextInput
+                    value={formConfig.maxAge}
+                    isRequired
+                    type="number"
+                    id="maxAgeDuration"
+                    aria-label={t('AriaLabels.MAXIMUM_AGE', { ns: 'common' })}
+                    onChange={handleMaxAgeChange}
+                    min="0"
+                  />
+                </SplitItem>
+                <SplitItem>
+                  <FormSelect
+                    value={formConfig.maxAgeUnits}
+                    onChange={handleMaxAgeUnitChange}
+                    aria-label={t('AriaLabels.MAXIMUM_AGE_UNITS_INPUT', { ns: 'common' })}
+                  >
+                    <FormSelectOption key="1" value="1" label={t('SECOND', { count: 0, ns: 'common' })} />
+                    <FormSelectOption key="2" value={60} label={t('MINUTE', { count: 0, ns: 'common' })} />
+                    <FormSelectOption key="3" value={60 * 60} label={t('HOUR', { count: 0, ns: 'common' })} />
+                  </FormSelect>
+                </SplitItem>
+              </Split>
+            </FormGroup>
+          </GridItem>
+        </Grid>
+      );
+    }
+    return (
+      <DescriptionList isCompact isAutoFit>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{t('TEMPLATE', { ns: 'common' })}</DescriptionListTerm>
+          <DescriptionListDescription>
+            {t('AutomatedAnalysisConfigForm.FORMATTED_TEMPLATE', { template: recordingConfig.template })}
+          </DescriptionListDescription>
+        </DescriptionListGroup>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{t('AutomatedAnalysisConfigForm.MAXIMUM_SIZE', { unit: 'B' })}</DescriptionListTerm>
+          <DescriptionListDescription>{recordingConfig.maxSize}</DescriptionListDescription>
+        </DescriptionListGroup>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{t('AutomatedAnalysisConfigForm.MAXIMUM_AGE', { unit: 's' })}</DescriptionListTerm>
+          <DescriptionListDescription>{recordingConfig.maxAge}</DescriptionListDescription>
+        </DescriptionListGroup>
+      </DescriptionList>
+    );
+  }, [
+    t,
+    isLoading,
+    editing,
+    recordingConfig,
+    formConfig,
+    templates,
+    selectedSpecifier,
+    handleTemplateChange,
+    handleMaxSizeChange,
+    handleMaxSizeUnitChange,
+    handleMaxAgeChange,
+    handleMaxAgeUnitChange,
+    errorMessage,
+    authRetry,
+  ]);
+
+  const toggleEdit = React.useCallback(() => {
+    setEditing((edit) => !edit);
+    setFormConfig({
+      template: recordingConfig.template,
+      maxSize: recordingConfig.maxSize,
+      maxAge: recordingConfig.maxAge,
+      maxSizeUnits: 1,
+      maxAgeUnits: 1,
+    });
+  }, [setEditing, setFormConfig, recordingConfig]);
+
+  const authModal = React.useMemo(() => {
+    return (
+      <AuthModal
+        visible={isAuthModalOpen}
+        onDismiss={() => setIsAuthModalOpen(false)}
+        onSave={() => {
+          setIsAuthModalOpen(false);
+          addSubscription(
+            targetSubject.pipe(take(1)).subscribe((target) => {
+              refreshTemplates(target);
+            })
+          );
+        }}
+        targetObs={targetSubject}
+      />
+    );
+  }, [addSubscription, isAuthModalOpen, setIsAuthModalOpen, refreshTemplates, targetSubject]);
 
   const formContent = React.useMemo(
     () => (
       <>
-        <FormGroup
-          label={t(`TEMPLATE`, { ns: 'common' })}
-          isRequired
-          fieldId="recording-template"
-          validated={!template.name ? ValidatedOptions.error : ValidatedOptions.success}
-          helperText={t('AutomatedAnalysisConfigForm.TEMPLATE_HELPER_TEXT')}
-          helperTextInvalid={t('TEMPLATE_HELPER_TEXT_INVALID', { ns: 'common' })}
-        >
-          <SelectTemplateSelectorForm
-            templates={templates}
-            validated={!template.name ? ValidatedOptions.error : ValidatedOptions.success}
-            onSelect={handleTemplateChange}
-            selected={selectedSpecifier}
-          />
-        </FormGroup>
-        <FormGroup
-          label={t('MAXIMUM_SIZE', { ns: 'common' })}
-          fieldId="maxSize"
-          helperText={t('MAXIMUM_SIZE_HELPER_TEXT', { ns: 'common' })}
-        >
-          <Split hasGutter={true}>
-            <SplitItem isFilled>
-              <TextInput
-                value={maxSize}
-                isRequired
-                type="number"
-                id="maxSize"
-                aria-label={t('AriaLabels.MAXIMUM_SIZE', { ns: 'common' })}
-                onChange={handleMaxSizeChange}
-                min="0"
-              />
-            </SplitItem>
-            <SplitItem>
-              <FormSelect
-                value={maxSizeUnits}
-                onChange={handleMaxSizeUnitChange}
-                aria-label={t('AriaLabels.MAXIMUM_SIZE_UNITS_INPUT', { ns: 'common' })}
+        <Card isFlat style={{ marginTop: '1em' }}>
+          <CardHeader>
+            <CardTitle>
+              <Title headingLevel="h3" size="md">
+                {t('AutomatedAnalysisConfigForm.CURRENT_CONFIG')}
+              </Title>
+            </CardTitle>
+            <CardActions>
+              {editing && (
+                <Button
+                  onClick={handleSubmit}
+                  variant={'primary'}
+                  isDisabled={!formConfig.template.name || !formConfig.template.type}
+                >
+                  {t('AutomatedAnalysisConfigForm.SAVE_CHANGES')}
+                </Button>
+              )}
+              <Button
+                variant="plain"
+                onClick={toggleEdit}
+                aria-label={editing ? t('CANCEL', { ns: 'common' }) : t('EDIT', { ns: 'common' })}
               >
-                <FormSelectOption key="1" value="1" label="B" />
-                <FormSelectOption key="2" value={1024} label="KiB" />
-                <FormSelectOption key="3" value={1024 * 1024} label="MiB" />
-              </FormSelect>
-            </SplitItem>
-          </Split>
-        </FormGroup>
-        <FormGroup
-          label={t('MAXIMUM_AGE', { ns: 'common' })}
-          fieldId="maxAge"
-          helperText={t('MAXIMUM_AGE_HELPER_TEXT', { ns: 'common' })}
-        >
-          <Split hasGutter={true}>
-            <SplitItem isFilled>
-              <TextInput
-                value={maxAge}
-                isRequired
-                type="number"
-                id="maxAgeDuration"
-                aria-label={t('AriaLabels.MAXIMUM_AGE', { ns: 'common' })}
-                onChange={handleMaxAgeChange}
-                min="0"
-              />
-            </SplitItem>
-            <SplitItem>
-              <FormSelect
-                value={maxAgeUnits}
-                onChange={handleMaxAgeUnitChange}
-                aria-label={t('AriaLabels.MAXIMUM_AGE_UNITS_INPUT', { ns: 'common' })}
-              >
-                <FormSelectOption key="1" value="1" label={t('SECOND', { count: 0, ns: 'common' })} />
-                <FormSelectOption key="2" value={60} label={t('MINUTE', { count: 0, ns: 'common' })} />
-                <FormSelectOption key="3" value={60 * 60} label={t('HOUR', { count: 0, ns: 'common' })} />
-              </FormSelect>
-            </SplitItem>
-          </Split>
-        </FormGroup>
-        {template.type == 'TARGET' && (
-          <HelperText className={`${automatedAnalysisRecordingName}-config-save-template-warning-helper`}>
-            <HelperTextItem variant="warning">
-              <Text component={TextVariants.p}>{t('AutomatedAnalysisConfigForm.TEMPLATE_INVALID_WARNING')}</Text>
-            </HelperTextItem>
-          </HelperText>
-        )}
+                {editing ? <CloseIcon /> : <PencilAltIcon />}
+              </Button>
+            </CardActions>
+          </CardHeader>
+          <CardBody>
+            <Stack hasGutter>
+              <StackItem>{targetSelect}</StackItem>
+              <StackItem>{configData}</StackItem>
+            </Stack>
+          </CardBody>
+        </Card>
+        {authModal}
       </>
     ),
-    [
-      t,
-      template,
-      templates,
-      selectedSpecifier,
-      maxSize,
-      maxSizeUnits,
-      maxAge,
-      maxAgeUnits,
-      handleMaxSizeChange,
-      handleMaxAgeChange,
-      handleMaxSizeUnitChange,
-      handleMaxAgeUnitChange,
-      handleTemplateChange,
-    ]
+    [t, handleSubmit, toggleEdit, formConfig.template, targetSelect, configData, editing, authModal]
   );
 
-  if (errorMessage != '') {
-    return (
-      <ErrorView
-        title={t('AutomatedAnalysisConfigForm.ERROR_TITLE')}
-        message={errorMessage}
-        retry={isAuthFail(errorMessage) ? authRetry : undefined}
-      />
-    );
-  }
-  if (isLoading) {
-    return <LoadingView />;
-  }
-  return useTitle ? (
-    <Form>
-      <FormSection title={t('AutomatedAnalysisConfigForm.FORM_TITLE')}>{formContent}</FormSection>
-    </Form>
-  ) : (
-    formContent
+  const formSection = React.useMemo(
+    () =>
+      useTitle ? (
+        <FormSection title={t('AutomatedAnalysisConfigForm.FORM_TITLE')}>{formContent}</FormSection>
+      ) : (
+        formContent
+      ),
+    [useTitle, t, formContent]
   );
+
+  return inlineForm ? formSection : <Form>{formSection}</Form>;
 };
diff --git a/src/app/Settings/AutomatedAnalysisConfig.tsx b/src/app/Settings/AutomatedAnalysisConfig.tsx
index e3013cb20..827d96f35 100644
--- a/src/app/Settings/AutomatedAnalysisConfig.tsx
+++ b/src/app/Settings/AutomatedAnalysisConfig.tsx
@@ -37,25 +37,11 @@
  */
 
 import { AutomatedAnalysisConfigForm } from '@app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm';
-import { NO_TARGET } from '@app/Shared/Services/Target.service';
-import { TargetSelect } from '@app/Shared/TargetSelect';
-import { Stack, StackItem } from '@patternfly/react-core';
 import * as React from 'react';
-import { of } from 'rxjs';
 import { SettingTab, UserSetting } from './SettingsUtils';
 
 const Component = () => {
-  const [target, setTarget] = React.useState(NO_TARGET);
-  const _targetAsObs = React.useMemo(() => of(target), [target]);
-
-  return (
-    <Stack hasGutter>
-      <StackItem>
-        <TargetSelect simple onSelect={setTarget} />
-      </StackItem>
-      <AutomatedAnalysisConfigForm targetObs={_targetAsObs} />
-    </Stack>
-  );
+  return <AutomatedAnalysisConfigForm inlineForm />;
 };
 
 export const AutomatedAnalysisConfig: UserSetting = {
diff --git a/src/app/Shared/Services/Api.service.tsx b/src/app/Shared/Services/Api.service.tsx
index 369c1f2ca..eb2606515 100644
--- a/src/app/Shared/Services/Api.service.tsx
+++ b/src/app/Shared/Services/Api.service.tsx
@@ -1823,13 +1823,16 @@ export interface ActiveRecordingFilterInput {
 export const automatedAnalysisRecordingName = 'automated-analysis';
 
 export interface AutomatedAnalysisRecordingConfig {
-  template: string;
+  template: Pick<EventTemplate, 'name' | 'type'>;
   maxSize: number;
   maxAge: number;
 }
 
 export const defaultAutomatedAnalysisRecordingConfig: AutomatedAnalysisRecordingConfig = {
-  template: 'template=Continuous,type=TARGET',
+  template: {
+    name: 'Continuous',
+    type: 'TARGET',
+  },
   maxSize: 1048576,
   maxAge: 0,
 };
diff --git a/src/app/Shared/Services/Settings.service.tsx b/src/app/Shared/Services/Settings.service.tsx
index 89c52f93c..f3d7e0792 100644
--- a/src/app/Shared/Services/Settings.service.tsx
+++ b/src/app/Shared/Services/Settings.service.tsx
@@ -62,7 +62,7 @@ export const automatedAnalysisConfigToRecordingAttributes = (
 ): RecordingAttributes => {
   return {
     name: automatedAnalysisRecordingName,
-    events: config.template,
+    events: `template=${config.template.name},type=${config.template.type}`,
     duration: undefined,
     archiveOnStop: false,
     options: {
diff --git a/src/app/Shared/TargetSelect.tsx b/src/app/Shared/TargetSelect.tsx
index b33742910..5f074b1b0 100644
--- a/src/app/Shared/TargetSelect.tsx
+++ b/src/app/Shared/TargetSelect.tsx
@@ -48,7 +48,6 @@ import {
   CardExpandableContent,
   CardHeader,
   CardTitle,
-  Divider,
   Select,
   SelectGroup,
   SelectOption,
@@ -129,10 +128,7 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = ({ onSel
   }, [handleSelect, targets, selected, firstLoadRef]);
 
   const selectOptions = React.useMemo(() => {
-    let options = [
-      <SelectOption key="placeholder" value="Select target..." isPlaceholder={true} itemCount={targets.length} />,
-      <Divider key={'placeholder-divider'} />,
-    ];
+    let options = [] as JSX.Element[];
 
     const groupNames = new Set<string>();
     targets.forEach((t) => groupNames.add(t.annotations?.cryostat['REALM'] || 'Others'));
@@ -192,7 +188,7 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = ({ onSel
   );
 
   return (
-    <Card {...props} isRounded isCompact isExpanded={isExpanded}>
+    <Card {...props} isRounded isCompact isFlat isExpanded={isExpanded}>
       <CardHeader {...cardHeaderProps}>
         <CardTitle>Target JVM</CardTitle>
       </CardHeader>
@@ -202,6 +198,7 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = ({ onSel
         <>
           <CardBody>
             <Select
+              placeholderText="Select a target"
               toggleIcon={<ContainerNodeIcon />}
               variant={SelectVariant.single}
               hasInlineFilter
diff --git a/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.test.tsx b/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.test.tsx
index 3bbd90bb5..12d1a1ae8 100644
--- a/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.test.tsx
+++ b/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.test.tsx
@@ -36,11 +36,15 @@
  * SOFTWARE.
  */
 import { AutomatedAnalysisCard } from '@app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard';
+import { LayoutTemplate, LayoutTemplateRecord } from '@app/Dashboard/dashboard-utils';
+import { DashboardConfigState } from '@app/Shared/Redux/Configurations/DashboardConfigSlice';
+import { TopologyConfig } from '@app/Shared/Redux/Configurations/TopologyConfigSlice';
 import {
   emptyActiveRecordingFilters,
   emptyArchivedRecordingFilters,
   TargetRecordingFilters,
 } from '@app/Shared/Redux/Filters/RecordingFilterSlice';
+import { TopologyFilters } from '@app/Shared/Redux/Filters/TopologyFilterSlice';
 import { RootState } from '@app/Shared/Redux/ReduxStore';
 import {
   ArchivedRecording,
@@ -190,11 +194,14 @@ describe('<AutomatedAnalysisCard />', () => {
           {
             name: 'Default',
             cards: [],
+            favorite: false,
           },
         ],
         current: 0,
         _version: '0',
-      },
+        customTemplates: [] as LayoutTemplate[],
+        templateHistory: [] as LayoutTemplateRecord[],
+      } as DashboardConfigState,
       recordingFilters: {
         list: [
           {
@@ -220,6 +227,8 @@ describe('<AutomatedAnalysisCard />', () => {
           },
         },
       },
+      topologyConfigs: {} as TopologyConfig,
+      topologyFilters: {} as TopologyFilters,
     };
   });
 
diff --git a/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.test.tsx b/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.test.tsx
index a6f0059c3..a57de3862 100644
--- a/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.test.tsx
+++ b/src/test/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.test.tsx
@@ -42,7 +42,7 @@ import '@testing-library/jest-dom';
 import { cleanup, screen } from '@testing-library/react';
 import * as React from 'react';
 import { of } from 'rxjs';
-import { renderWithServiceContext } from '../../Common';
+import { renderWithServiceContext, testT } from '../../Common';
 
 const mockTarget = { connectUrl: 'service:jmx:rmi://someUrl', alias: 'fooTarget' };
 
@@ -61,30 +61,57 @@ const mockTemplate2: EventTemplate = {
 };
 
 const mockAutomatedAnalysisRecordingConfig: AutomatedAnalysisRecordingConfig = {
-  template: 'template=template1,type=TARGET',
+  template: {
+    name: 'template1',
+    type: 'TARGET',
+  },
   maxSize: 1048576,
   maxAge: 0,
 };
 
-jest.spyOn(defaultServices.api, 'createRecording').mockReturnValue(of());
+jest.mock('@app/Shared/Services/Target.service', () => ({
+  ...jest.requireActual('@app/Shared/Services/Target.service'), // Require actual implementation of utility functions for Target
+}));
+
+jest.mock('@app/utils/LocalStorage', () => {
+  return {
+    getFromLocalStorage: jest.fn((_key: string, _defaultValue: unknown): unknown => {
+      return 'service:jmx:rmi://someUrl';
+    }),
+  };
+});
+
 jest.spyOn(defaultServices.api, 'doGet').mockReturnValue(of([mockTemplate1, mockTemplate2]));
 
 jest
   .spyOn(defaultServices.settings, 'automatedAnalysisRecordingConfig')
   .mockReturnValue(mockAutomatedAnalysisRecordingConfig);
 
-jest.spyOn(defaultServices.target, 'target').mockReturnValue(of(mockTarget));
-jest.spyOn(defaultServices.target, 'authFailure').mockReturnValue(of());
-jest.spyOn(defaultServices.target, 'authRetry').mockReturnValue(of());
+jest.spyOn(defaultServices.targets, 'targets').mockReturnValue(of([mockTarget]));
 
 describe('<AutomatedAnalysisConfigForm />', () => {
   afterEach(cleanup);
 
   it('renders default view correctly', async () => {
-    renderWithServiceContext(<AutomatedAnalysisConfigForm useTitle />);
+    renderWithServiceContext(<AutomatedAnalysisConfigForm />);
+
+    expect(screen.getByText(/Current Configuration/i)).toBeInTheDocument();
+    expect(screen.getByText('Template')).toBeInTheDocument();
+    expect(screen.getByText(/maximum size \(b\)/i)).toBeInTheDocument();
+    expect(screen.getByText(/maximum age \(s\)/i)).toBeInTheDocument();
+  });
+
+  it('renders editing drawer view correctly', async () => {
+    const { user } = renderWithServiceContext(<AutomatedAnalysisConfigForm useTitle />);
 
     expect(screen.getByText(/profiling recording configuration/i)).toBeInTheDocument(); // Form title
 
+    await user.click(
+      screen.getByRole('button', {
+        name: /edit/i,
+      })
+    ); // Edit button
+
     const templateSelect = screen.getByLabelText('Template *'); // Template select
     expect(templateSelect).toBeInTheDocument();
     expect(templateSelect).toBeVisible();
@@ -95,11 +122,13 @@ describe('<AutomatedAnalysisConfigForm />', () => {
     expect(screen.getByText(/the maximum age of recording data stored to disk./i)).toBeInTheDocument();
   });
 
-  it('renders settings view correctly', async () => {
-    renderWithServiceContext(<AutomatedAnalysisConfigForm targetObs={of(mockTarget)} />);
+  it('renders editing settings view correctly', async () => {
+    const { user } = renderWithServiceContext(<AutomatedAnalysisConfigForm inlineForm />);
 
     expect(screen.queryByText(/profiling recording configuration/i)).not.toBeInTheDocument(); // Form title
 
+    await user.click(screen.getByLabelText('Edit')); // Edit button
+
     const templateSelect = screen.getByLabelText('Template *'); // Template select
     expect(templateSelect).toBeInTheDocument();
     expect(templateSelect).toBeVisible();
@@ -114,6 +143,12 @@ describe('<AutomatedAnalysisConfigForm />', () => {
     const setConfigRequestSpy = jest.spyOn(defaultServices.settings, 'setAutomatedAnalysisRecordingConfig');
     const { user } = renderWithServiceContext(<AutomatedAnalysisConfigForm />);
 
+    await user.click(
+      screen.getByRole('button', {
+        name: /edit/i,
+      })
+    );
+
     const templateSelect = screen.getByRole('combobox', {
       name: /event template input/i,
     });
@@ -131,26 +166,25 @@ describe('<AutomatedAnalysisConfigForm />', () => {
     expect(maxSizeInput).toHaveValue(mockAutomatedAnalysisRecordingConfig.maxSize);
 
     await user.selectOptions(templateSelect, ['template2']);
-    expect(setConfigRequestSpy).toHaveBeenCalledTimes(1);
-
     await user.clear(maxSizeInput);
-    expect(setConfigRequestSpy).toHaveBeenCalledTimes(2);
-
     await user.clear(maxAgeInput);
-    expect(setConfigRequestSpy).toHaveBeenCalledTimes(3);
-
     await user.type(maxSizeInput, '100');
-    expect(setConfigRequestSpy).toHaveBeenCalledTimes(6);
-
     await user.type(maxAgeInput, '100');
-    expect(setConfigRequestSpy).toHaveBeenCalledTimes(9); // settings are saved on every change
 
     const config = {
-      template: `template=${mockTemplate2.name},type=${mockTemplate2.type}`,
+      template: {
+        name: mockTemplate2.name,
+        type: mockTemplate2.type,
+      },
       maxSize: 100,
       maxAge: 100,
     };
 
-    expect(setConfigRequestSpy).toHaveBeenLastCalledWith(config);
+    await user.click(
+      screen.getByRole('button', {
+        name: testT('AutomatedAnalysisConfigForm.SAVE_CHANGES'),
+      })
+    );
+    expect(setConfigRequestSpy).toHaveBeenCalledWith(config);
   });
 });
diff --git a/src/test/Settings/__snapshots__/AutomatedAnalysisConfig.test.tsx.snap b/src/test/Settings/__snapshots__/AutomatedAnalysisConfig.test.tsx.snap
index f08a0ee4b..f81b10788 100644
--- a/src/test/Settings/__snapshots__/AutomatedAnalysisConfig.test.tsx.snap
+++ b/src/test/Settings/__snapshots__/AutomatedAnalysisConfig.test.tsx.snap
@@ -1,14 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<AutomatedAnalysisConfig/> renders correctly 1`] = `
-<div
-  className="pf-l-stack pf-m-gutter"
->
-  <div
-    className="pf-l-stack__item"
-  >
-    Target Select
-  </div>
-  Automated Analysis Configuration Form
-</div>
-`;
+exports[`<AutomatedAnalysisConfig/> renders correctly 1`] = `"Automated Analysis Configuration Form"`;
diff --git a/src/test/TargetSelect/TargetSelect.test.tsx b/src/test/Shared/TargetSelect.test.tsx
similarity index 88%
rename from src/test/TargetSelect/TargetSelect.test.tsx
rename to src/test/Shared/TargetSelect.test.tsx
index c344c10d2..fc934155c 100644
--- a/src/test/TargetSelect/TargetSelect.test.tsx
+++ b/src/test/Shared/TargetSelect.test.tsx
@@ -40,7 +40,6 @@ import { Target } from '@app/Shared/Services/Target.service';
 import { TargetSelect } from '@app/Shared/TargetSelect';
 import '@testing-library/jest-dom';
 import { cleanup, screen } from '@testing-library/react';
-import { createMemoryHistory } from 'history';
 import * as React from 'react';
 import { of } from 'rxjs';
 import { renderWithServiceContext } from '../Common';
@@ -64,24 +63,10 @@ const mockFooTarget: Target = {
 };
 const mockBarTarget: Target = { ...mockFooTarget, jvmId: 'efgh', connectUrl: mockBarConnectUrl, alias: 'barTarget' };
 
-const history = createMemoryHistory();
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useRouteMatch: () => ({ url: history.location.pathname }),
-  useHistory: () => history,
-}));
-
 jest.mock('@app/Shared/Services/Target.service', () => ({
   ...jest.requireActual('@app/Shared/Services/Target.service'), // Require actual implementation of utility functions for Target
 }));
 
-jest
-  .spyOn(defaultServices.target, 'target')
-  .mockReturnValueOnce(of()) // contains the correct information
-  .mockReturnValueOnce(of()) // renders empty state when expanded
-  .mockReturnValue(of(mockFooTarget)); // other tests
-
 jest
   .spyOn(defaultServices.targets, 'targets')
   .mockReturnValueOnce(of([mockFooTarget])) // contains the correct information
@@ -99,13 +84,13 @@ describe('<TargetSelect />', () => {
     renderWithServiceContext(<TargetSelect />);
 
     expect(screen.getByText('Target JVM')).toBeInTheDocument();
-    expect(screen.getByText(`Select target...`)).toBeInTheDocument();
+    expect(screen.getByText(`Select a target`)).toBeInTheDocument();
   });
 
   it('renders empty state when expanded', async () => {
     const { container, user } = renderWithServiceContext(<TargetSelect />);
 
-    expect(screen.getByText('Select target...')).toBeInTheDocument();
+    expect(screen.getByText('Select a target')).toBeInTheDocument();
 
     const expandButton = screen.getByLabelText('Details');
     await user.click(expandButton);
@@ -123,7 +108,7 @@ describe('<TargetSelect />', () => {
     const { container, user } = renderWithServiceContext(<TargetSelect />);
 
     // Select a target first
-    await user.click(screen.getByText('Select target...'));
+    await user.click(screen.getByLabelText('Options menu'));
     await user.click(screen.getByText('fooTarget (service:jmx:rmi://someFooUrl)'));
 
     const expandButton = screen.getByLabelText('Details');
@@ -147,7 +132,6 @@ describe('<TargetSelect />', () => {
       CUSTOM_TARGET_REALM,
       'fooTarget (service:jmx:rmi://someFooUrl)',
       'barTarget (service:jmx:rmi://someBarUrl)',
-      '2', // Number of discoverable targets
     ].forEach((str) => {
       const element = screen.getByText(str);
       expect(element).toBeInTheDocument();