diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index 3e66f825c1..b5bbf95c94 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -29,7 +29,9 @@
     "createTags": "Create tags",
     "cancelAnalysis": "Cancel analysis",
     "delete": "Delete",
-    "discardAssessment": "Discard assessment/review",
+    "discardAssessment": "Discard assessment(s)",
+    "discardReview": "Discard review",
+
     "downloadCsvTemplate": "Download CSV template",
     "download": "Download {{what}}",
     "duplicate": "Duplicate",
@@ -360,6 +362,7 @@
     "reports": "Reports",
     "repositoryType": "Repository type",
     "review": "Review",
+    "reviewedArchetype": "Archetype reviewed",
     "reviews": "Reviews",
     "reviewComments": "Review comments",
     "risk": "Risk",
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 87427ed8ae..96b7d58184 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -17,6 +17,9 @@ import {
   MenuToggle,
   MenuToggleElement,
   Modal,
+  Tooltip,
+  Grid,
+  GridItem,
 } from "@patternfly/react-core";
 import { PencilAltIcon, TagIcon, EllipsisVIcon } from "@patternfly/react-icons";
 import {
@@ -28,6 +31,7 @@ import {
   ActionsColumn,
   Tbody,
 } from "@patternfly/react-table";
+import { QuestionCircleIcon } from "@patternfly/react-icons/dist/esm/icons/question-circle-icon";
 
 // @app components and utilities
 import { AppPlaceholder } from "@app/components/AppPlaceholder";
@@ -184,7 +188,10 @@ export const ApplicationsTable: React.FC = () => {
     Application[]
   >([]);
 
-  const [assessmentOrReviewToDiscard, setAssessmentOrReviewToDiscard] =
+  const [assessmentToDiscard, setAssessmentToDiscard] =
+    React.useState<Application | null>(null);
+
+  const [reviewToDiscard, setReviewToDiscard] =
     React.useState<Application | null>(null);
 
   const {
@@ -257,15 +264,8 @@ export const ApplicationsTable: React.FC = () => {
     onDeleteError
   );
 
-  const discardAssessmentAndReview = async (application: Application) => {
+  const discardAssessment = async (application: Application) => {
     try {
-      if (application.review?.id) {
-        await deleteReview({
-          id: application.review.id,
-          name: application.name,
-        });
-      }
-
       if (application.assessments) {
         await Promise.all(
           application.assessments.map(async (assessment) => {
@@ -277,7 +277,20 @@ export const ApplicationsTable: React.FC = () => {
         );
       }
     } catch (error) {
-      console.error("Error while deleting assessments and/or reviews:", error);
+      console.error("Error while deleting assessments:", error);
+    }
+  };
+
+  const discardReview = async (application: Application) => {
+    try {
+      if (application.review?.id) {
+        await deleteReview({
+          id: application.review.id,
+          name: application.name,
+        });
+      }
+    } catch (error) {
+      console.error("Error while deleting review:", error);
     }
   };
 
@@ -827,13 +840,27 @@ export const ApplicationsTable: React.FC = () => {
                         modifier="truncate"
                         {...getTdProps({ columnKey: "review" })}
                       >
-                        <IconedStatus
-                          preset={
-                            isAppReviewed || hasReviewedArchetype
-                              ? "Completed"
-                              : "NotStarted"
-                          }
-                        />
+                        <Grid>
+                          <GridItem span={10}>
+                            <IconedStatus
+                              preset={
+                                isAppReviewed || hasReviewedArchetype
+                                  ? "Completed"
+                                  : "NotStarted"
+                              }
+                            />
+                          </GridItem>
+                          <GridItem span={2}>
+                            {hasReviewedArchetype ? (
+                              <Tooltip
+                                content={t("terms.reviewedArchetype")}
+                                aria-label="review"
+                              >
+                                <QuestionCircleIcon />
+                              </Tooltip>
+                            ) : null}
+                          </GridItem>
+                        </Grid>
                       </Td>
                       <Td
                         width={10}
@@ -879,14 +906,21 @@ export const ApplicationsTable: React.FC = () => {
                               title: t("actions.review"),
                               onClick: () => reviewSelectedApp(application),
                             },
-                            ...(application?.review
+                            ...(application?.assessments?.length
                               ? [
                                   {
                                     title: t("actions.discardAssessment"),
                                     onClick: () =>
-                                      setAssessmentOrReviewToDiscard(
-                                        application
-                                      ),
+                                      setAssessmentToDiscard(application),
+                                  },
+                                ]
+                              : []),
+                            ...(application?.review
+                              ? [
+                                  {
+                                    title: t("actions.discardReview"),
+                                    onClick: () =>
+                                      setReviewToDiscard(application),
                                   },
                                 ]
                               : []),
@@ -1071,16 +1105,46 @@ export const ApplicationsTable: React.FC = () => {
             what: t("terms.assessment").toLowerCase(),
           })}
           titleIconVariant={"warning"}
-          isOpen={assessmentOrReviewToDiscard !== null}
+          isOpen={assessmentToDiscard !== null}
           message={
             <span>
               <Trans
                 i18nKey="dialog.message.discardAssessment"
                 values={{
-                  applicationName: assessmentOrReviewToDiscard?.name,
+                  applicationName: assessmentToDiscard?.name,
+                }}
+              >
+                The assessment(s) for{" "}
+                <strong>{assessmentToDiscard?.name}</strong> will be discarded.
+                Do you wish to continue?
+              </Trans>
+            </span>
+          }
+          confirmBtnVariant={ButtonVariant.primary}
+          confirmBtnLabel={t("actions.continue")}
+          cancelBtnLabel={t("actions.cancel")}
+          onCancel={() => setAssessmentToDiscard(null)}
+          onClose={() => setAssessmentToDiscard(null)}
+          onConfirm={() => {
+            discardAssessment(assessmentToDiscard!);
+            setAssessmentToDiscard(null);
+          }}
+        />
+        <ConfirmDialog
+          title={t("dialog.title.discard", {
+            what: t("terms.review").toLowerCase(),
+          })}
+          titleIconVariant={"warning"}
+          isOpen={reviewToDiscard !== null}
+          message={
+            <span>
+              <Trans
+                i18nKey="dialog.message.discardReview"
+                values={{
+                  applicationName: reviewToDiscard?.name,
                 }}
               >
-                The assessment for <strong>applicationName</strong> will be
+                The review for <strong>{reviewToDiscard?.name}</strong> will be
                 discarded, as well as the review result. Do you wish to
                 continue?
               </Trans>
@@ -1089,11 +1153,11 @@ export const ApplicationsTable: React.FC = () => {
           confirmBtnVariant={ButtonVariant.primary}
           confirmBtnLabel={t("actions.continue")}
           cancelBtnLabel={t("actions.cancel")}
-          onCancel={() => setAssessmentOrReviewToDiscard(null)}
-          onClose={() => setAssessmentOrReviewToDiscard(null)}
+          onCancel={() => setReviewToDiscard(null)}
+          onClose={() => setReviewToDiscard(null)}
           onConfirm={() => {
-            discardAssessmentAndReview(assessmentOrReviewToDiscard!);
-            setAssessmentOrReviewToDiscard(null);
+            discardReview(reviewToDiscard!);
+            setReviewToDiscard(null);
           }}
         />
         <ConfirmDialog
diff --git a/client/src/app/pages/archetypes/archetypes-page.tsx b/client/src/app/pages/archetypes/archetypes-page.tsx
index 0f78ade644..ba53891879 100644
--- a/client/src/app/pages/archetypes/archetypes-page.tsx
+++ b/client/src/app/pages/archetypes/archetypes-page.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import {
   Button,
@@ -57,6 +57,8 @@ import { AxiosError } from "axios";
 import { Paths } from "@app/Paths";
 import { SimplePagination } from "@app/components/SimplePagination";
 import { TablePersistenceKeyPrefix } from "@app/Constants";
+import { useDeleteAssessmentMutation } from "@app/queries/assessments";
+import { useDeleteReviewMutation } from "@app/queries/reviews";
 
 const Archetypes: React.FC = () => {
   const { t } = useTranslation();
@@ -71,6 +73,11 @@ const Archetypes: React.FC = () => {
   const [archetypeToEdit, setArchetypeToEdit] = useState<Archetype | null>(
     null
   );
+  const [assessmentToDiscard, setAssessmentToDiscard] =
+    React.useState<Archetype | null>(null);
+
+  const [reviewToDiscard, setReviewToDiscard] =
+    React.useState<Archetype | null>(null);
 
   const [archetypeToDuplicate, setArchetypeToDuplicate] =
     useState<Archetype | null>(null);
@@ -97,6 +104,70 @@ const Archetypes: React.FC = () => {
       }),
     onError
   );
+  const onDeleteAssessmentSuccess = (name: string) => {
+    pushNotification({
+      title: t("toastr.success.assessmentDiscarded", {
+        application: name,
+      }),
+      variant: "success",
+    });
+  };
+
+  const onDeleteError = (error: AxiosError) => {
+    pushNotification({
+      title: getAxiosErrorMessage(error),
+      variant: "danger",
+    });
+  };
+
+  const { mutate: deleteAssessment } = useDeleteAssessmentMutation(
+    onDeleteAssessmentSuccess,
+    onDeleteError
+  );
+
+  const discardAssessment = async (archetype: Archetype) => {
+    try {
+      if (archetype.assessments) {
+        await Promise.all(
+          archetype.assessments.map(async (assessment) => {
+            await deleteAssessment({
+              assessmentId: assessment.id,
+              archetypeId: archetype.id,
+            });
+          })
+        );
+      }
+    } catch (error) {
+      console.error("Error while deleting assessments:", error);
+    }
+  };
+
+  const onDeleteReviewSuccess = (name: string) => {
+    pushNotification({
+      title: t("toastr.success.reviewDiscarded", {
+        application: name,
+      }),
+      variant: "success",
+    });
+  };
+
+  const { mutate: deleteReview } = useDeleteReviewMutation(
+    onDeleteReviewSuccess,
+    onDeleteError
+  );
+
+  const discardReview = async (archetype: Archetype) => {
+    try {
+      if (archetype.review?.id) {
+        await deleteReview({
+          id: archetype.review.id,
+          name: archetype.name,
+        });
+      }
+    } catch (error) {
+      console.error("Error while deleting review:", error);
+    }
+  };
 
   const tableControls = useLocalTableControls({
     persistTo: "urlParams",
@@ -319,6 +390,24 @@ const Archetypes: React.FC = () => {
                                 title: t("actions.edit"),
                                 onClick: () => setArchetypeToEdit(archetype),
                               },
+                              ...(archetype?.assessments?.length
+                                ? [
+                                    {
+                                      title: t("actions.discardAssessment"),
+                                      onClick: () =>
+                                        setAssessmentToDiscard(archetype),
+                                    },
+                                  ]
+                                : []),
+                              ...(archetype?.review
+                                ? [
+                                    {
+                                      title: t("actions.discardReview"),
+                                      onClick: () =>
+                                        setReviewToDiscard(archetype),
+                                    },
+                                  ]
+                                : []),
                               { isSeparator: true },
                               {
                                 title: t("actions.delete"),
@@ -386,6 +475,64 @@ const Archetypes: React.FC = () => {
           onClose={() => setArchetypeToDuplicate(null)}
         />
       </Modal>
+      <ConfirmDialog
+        title={t("dialog.title.discard", {
+          what: t("terms.assessment").toLowerCase(),
+        })}
+        titleIconVariant={"warning"}
+        isOpen={assessmentToDiscard !== null}
+        message={
+          <span>
+            <Trans
+              i18nKey="dialog.message.discardAssessment"
+              values={{
+                applicationName: assessmentToDiscard?.name,
+              }}
+            >
+              The assessment(s) for <strong>{assessmentToDiscard?.name}</strong>{" "}
+              will be discarded. Do you wish to continue?
+            </Trans>
+          </span>
+        }
+        confirmBtnVariant={ButtonVariant.primary}
+        confirmBtnLabel={t("actions.continue")}
+        cancelBtnLabel={t("actions.cancel")}
+        onCancel={() => setAssessmentToDiscard(null)}
+        onClose={() => setAssessmentToDiscard(null)}
+        onConfirm={() => {
+          discardAssessment(assessmentToDiscard!);
+          setAssessmentToDiscard(null);
+        }}
+      />
+      <ConfirmDialog
+        title={t("dialog.title.discard", {
+          what: t("terms.review").toLowerCase(),
+        })}
+        titleIconVariant={"warning"}
+        isOpen={reviewToDiscard !== null}
+        message={
+          <span>
+            <Trans
+              i18nKey="dialog.message.discardReview"
+              values={{
+                applicationName: reviewToDiscard?.name,
+              }}
+            >
+              The review for <strong>{reviewToDiscard?.name}</strong> will be
+              discarded, as well as the review result. Do you wish to continue?
+            </Trans>
+          </span>
+        }
+        confirmBtnVariant={ButtonVariant.primary}
+        confirmBtnLabel={t("actions.continue")}
+        cancelBtnLabel={t("actions.cancel")}
+        onCancel={() => setReviewToDiscard(null)}
+        onClose={() => setReviewToDiscard(null)}
+        onConfirm={() => {
+          discardReview(reviewToDiscard!);
+          setReviewToDiscard(null);
+        }}
+      />
 
       {/* Delete confirm modal */}
       <ConfirmDialog
diff --git a/client/src/app/queries/applications.ts b/client/src/app/queries/applications.ts
index e2d034de50..1adf91d17f 100644
--- a/client/src/app/queries/applications.ts
+++ b/client/src/app/queries/applications.ts
@@ -21,7 +21,10 @@ import {
   updateApplication,
 } from "@app/api/rest";
 import { reviewsQueryKey } from "./reviews";
-import { assessmentsQueryKey } from "./assessments";
+import {
+  assessmentsByItemIdQueryKey,
+  assessmentsQueryKey,
+} from "./assessments";
 import saveAs from "file-saver";
 
 export const ApplicationDependencyQueryKey = "applicationdependencies";
@@ -43,6 +46,7 @@ export const useFetchApplications = (refetchDisabled: boolean = false) => {
     onSuccess: () => {
       queryClient.invalidateQueries([reviewsQueryKey]);
       queryClient.invalidateQueries([assessmentsQueryKey]);
+      queryClient.invalidateQueries([assessmentsByItemIdQueryKey]);
     },
     onError: (error: AxiosError) => console.log(error),
   });
diff --git a/client/src/app/queries/archetypes.ts b/client/src/app/queries/archetypes.ts
index 5bdad16aec..7b0de34b64 100644
--- a/client/src/app/queries/archetypes.ts
+++ b/client/src/app/queries/archetypes.ts
@@ -9,16 +9,28 @@ import {
   getArchetypes,
   updateArchetype,
 } from "@app/api/rest";
+import {
+  assessmentsQueryKey,
+  assessmentsByItemIdQueryKey,
+} from "./assessments";
+import { reviewsQueryKey } from "./reviews";
 
 export const ARCHETYPES_QUERY_KEY = "archetypes";
 export const ARCHETYPE_QUERY_KEY = "archetype";
 
 export const useFetchArchetypes = () => {
+  const queryClient = useQueryClient();
   const { isLoading, isSuccess, error, refetch, data } = useQuery({
     initialData: [],
     queryKey: [ARCHETYPES_QUERY_KEY],
     queryFn: getArchetypes,
     refetchInterval: 5000,
+    onSuccess: () => {
+      queryClient.invalidateQueries([reviewsQueryKey]);
+      queryClient.invalidateQueries([assessmentsQueryKey]);
+      queryClient.invalidateQueries([assessmentsByItemIdQueryKey]);
+    },
+
     onError: (error: AxiosError) => console.log(error),
   });