diff --git a/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.service.ts
index a802991e3b1d..7a07e58bcaf8 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.service.ts
@@ -12,7 +12,7 @@ import {
 } from '@island.is/clients/syslumenn'
 import {
   Answers as aodAnswers,
-  OtherPropertiesEnum,
+  PropertiesEnum,
 } from '@island.is/application/templates/announcement-of-death/types'
 import { NationalRegistry, RoleConfirmationEnum, PickRole } from './types'
 import {
@@ -75,18 +75,10 @@ export class AnnouncementOfDeathService extends BaseTemplateApiService {
     }
 
     for (const estate in estates) {
-      estates[estate].assets = estates[estate].assets.map(baseMapper)
-      estates[estate].vehicles = [
-        ...estates[estate].vehicles,
-        ...estates[estate].ships,
-        ...estates[estate].flyers,
-      ].map(baseMapper)
       estates[estate].estateMembers =
         estates[estate].estateMembers.map(baseMapper)
       // TODO: remove once empty array diff problem is resolved
       //       in the application system (property dropped before deepmerge)
-      estates[estate].assets.unshift(dummyAsset as EstateAsset)
-      estates[estate].vehicles.unshift(dummyAsset as EstateAsset)
       estates[estate].estateMembers.unshift(dummyMember as EstateMember)
       estates[estate].guns.unshift(dummyAsset as EstateAsset)
     }
@@ -230,32 +222,30 @@ export class AnnouncementOfDeathService extends BaseTemplateApiService {
         estateMembers: JSON.stringify(
           answers.estateMembers.members.filter((member) => !member?.dummy),
         ),
-        assets: JSON.stringify(
-          answers.assets.assets.filter((asset) => !asset?.dummy),
-        ),
-        vehicles: JSON.stringify(
-          answers.vehicles.vehicles.filter((vehicle) => !vehicle?.dummy),
-        ),
         hadFirearms: answers.hadFirearms,
         firearm: JSON.stringify(answers.firearmApplicant),
         bankcodeSecuritiesOrShares: otherProperties.includes(
-          OtherPropertiesEnum.ACCOUNTS,
+          PropertiesEnum.ACCOUNTS,
         )
           ? 'true'
           : 'false',
         selfOperatedCompany: otherProperties.includes(
-          OtherPropertiesEnum.OWN_BUSINESS,
+          PropertiesEnum.OWN_BUSINESS,
         )
           ? 'true'
           : 'false',
         occupationRightViaCondominium: otherProperties.includes(
-          OtherPropertiesEnum.RESIDENCE,
+          PropertiesEnum.RESIDENCE,
         )
           ? 'true'
           : 'false',
-        assetsAbroad: otherProperties.includes(
-          OtherPropertiesEnum.ASSETS_ABROAD,
-        )
+        assetsAbroad: otherProperties.includes(PropertiesEnum.ASSETS_ABROAD)
+          ? 'true'
+          : 'false',
+        realEstate: otherProperties.includes(PropertiesEnum.REAL_ESTATE)
+          ? 'true'
+          : 'false',
+        vehicles: otherProperties.includes(PropertiesEnum.VEHICLES)
           ? 'true'
           : 'false',
         districtCommissionerHasWill:
diff --git a/libs/application/templates/announcement-of-death/src/forms/done.ts b/libs/application/templates/announcement-of-death/src/forms/done.ts
index 4e93344c49a0..6fefe945c4d8 100644
--- a/libs/application/templates/announcement-of-death/src/forms/done.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/done.ts
@@ -11,7 +11,6 @@ import { Form, FormModes } from '@island.is/application/types'
 import CoatOfArms from '../assets/CoatOfArms'
 import { m } from '../lib/messages'
 import {
-  extraInfo,
   files,
   firearmApplicant,
   inheritance,
@@ -66,7 +65,6 @@ export const done: Form = buildForm({
             ...inheritance,
             ...properties,
             ...files,
-            ...extraInfo,
           ],
         }),
       ],
diff --git a/libs/application/templates/announcement-of-death/src/forms/draft/draft.ts b/libs/application/templates/announcement-of-death/src/forms/draft/draft.ts
index c1dd65829de4..3231e48fa456 100644
--- a/libs/application/templates/announcement-of-death/src/forms/draft/draft.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/draft/draft.ts
@@ -34,9 +34,9 @@ export const draft: Form = buildForm({
       children: [
         subSectionInfo,
         subSectionWillAndTrade,
-        subSectionFirearms,
         subSectionInheritance,
         subSectionProperties,
+        subSectionFirearms,
         subSectionFiles,
       ],
     }),
diff --git a/libs/application/templates/announcement-of-death/src/forms/draft/sectionOverview.ts b/libs/application/templates/announcement-of-death/src/forms/draft/sectionOverview.ts
index 5d40dffb698a..65319dd8ed2d 100644
--- a/libs/application/templates/announcement-of-death/src/forms/draft/sectionOverview.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/draft/sectionOverview.ts
@@ -7,11 +7,10 @@ import { DefaultEvents } from '@island.is/application/types'
 import { m } from '../../lib/messages'
 import {
   additionalInfo,
-  extraInfo,
+  properties,
   files,
   firearmApplicant,
   inheritance,
-  properties,
   testament,
   theAnnouncer,
   theDeceased,
@@ -30,11 +29,10 @@ export const sectionOverview = buildSection({
         ...theDeceased,
         ...theAnnouncer,
         ...testament,
-        ...firearmApplicant,
         ...inheritance,
         ...properties,
+        ...firearmApplicant,
         ...files,
-        ...extraInfo,
         ...additionalInfo,
         buildSubmitField({
           id: 'submit',
diff --git a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInfo.ts b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInfo.ts
index 54b030af96bf..5b56026530fa 100644
--- a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInfo.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInfo.ts
@@ -6,6 +6,7 @@ import {
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
 import { Application } from '../../types/schema'
+import { removeCountryCode } from '@island.is/application/ui-components'
 
 export const subSectionInfo = buildSubSection({
   id: 'infoStep',
@@ -33,9 +34,16 @@ export const subSectionInfo = buildSubSection({
           format: '###-####',
           placeholder: '',
           width: 'half',
-          defaultValue: (application: Application) =>
-            application.externalData?.userProfile?.data?.mobilePhoneNumber ??
-            '',
+          defaultValue: (application: Application) => {
+            const phone =
+              (
+                application.externalData.userProfile?.data as {
+                  mobilePhoneNumber?: string
+                }
+              )?.mobilePhoneNumber ?? ''
+
+            return removeCountryCode(phone)
+          },
         }),
         buildTextField({
           id: 'applicantEmail',
diff --git a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInheritance.ts b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInheritance.ts
index d6fde6994678..0627cfc43883 100644
--- a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInheritance.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionInheritance.ts
@@ -3,6 +3,8 @@ import {
   buildMultiField,
   buildSubSection,
   buildCustomField,
+  buildCheckboxField,
+  YES,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
 
@@ -28,6 +30,19 @@ export const subSectionInheritance = buildSubSection({
           component: 'EstateMemberRepeater',
           childInputIds: ['estateMembers.encountered', 'estateMembers.members'],
         }),
+        buildDescriptionField({
+          id: 'inheritanceConfirmationDescription',
+          title: '',
+          description: m.inheritanceConfirmationDescription,
+          space: 'containerGutter',
+        }),
+        buildCheckboxField({
+          id: 'estateMembers.confirmation',
+          title: '',
+          large: false,
+          backgroundColor: 'white',
+          options: [{ value: YES, label: m.inheritanceConfirmation }],
+        }),
       ],
     }),
   ],
diff --git a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionProperties.ts b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionProperties.ts
index 1cc6036e450e..3f387e465738 100644
--- a/libs/application/templates/announcement-of-death/src/forms/draft/subSectionProperties.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/draft/subSectionProperties.ts
@@ -6,7 +6,7 @@ import {
   buildCheckboxField,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
-import { OtherPropertiesEnum } from '../../types'
+import { PropertiesEnum } from '../../types'
 
 export const subSectionProperties = buildSubSection({
   id: 'propertiesStep',
@@ -18,37 +18,6 @@ export const subSectionProperties = buildSubSection({
       description: m.propertiesDescription,
       space: 2,
       children: [
-        buildDescriptionField({
-          id: 'realEstatesTitle',
-          title: m.realEstatesTitle,
-          titleVariant: 'h3',
-          description: m.realEstatesDescription,
-        }),
-        buildCustomField({
-          title: 'realEstateRepeater',
-          id: 'assets',
-          component: 'RealEstateRepeater',
-        }),
-        buildDescriptionField({
-          id: 'vehiclesTitle',
-          title: m.vehiclesTitle,
-          description: m.vehiclesDescription,
-          space: 5,
-          titleVariant: 'h3',
-        }),
-        buildCustomField({
-          title: 'Vehicles!',
-          id: 'vehicles',
-          component: 'VehiclesRepeater',
-          childInputIds: ['vehicles.vehicles', 'vehicles.encountered'],
-        }),
-        buildDescriptionField({
-          id: 'otherPropertiesTitle',
-          title: m.otherPropertiesTitle,
-          titleVariant: 'h3',
-          description: m.otherPropertiesDescription,
-          space: 5,
-        }),
         buildCheckboxField({
           id: 'otherProperties',
           title: '',
@@ -57,21 +26,29 @@ export const subSectionProperties = buildSubSection({
           doesNotRequireAnswer: true,
           defaultValue: '',
           options: [
+            {
+              label: m.propertiesRealEstate,
+              value: PropertiesEnum.REAL_ESTATE,
+            },
+            {
+              label: m.propertiesVehicles,
+              value: PropertiesEnum.VEHICLES,
+            },
             {
               label: m.otherPropertiesAccounts,
-              value: OtherPropertiesEnum.ACCOUNTS,
+              value: PropertiesEnum.ACCOUNTS,
             },
             {
               label: m.otherPropertiesOwnBusiness,
-              value: OtherPropertiesEnum.OWN_BUSINESS,
+              value: PropertiesEnum.OWN_BUSINESS,
             },
             {
               label: m.otherPropertiesResidence,
-              value: OtherPropertiesEnum.RESIDENCE,
+              value: PropertiesEnum.RESIDENCE,
             },
             {
               label: m.otherPropertiesAssetsAbroad,
-              value: OtherPropertiesEnum.ASSETS_ABROAD,
+              value: PropertiesEnum.ASSETS_ABROAD,
             },
           ],
         }),
diff --git a/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts b/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts
index 4421f3bf30b0..5f23241f662b 100644
--- a/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts
@@ -4,13 +4,14 @@ import {
   buildKeyValueField,
   buildCustomField,
   buildTextField,
+  YES,
 } from '@island.is/application/core'
 import { Answer, Application, Field } from '@island.is/application/types'
 import { format as formatNationalId } from 'kennitala'
 import { m } from '../lib/messages'
 import { formatPhoneNumber } from '@island.is/application/ui-components'
 import format from 'date-fns/format'
-import { Asset, Answers as AODAnswers, OtherPropertiesEnum } from '../types'
+import { Asset, Answers as AODAnswers, PropertiesEnum } from '../types'
 import { FormatMessage } from '@island.is/localization'
 import { getFileRecipientName } from '../lib/utils'
 import { EstateRegistrant } from '@island.is/clients/syslumenn'
@@ -123,7 +124,7 @@ export const testament: Field[] = [
   }),
   buildKeyValueField({
     label: m.testamentKnowledgeOfOtherTestament,
-    width: 'half',
+    width: 'full',
     value: ({ answers }) =>
       answers.knowledgeOfOtherWills === 'yes'
         ? m.testamentKnowledgeOfOtherTestamentYes
@@ -132,71 +133,6 @@ export const testament: Field[] = [
   }),
 ]
 
-export const extraInfo: Field[] = [
-  buildDividerField({
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-  buildDescriptionField({
-    id: 'otherProperties',
-    title: m.otherPropertiesTitle,
-    marginBottom: 2,
-    titleVariant: 'h3',
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-  buildKeyValueField({
-    label: m.otherPropertiesAccounts,
-    width: 'half',
-    value: ({ answers }) =>
-      answers?.otherProperties
-        ? (answers.otherProperties as string[]).includes(
-            OtherPropertiesEnum.ACCOUNTS,
-          )
-          ? m.testamentKnowledgeOfOtherTestamentYes
-          : m.testamentKnowledgeOfOtherTestamentNo
-        : m.testamentKnowledgeOfOtherTestamentNo,
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-  buildKeyValueField({
-    label: m.otherPropertiesOwnBusiness,
-    width: 'half',
-    value: ({ answers }) =>
-      answers?.otherProperties
-        ? (answers.otherProperties as string[]).includes(
-            OtherPropertiesEnum.OWN_BUSINESS,
-          )
-          ? m.testamentKnowledgeOfOtherTestamentYes
-          : m.testamentKnowledgeOfOtherTestamentNo
-        : m.testamentKnowledgeOfOtherTestamentNo,
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-  buildKeyValueField({
-    label: m.otherPropertiesResidence,
-    width: 'half',
-    value: ({ answers }) =>
-      answers?.otherProperties
-        ? (answers.otherProperties as string[]).includes(
-            OtherPropertiesEnum.RESIDENCE,
-          )
-          ? m.testamentKnowledgeOfOtherTestamentYes
-          : m.testamentKnowledgeOfOtherTestamentNo
-        : m.testamentKnowledgeOfOtherTestamentNo,
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-  buildKeyValueField({
-    label: m.otherPropertiesAssetsAbroad,
-    width: 'half',
-    value: ({ answers }) =>
-      answers?.otherProperties
-        ? (answers.otherProperties as string[]).includes(
-            OtherPropertiesEnum.ASSETS_ABROAD,
-          )
-          ? m.testamentKnowledgeOfOtherTestamentYes
-          : m.testamentKnowledgeOfOtherTestamentNo
-        : m.testamentKnowledgeOfOtherTestamentNo,
-    condition: (answers) => showInDone(answers.viewOverview),
-  }),
-]
-
 export const inheritance: Field[] = [
   buildDividerField({
     condition: (answers) =>
@@ -244,67 +180,90 @@ export const properties: Field[] = [
   buildDividerField({
     condition: (answers) => showInDone(answers.viewOverview),
   }),
-
   buildDescriptionField({
-    id: 'realEstatesTitle',
-    title: m.realEstatesTitle,
+    id: 'propertiesTitle',
+    title: m.propertiesTitle,
     titleVariant: 'h3',
-    description: m.realEstatesDescription,
     condition: (answers) => showInDone(answers.viewOverview),
   }),
-  buildCustomField(
-    {
-      title: '',
-      id: 'assets',
-      component: 'InfoCard',
-      width: 'full',
-      condition: (answers) =>
-        (answers?.assets as { assets: Asset[] })?.assets?.length > 0 &&
-        showInDone(answers.viewOverview),
-    },
-    {
-      cards: ({ answers }: Application) =>
-        (answers?.assets as { assets: Asset[] }).assets
-          .filter((asset) => !asset?.dummy)
-          .map((property) => ({
-            title: property.description,
-            description: (formatMessage: FormatMessage) => [
-              `${formatMessage(m.propertyNumber)}: ${property.assetNumber}`,
-              property.share
-                ? `${formatMessage(m.propertyShare)}: ${property.share}%`
-                : '',
-            ],
-          })),
-    },
-  ),
-  buildDescriptionField({
-    id: 'vehiclesTitle',
-    title: m.vehiclesTitle,
-    description: m.vehiclesDescription,
-    space: 5,
-    titleVariant: 'h3',
+  buildKeyValueField({
+    label: m.propertiesRealEstate,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.REAL_ESTATE,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildKeyValueField({
+    label: m.propertiesVehicles,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.VEHICLES,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildKeyValueField({
+    label: m.otherPropertiesAccounts,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.ACCOUNTS,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildKeyValueField({
+    label: m.otherPropertiesOwnBusiness,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.OWN_BUSINESS,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildKeyValueField({
+    label: m.otherPropertiesResidence,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.RESIDENCE,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildKeyValueField({
+    label: m.otherPropertiesAssetsAbroad,
+    width: 'full',
+    value: ({ answers }) =>
+      answers?.otherProperties
+        ? (answers.otherProperties as string[]).includes(
+            PropertiesEnum.ASSETS_ABROAD,
+          )
+          ? m.testamentKnowledgeOfOtherTestamentYes
+          : m.testamentKnowledgeOfOtherTestamentNo
+        : m.testamentKnowledgeOfOtherTestamentNo,
     condition: (answers) => showInDone(answers.viewOverview),
   }),
-  buildCustomField(
-    {
-      title: '',
-      id: 'vehicles',
-      component: 'InfoCard',
-      width: 'full',
-      condition: (answers) =>
-        (answers?.vehicles as { vehicles: Asset[] })?.vehicles?.length > 0 &&
-        showInDone(answers.viewOverview),
-    },
-    {
-      cards: ({ answers }: Application) =>
-        (answers?.vehicles as { vehicles: Asset[] })?.vehicles
-          .filter((vehicle) => !vehicle?.dummy)
-          .map((vehicle) => ({
-            title: vehicle.assetNumber,
-            description: [vehicle.description],
-          })),
-    },
-  ),
 ]
 
 export const files: Field[] = [
@@ -321,7 +280,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.certificateOfDeathAnnouncementTitle,
-      description: m.certificateOfDeathAnnouncementDescription,
       id: 'certificateOfDeathAnnouncement',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -338,7 +296,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.financesDataCollectionPermissionTitle,
-      description: m.financesDataCollectionPermissionDescription,
       id: 'financesDataCollectionPermission',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -355,7 +312,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.authorizationForFuneralExpensesTitle,
-      description: m.authorizationForFuneralExpensesDescription,
       id: 'authorizationForFuneralExpenses',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -373,39 +329,45 @@ export const files: Field[] = [
 
 export const firearmApplicant: Field[] = [
   buildDividerField({
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
   buildDescriptionField({
     id: 'firearmApplicant',
     title: m.firearmsApplicantOverviewHeader,
     titleVariant: 'h3',
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
   buildKeyValueField({
     label: m.firearmsApplicantName,
     width: 'half',
     value: ({ answers }) => (answers.firearmApplicant as any)?.name || '',
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
   buildKeyValueField({
     label: m.firearmsApplicantNationalId,
     width: 'half',
     value: ({ answers }) =>
       formatNationalId((answers.firearmApplicant as any)?.nationalId || ''),
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
   buildKeyValueField({
     label: m.firearmsApplicantPhone,
     width: 'half',
     value: ({ answers }) =>
       formatPhoneNumber((answers.firearmApplicant as any)?.phone || ''),
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
   buildKeyValueField({
     label: m.firearmsApplicantEmail,
     width: 'half',
     value: ({ answers }) => (answers.firearmApplicant as any)?.email || '',
-    condition: (answers) => showInDone(answers.viewOverview),
+    condition: (answers) =>
+      showInDone(answers.viewOverview) && answers.hadFirearms === YES,
   }),
 ]
 
@@ -414,7 +376,6 @@ export const additionalInfo: Field[] = [
   buildDescriptionField({
     id: 'additionalInfoTitle',
     title: m.additionalInfoTitle,
-    description: m.additionalInfoDescription,
     titleVariant: 'h3',
   }),
   buildTextField({
diff --git a/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts b/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts
index 0676b2e15498..5da16b770ec7 100644
--- a/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts
+++ b/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts
@@ -5,6 +5,7 @@ import { m } from './messages'
 import { RoleConfirmationEnum } from '../types'
 
 import { customZodError } from './utils/customZodError'
+import { YES } from '@island.is/application/core'
 
 const isValidPhoneNumber = (phoneNumber: string) => {
   const phone = parsePhoneNumberFromString(phoneNumber, 'IS')
@@ -119,6 +120,7 @@ export const dataSchema = z.object({
       .array()
       .optional(),
     encountered: z.boolean().optional(),
+    confirmation: z.array(z.enum([YES])).length(1),
   }),
   flyers: asset,
   ships: asset,
diff --git a/libs/application/templates/announcement-of-death/src/lib/messages.ts b/libs/application/templates/announcement-of-death/src/lib/messages.ts
index cf334a594578..cab2f43a0df0 100644
--- a/libs/application/templates/announcement-of-death/src/lib/messages.ts
+++ b/libs/application/templates/announcement-of-death/src/lib/messages.ts
@@ -323,6 +323,18 @@ Ef ekkert á við sem hér að ofan er talið rennur arfur í ríkissjóð. Nán
     defaultMessage: 'Fæðingardagur',
     description: 'Day of birth label',
   },
+  inheritanceConfirmationDescription: {
+    id: 'aod.application:inheritanceConfirmationDescription#markdown',
+    defaultMessage:
+      'Ath. Það þarf alltaf að fylla út upplýsingar um alla erfingja, til dæmis þótt maki ætli að sitja í óskiptu búi. Ef barn hins látna var fallið frá á undan þarf að gefa upplýsingar um barnabörn. Ef látni sat í óskiptu búi þarf að veita upplýsingar um stjúpbörn.',
+    description: 'Inheritance confirmation',
+  },
+  inheritanceConfirmation: {
+    id: 'aod.application:inheritanceConfirmation',
+    defaultMessage:
+      'Ég staðfesti að hafa fært inn upplýsingar um alla erfingja',
+    description: 'Inheritance confirmation',
+  },
 
   /* Properties step */
   propertiesTitle: {
@@ -332,8 +344,7 @@ Ef ekkert á við sem hér að ofan er talið rennur arfur í ríkissjóð. Nán
   },
   propertiesDescription: {
     id: 'aod.application:propertiesDescription',
-    defaultMessage:
-      'Upplýsingar um eignir og ökutæki hafa verið sóttar rafrænt. Vinsamlega bætið við upplýsingum ef eitthvað vantar. Taktu þér góðan tíma í að fylla þetta út eftir bestu getu. ',
+    defaultMessage: 'Merktu við það sem á við eftir bestu vitund.',
     description: 'Properties description',
   },
   realEstatesTitle: {
@@ -341,35 +352,25 @@ Ef ekkert á við sem hér að ofan er talið rennur arfur í ríkissjóð. Nán
     defaultMessage: 'Fasteignir',
     description: 'Real estates and lands title',
   },
-  realEstatesDescription: {
-    id: 'aod.application:realEstatesDescription',
-    defaultMessage: 'Til dæmis íbúðarhús, sumarhús, lóðir og jarðir.',
-    description: 'Real estates and lands description',
-  },
   vehiclesTitle: {
     id: 'aod.application:vehiclesTitle',
     defaultMessage: 'Faratæki',
     description: 'Vehicles title',
   },
-  vehiclesDescription: {
-    id: 'aod.application:vehiclesDescription',
-    defaultMessage: 'Til dæmis bifreiðar, flugvélar og bátar.',
-    description: 'Vehicles description',
-  },
   vehiclesPlaceholder: {
     id: 'aod.application:vehiclesPlaceholder',
     defaultMessage: 't.d. Toyota Yaris',
     description: 'Placeholder for vehicles type',
   },
-  otherPropertiesTitle: {
-    id: 'aod.application:otherPropertiesTitle',
-    defaultMessage: 'Aðrar eignir',
-    description: 'Other properties title',
+  propertiesRealEstate: {
+    id: 'aod.application:propertiesRealEstate',
+    defaultMessage: 'Fasteignir',
+    description: 'Properties option: Real estate',
   },
-  otherPropertiesDescription: {
-    id: 'aod.application:otherPropertiesDescription',
-    defaultMessage: 'Merktu við það sem á við eftir bestu vitund.',
-    description: 'Other properties description',
+  propertiesVehicles: {
+    id: 'aod.application:propertiesVehicles',
+    defaultMessage: 'Faratæki',
+    description: 'Properties option: Vehicles',
   },
   otherPropertiesAccounts: {
     id: 'aod.application:otherPropertiesAccounts',
diff --git a/libs/application/templates/announcement-of-death/src/types.ts b/libs/application/templates/announcement-of-death/src/types.ts
index 0079b7f0b2a7..48adf49704b3 100644
--- a/libs/application/templates/announcement-of-death/src/types.ts
+++ b/libs/application/templates/announcement-of-death/src/types.ts
@@ -12,7 +12,9 @@ export enum RelationEnum {
   SIBLING = 'sibling',
   SPOUSE = 'spouse',
 }
-export enum OtherPropertiesEnum {
+export enum PropertiesEnum {
+  REAL_ESTATE = 'realEstate',
+  VEHICLES = 'vehicles',
   ACCOUNTS = 'accounts',
   OWN_BUSINESS = 'ownBusiness',
   RESIDENCE = 'residence',
@@ -50,7 +52,7 @@ export type Answers = {
   firearmApplicant: FirearmApplicant
   marriageSettlement: boolean
   occupationRightViaCondominium: boolean
-  otherProperties: OtherPropertiesEnum
+  otherProperties: PropertiesEnum
   ownBusinessManagement: boolean
   roleConfirmation: RoleConfirmationEnum
   vehicles: {
diff --git a/libs/application/templates/estate/src/types.ts b/libs/application/templates/estate/src/types.ts
index 59960a0a6711..c3d8552a0c5c 100644
--- a/libs/application/templates/estate/src/types.ts
+++ b/libs/application/templates/estate/src/types.ts
@@ -12,7 +12,9 @@ export enum RelationEnum {
   SIBLING = 'sibling',
   SPOUSE = 'spouse',
 }
-export enum OtherPropertiesEnum {
+export enum PropertiesEnum {
+  REAL_ESTATE = 'realEstate',
+  VEHICLES = 'vehicles',
   ACCOUNTS = 'accounts',
   OWN_BUSINESS = 'ownBusiness',
   RESIDENCE = 'residence',
@@ -50,7 +52,7 @@ export type Answers = {
   knowledgeOfOtherWills: 'yes' | 'no'
   marriageSettlement: boolean
   occupationRightViaCondominium: boolean
-  otherProperties: OtherPropertiesEnum
+  otherProperties: PropertiesEnum
   ownBusinessManagement: boolean
   roleConfirmation: RoleConfirmationEnum
   vehicles: {