diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3fb6c5ac063b..0f1602b5aadb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -21,6 +21,8 @@
 
 /*                                                                                                       @island-is/core
 /libs/api/domains/identity/                                                                              @island-is/core
+# Edge case escaping the /infra/ and **/infra/ devops patterns below
+/libs/infra-nest-server/src/lib/infra/                                                                   @island-is/core
 /libs/testing/                                                                                           @island-is/core
 /libs/nest/swagger/                                                                                      @island-is/core
 
@@ -166,6 +168,7 @@ codemagic.yaml
 /libs/clients/firearm-license/                                                                           @island-is/hugsmidjan
 /libs/clients/hunting-license/                                                                           @island-is/hugsmidjan
 /libs/clients/smartsolutions/                                                                            @island-is/hugsmidjan
+/libs/clients/smart-solutions-v2/                                                                        @island-is/hugsmidjan
 /libs/clients/license-client/                                                                            @island-is/hugsmidjan @island-is/aranja
 /libs/clients/intellectual-properties/                                                                   @island-is/hugsmidjan
 /libs/clients/islykill/                                                                                  @island-is/hugsmidjan
@@ -190,6 +193,7 @@ codemagic.yaml
 /libs/portals/admin/document-provider/                                                                   @island-is/hugsmidjan @island-is/core
 /libs/clients/icelandic-health-insurance/rights-portal/                                                  @island-is/hugsmidjan
 /libs/clients/health-directorate                                                                         @island-is/hugsmidjan @island-is/origo
+/libs/clients/mms/grade                                                                                  @island-is/hugsmidjan
 /libs/portals/admin/air-discount-scheme                                                                  @island-is/hugsmidjan
 /libs/application/templates/official-journal-of-iceland/                                                 @island-is/hugsmidjan
 /libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/            @island-is/hugsmidjan
diff --git a/apps/air-discount-scheme/backend/docker-compose.yml b/apps/air-discount-scheme/backend/docker-compose.yml
index b936e4336e86..f661e2b0b8f8 100644
--- a/apps/air-discount-scheme/backend/docker-compose.yml
+++ b/apps/air-discount-scheme/backend/docker-compose.yml
@@ -15,7 +15,7 @@ services:
 
   redis-cluster:
     container_name: ads_redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     privileged: true
     environment:
       - IP=0.0.0.0
diff --git a/apps/api/docker-compose.yml b/apps/api/docker-compose.yml
index 4e7a43ad9202..be437e3c31a1 100644
--- a/apps/api/docker-compose.yml
+++ b/apps/api/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.3'
 services:
   redis_cluster:
     container_name: api_redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     networks:
       - local
     privileged: true
diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
index f538ecfaee35..885e71d4dc1f 100644
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@@ -23,6 +23,7 @@ import { DocumentModule } from '@island.is/api/domains/documents'
 import { DrivingLicenseModule } from '@island.is/api/domains/driving-license'
 import { DrivingLicenseBookModule } from '@island.is/api/domains/driving-license-book'
 import { EducationModule } from '@island.is/api/domains/education'
+import { EducationV2Module } from '@island.is/api/domains/education'
 import { SocialInsuranceModule } from '@island.is/api/domains/social-insurance'
 import { ElectronicRegistrationsModule } from '@island.is/api/domains/electronic-registration-statistics'
 import {
@@ -192,6 +193,7 @@ import { CriminalRecordClientConfig } from '@island.is/clients/criminal-record'
 import { HealthInsuranceV2ClientConfig } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { VmstClientConfig } from '@island.is/clients/vmst'
 import { FriggClientConfig } from '@island.is/clients/mms/frigg'
+import { GradeClientConfig } from '@island.is/clients/mms/grade'
 import { UmbodsmadurSkuldaraModule } from '@island.is/api/domains/umbodsmadur-skuldara'
 import { UmbodsmadurSkuldaraClientConfig } from '@island.is/clients/ums-cost-of-living-calculator'
 import { emailModuleConfig } from '@island.is/email-service'
@@ -230,6 +232,7 @@ const environment = getConfig
       },
       fileDownloadBucket: environment.education.fileDownloadBucket!,
     }),
+    EducationV2Module,
     ApplicationModule.register({
       baseApiUrl: environment.applicationSystem.baseApiUrl!,
     }),
@@ -417,6 +420,7 @@ const environment = getConfig
         UserProfileClientConfig,
         UltravioletRadiationClientConfig,
         FriggClientConfig,
+        GradeClientConfig,
         VmstClientConfig,
         HealthInsuranceV2ClientConfig,
         CriminalRecordClientConfig,
diff --git a/apps/application-system/api/docker-compose.yml b/apps/application-system/api/docker-compose.yml
index 3520303edf14..2b754bf67fe7 100644
--- a/apps/application-system/api/docker-compose.yml
+++ b/apps/application-system/api/docker-compose.yml
@@ -15,7 +15,7 @@ services:
 
   redis_cluster:
     container_name: redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     networks:
       - local
     privileged: true
diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts
index c138e02c7c39..799dab8fee5b 100644
--- a/apps/application-system/api/infra/application-system-api.ts
+++ b/apps/application-system/api/infra/application-system-api.ts
@@ -57,7 +57,7 @@ export const workerSetup =
         },
         XROAD_CHARGE_FJS_V2_PATH: {
           dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
-          staging: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
+          staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
           prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
         },
         APPLICATION_ATTACHMENT_BUCKET: {
@@ -221,12 +221,12 @@ export const serviceSetup = (services: {
       ),
       XROAD_COURT_BANKRUPTCY_CERT_PATH: {
         dev: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1',
-        staging: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1',
+        staging: 'IS-TEST/GOV/10019/Domstolasyslan/JusticePortal-v1',
         prod: 'IS/GOV/4707171140/Domstolasyslan/JusticePortal-v1',
       },
       XROAD_ALTHINGI_OMBUDSMAN_SERVICE_PATH: {
         dev: 'IS-DEV/GOV/10047/UA-Protected/kvortun-v1/',
-        staging: 'IS-DEV/GOV/10047/UA-Protected/kvortun-v1/',
+        staging: 'IS-TEST/GOV/10047/UA-Protected/kvortun-v1/',
         prod: 'IS/GOV/5605882089/UA-Protected/kvortun-v1',
       },
       NOVA_ACCEPT_UNAUTHORIZED: {
diff --git a/apps/application-system/api/src/app/modules/application/admin.controller.ts b/apps/application-system/api/src/app/modules/application/admin.controller.ts
index c2270e947d46..4f96f961053f 100644
--- a/apps/application-system/api/src/app/modules/application/admin.controller.ts
+++ b/apps/application-system/api/src/app/modules/application/admin.controller.ts
@@ -7,7 +7,7 @@ import {
   UseGuards,
   Inject,
 } from '@nestjs/common'
-import { ApiTags, ApiHeader } from '@nestjs/swagger'
+import { ApiTags, ApiHeader, ApiBearerAuth } from '@nestjs/swagger'
 
 import { IdsUserGuard, ScopesGuard, Scopes } from '@island.is/auth-nest-tools'
 import { AdminPortalScope } from '@island.is/auth/scopes'
@@ -31,10 +31,7 @@ import {
 
 @UseGuards(IdsUserGuard, ScopesGuard, DelegationGuard)
 @ApiTags('applications')
-@ApiHeader({
-  name: 'authorization',
-  description: 'Bearer token authorization',
-})
+@ApiBearerAuth()
 @ApiHeader({
   name: 'locale',
   description: 'Front-end language selected',
diff --git a/apps/application-system/api/src/app/modules/application/application.controller.ts b/apps/application-system/api/src/app/modules/application/application.controller.ts
index ad35f8690a55..d8d3180484aa 100644
--- a/apps/application-system/api/src/app/modules/application/application.controller.ts
+++ b/apps/application-system/api/src/app/modules/application/application.controller.ts
@@ -27,6 +27,7 @@ import {
   ApiTags,
   ApiHeader,
   ApiQuery,
+  ApiBearerAuth,
 } from '@nestjs/swagger'
 import {
   ApplicationTemplateHelper,
@@ -102,14 +103,11 @@ import { ApplicationActionService } from './application-action.service'
 
 @UseGuards(IdsUserGuard, ScopesGuard, DelegationGuard)
 @ApiTags('applications')
-@ApiHeader({
-  name: 'authorization',
-  description: 'Bearer token authorization',
-})
 @ApiHeader({
   name: 'locale',
   description: 'Front-end language selected',
 })
+@ApiBearerAuth()
 @Controller()
 export class ApplicationController {
   constructor(
diff --git a/apps/application-system/api/src/app/modules/application/application.module.ts b/apps/application-system/api/src/app/modules/application/application.module.ts
index 7609f18cec88..2fffc93fefc4 100644
--- a/apps/application-system/api/src/app/modules/application/application.module.ts
+++ b/apps/application-system/api/src/app/modules/application/application.module.ts
@@ -29,7 +29,6 @@ import { PaymentModule } from '@island.is/application/api/payment'
 import { HistoryModule } from '@island.is/application/api/history'
 import { AuthPublicApiClientModule } from '@island.is/clients/auth/public-api'
 import { ApplicationActionService } from './application-action.service'
-import { TemplateAPIConfig } from '@island.is/application/template-api-modules'
 
 @Module({
   imports: [
@@ -37,9 +36,7 @@ import { TemplateAPIConfig } from '@island.is/application/template-api-modules'
     AuditModule.forRoot(environment.audit),
     AuthModule.register(environment.auth),
     TemplateAPIModule.register({
-      // TODO: Update typing to accomodate incomplete module setup
-      // Some modules don't need to configure everything, yet the type requires it.
-      ...(environment.templateApi as TemplateAPIConfig),
+      ...environment.templateApi,
       applicationService: TemplateApiApplicationService,
     }),
     ApplicationApiCoreModule,
diff --git a/apps/application-system/api/src/app/modules/application/dto/application.response.dto.ts b/apps/application-system/api/src/app/modules/application/dto/application.response.dto.ts
index 310339292962..b776368ece8c 100644
--- a/apps/application-system/api/src/app/modules/application/dto/application.response.dto.ts
+++ b/apps/application-system/api/src/app/modules/application/dto/application.response.dto.ts
@@ -41,6 +41,11 @@ class PendingAction {
   @Expose()
   @IsString()
   content?: string
+
+  @ApiPropertyOptional()
+  @Expose()
+  @IsString()
+  button?: string
 }
 
 class History {
@@ -96,6 +101,11 @@ class ActionCardMetaData {
   @Expose()
   @IsNumber()
   draftTotalSteps?: number
+
+  @ApiPropertyOptional()
+  @Expose()
+  @IsString()
+  historyButton?: string
 }
 
 export class BaseApplicationResponseDto {
diff --git a/apps/application-system/api/src/app/modules/application/tools/application.serializer.ts b/apps/application-system/api/src/app/modules/application/tools/application.serializer.ts
index a26f6cf08379..160a2f92d833 100644
--- a/apps/application-system/api/src/app/modules/application/tools/application.serializer.ts
+++ b/apps/application-system/api/src/app/modules/application/tools/application.serializer.ts
@@ -147,6 +147,9 @@ export class ApplicationSerializer
         history,
         draftFinishedSteps: application.draftFinishedSteps,
         draftTotalSteps: application.draftTotalSteps,
+        historyButton: actionCardMeta.historyButton
+          ? intl.formatMessage(actionCardMeta.historyButton)
+          : null,
       },
       name: getApplicationNameTranslationString(
         template,
diff --git a/apps/application-system/api/src/environments/environment.interface.ts b/apps/application-system/api/src/environments/environment.interface.ts
index 9d1dad05eb64..0136d18bd16b 100644
--- a/apps/application-system/api/src/environments/environment.interface.ts
+++ b/apps/application-system/api/src/environments/environment.interface.ts
@@ -2,16 +2,14 @@ import type { AuthConfig } from '@island.is/auth-nest-tools'
 import { TemplateAPIConfig } from '@island.is/application/template-api-modules'
 import { AuditOptions } from '@island.is/nest/audit'
 
-export interface Environment<
-  TemplateAPISubset extends keyof TemplateAPIConfig = keyof TemplateAPIConfig,
-> {
+export interface Environment {
   production: boolean
   environment: string
   name: string
   baseApiUrl: string
   audit: AuditOptions
   auth: AuthConfig
-  templateApi: Pick<TemplateAPIConfig, TemplateAPISubset>
+  templateApi: TemplateAPIConfig
   contentful: {
     accessToken: string
   }
diff --git a/apps/application-system/api/src/environments/environment.ts b/apps/application-system/api/src/environments/environment.ts
index 178189e4413c..7294e37f0878 100644
--- a/apps/application-system/api/src/environments/environment.ts
+++ b/apps/application-system/api/src/environments/environment.ts
@@ -1,18 +1,6 @@
 import { Environment } from './environment.interface'
 
-type EnvironmentKeys =
-  | 'attachmentBucket'
-  | 'baseApiUrl'
-  | 'clientLocationOrigin'
-  | 'email'
-  | 'generalPetition'
-  | 'islykill'
-  | 'jwtSecret'
-  | 'presignBucket'
-  | 'userProfile'
-  | 'xRoadBasePathWithEnv'
-
-const devConfig: Environment<EnvironmentKeys> = {
+const devConfig = {
   production: false,
   environment: 'local',
   name: 'local',
@@ -36,8 +24,8 @@ const devConfig: Environment<EnvironmentKeys> = {
     jwtSecret: 'supersecret',
     xRoadBasePathWithEnv: process.env.XROAD_BASE_PATH_WITH_ENV ?? '',
     baseApiUrl: 'http://localhost:4444',
-    presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET ?? '',
-    attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET ?? '',
+    presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET,
+    attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET,
     generalPetition: {
       endorsementsApiBasePath: 'http://localhost:4246',
     },
@@ -45,60 +33,59 @@ const devConfig: Environment<EnvironmentKeys> = {
       serviceBasePath: 'http://localhost:3366',
     },
     islykill: {
-      cert: process.env.ISLYKILL_CERT ?? '',
-      passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE ?? '',
-      basePath: process.env.ISLYKILL_SERVICE_BASEPATH ?? '',
+      cert: process.env.ISLYKILL_CERT,
+      passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE,
+      basePath: process.env.ISLYKILL_SERVICE_BASEPATH,
     },
   },
 
   contentful: {
-    accessToken: process.env.CONTENTFUL_ACCESS_TOKEN ?? '',
+    accessToken: process.env.CONTENTFUL_ACCESS_TOKEN,
   },
-}
+} as Environment
 
-// TODO: Remove empty-string defaulting
-const prodConfig: Environment<EnvironmentKeys> = {
+const prodConfig = {
   production: true,
-  environment: process.env.ENVIRONMENT ?? '',
-  name: process.env.name ?? '',
-  baseApiUrl: process.env.GRAPHQL_API_URL ?? '',
+  environment: process.env.ENVIRONMENT,
+  name: process.env.name,
+  baseApiUrl: process.env.GRAPHQL_API_URL,
   audit: {
     defaultNamespace: '@island.is/applications',
-    groupName: process.env.AUDIT_GROUP_NAME ?? '',
+    groupName: process.env.AUDIT_GROUP_NAME,
     serviceName: 'application-system-api',
   },
   auth: {
-    issuer: process.env.IDENTITY_SERVER_ISSUER_URL ?? '',
+    issuer: process.env.IDENTITY_SERVER_ISSUER_URL,
     audience: ['@island.is', '@admin.island.is'],
     allowClientNationalId: true,
   },
   templateApi: {
-    clientLocationOrigin: process.env.CLIENT_LOCATION_ORIGIN ?? '',
+    clientLocationOrigin: process.env.CLIENT_LOCATION_ORIGIN,
     email: {
-      sender: process.env.EMAIL_FROM_NAME ?? '',
-      address: process.env.EMAIL_FROM ?? '',
+      sender: process.env.EMAIL_FROM_NAME,
+      address: process.env.EMAIL_FROM,
     },
-    jwtSecret: process.env.AUTH_JWT_SECRET ?? '',
+    jwtSecret: process.env.AUTH_JWT_SECRET,
     xRoadBasePathWithEnv: process.env.XROAD_BASE_PATH_WITH_ENV ?? '',
-    baseApiUrl: process.env.GRAPHQL_API_URL ?? '',
-    presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET ?? '',
-    attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET ?? '',
+    baseApiUrl: process.env.GRAPHQL_API_URL,
+    presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET,
+    attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET,
     generalPetition: {
-      endorsementsApiBasePath: process.env.ENDORSEMENTS_API_BASE_PATH ?? '',
+      endorsementsApiBasePath: process.env.ENDORSEMENTS_API_BASE_PATH,
     },
     userProfile: {
-      serviceBasePath: process.env.SERVICE_USER_PROFILE_URL ?? '',
+      serviceBasePath: process.env.SERVICE_USER_PROFILE_URL,
     },
     islykill: {
-      cert: process.env.ISLYKILL_CERT ?? '',
-      passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE ?? '',
-      basePath: process.env.ISLYKILL_SERVICE_BASEPATH ?? '',
+      cert: process.env.ISLYKILL_CERT,
+      passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE,
+      basePath: process.env.ISLYKILL_SERVICE_BASEPATH,
     },
   },
   contentful: {
-    accessToken: process.env.CONTENTFUL_ACCESS_TOKEN ?? '',
+    accessToken: process.env.CONTENTFUL_ACCESS_TOKEN,
   },
-}
+} as Environment
 
 export default process.env.PROD_MODE === 'true' ||
 process.env.NODE_ENV === 'production'
diff --git a/apps/application-system/api/src/openApi.ts b/apps/application-system/api/src/openApi.ts
index 9e2a5235d78a..1c22ee62d9ab 100644
--- a/apps/application-system/api/src/openApi.ts
+++ b/apps/application-system/api/src/openApi.ts
@@ -8,4 +8,5 @@ export const openApi = new DocumentBuilder()
   .setVersion('1.0')
   .addTag('application')
   .addTag('payment')
+  .addBearerAuth()
   .build()
diff --git a/apps/application-system/form/src/routes/Applications.tsx b/apps/application-system/form/src/routes/Applications.tsx
index 476497479022..f89bb22513f3 100644
--- a/apps/application-system/form/src/routes/Applications.tsx
+++ b/apps/application-system/form/src/routes/Applications.tsx
@@ -197,7 +197,9 @@ export const Applications: FC<React.PropsWithChildren<unknown>> = () => {
               flexDirection={['column', 'row']}
             >
               <Text variant="h1">
-                {formatMessage(coreMessages.applications)}
+                {template.applicationText
+                  ? formatMessage(template.applicationText)
+                  : formatMessage(coreMessages.applications)}
               </Text>
               {shouldRenderNewApplicationButton ? (
                 <Box marginTop={[2, 0]}>
@@ -205,7 +207,9 @@ export const Applications: FC<React.PropsWithChildren<unknown>> = () => {
                     onClick={createApplication}
                     data-testid="create-new-application"
                   >
-                    {formatMessage(coreMessages.newApplication)}
+                    {template.newApplicationButtonLabel
+                      ? formatMessage(template.newApplicationButtonLabel)
+                      : formatMessage(coreMessages.newApplication)}
                   </Button>
                 </Box>
               ) : null}
diff --git a/apps/financial-aid/backend/src/app/modules/file/cloudFront.service.ts b/apps/financial-aid/backend/src/app/modules/file/cloudFront.service.ts
index cdbd152549ff..b059bd58e971 100644
--- a/apps/financial-aid/backend/src/app/modules/file/cloudFront.service.ts
+++ b/apps/financial-aid/backend/src/app/modules/file/cloudFront.service.ts
@@ -1,19 +1,28 @@
-import { getSignedUrl } from '@aws-sdk/cloudfront-signer'
+import { CloudFront } from 'aws-sdk'
+
 import { Injectable } from '@nestjs/common'
+
 import { environment } from '../../../environments'
 
 @Injectable()
 export class CloudFrontService {
+  private readonly signer: CloudFront.Signer
+
+  constructor() {
+    this.signer = new CloudFront.Signer(
+      environment.files.cloudFrontPublicKeyId,
+      environment.files.cloudFrontPrivateKey,
+    )
+  }
+
   createPresignedPost(url: string): string {
     const expiresInSeconds = environment.files.postTimeToLiveMinutes * 60
 
-    const expiresAt = new Date(Date.now() + expiresInSeconds * 1000)
+    const expires = Math.floor((Date.now() + expiresInSeconds * 1000) / 1000)
 
-    return getSignedUrl({
-      keyPairId: environment.files.cloudFrontPublicKeyId,
-      privateKey: environment.files.cloudFrontPrivateKey,
-      dateLessThan: expiresAt.toISOString(),
+    return this.signer.getSignedUrl({
       url,
+      expires,
     })
   }
 }
diff --git a/apps/github-actions-cache/docker-compose.yml b/apps/github-actions-cache/docker-compose.yml
index 3b2fefe9d393..effe31dfc563 100644
--- a/apps/github-actions-cache/docker-compose.yml
+++ b/apps/github-actions-cache/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.3'
 services:
   redis-cluster:
     container_name: gha_cache_redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     privileged: true
     environment:
       - IP=0.0.0.0
diff --git a/apps/github-actions-cache/src/app/external.ts b/apps/github-actions-cache/src/app/external.ts
index 49fdd2cc927e..24a2ce551f0d 100644
--- a/apps/github-actions-cache/src/app/external.ts
+++ b/apps/github-actions-cache/src/app/external.ts
@@ -1,9 +1,9 @@
-import { S3Client } from '@aws-sdk/client-s3'
+import { S3 } from 'aws-sdk'
 import environment from '../environments/environment'
 import { createCache } from '@island.is/cache'
 
 const { redis, production } = environment
-export const s3 = new S3Client()
+export const s3 = new S3({ region: 'eu-west-1' })
 export const cache = createCache({
   name: 'github-actions-cache',
   nodes: redis.urls,
diff --git a/apps/github-actions-cache/src/app/handlers.ts b/apps/github-actions-cache/src/app/handlers.ts
index fa500023eade..0c7f0b5732ca 100644
--- a/apps/github-actions-cache/src/app/handlers.ts
+++ b/apps/github-actions-cache/src/app/handlers.ts
@@ -9,16 +9,8 @@ import {
   GetContentInfoError,
 } from './utils'
 import { cache, s3 } from './external'
-import {
-  CompleteMultipartUploadCommand,
-  CreateMultipartUploadCommand,
-  GetObjectCommand,
-  HeadObjectCommand,
-} from '@aws-sdk/client-s3'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 
 const { bucket } = environment
-const SIGNED_URL_TTL = 60
 
 export const reserveCache = async (
   req: express.Request,
@@ -45,9 +37,7 @@ export const reserveCache = async (
     // Invalidate reservation after 300 seconds
     await cache.expire(cacheId, 300)
     logger.debug(`Creating multipartupload for ${cacheId}`)
-    const { UploadId } = await s3.send(
-      new CreateMultipartUploadCommand(objectParams),
-    )
+    const { UploadId } = await s3.createMultipartUpload(objectParams).promise()
     if (!UploadId) {
       throw new Error('No upload id received from createMultipartUpload')
     }
@@ -108,7 +98,7 @@ export const uploadChunk = async (
 export const commitCache = async (
   req: express.Request,
   res: express.Response,
-  _next: express.NextFunction,
+  next: express.NextFunction,
 ) => {
   const { cacheId } = req.params
   logger.debug(`Finalizing cache upload for ${cacheId}`)
@@ -131,14 +121,14 @@ export const commitCache = async (
     Parts: uploadMap.map((item) => JSON.parse(item)),
   }
   logger.debug(`Completing multipartupload with map`, MultipartUpload)
-  await s3.send(
-    new CompleteMultipartUploadCommand({
+  await s3
+    .completeMultipartUpload({
       Bucket: bucket,
       Key: cacheId,
       MultipartUpload,
       UploadId: uploadId,
-    }),
-  )
+    })
+    .promise()
   cache.expire(cacheId, 1)
   res.sendStatus(200)
 }
@@ -160,20 +150,15 @@ export const retrieveCache = async (
     Key: cacheId,
   }
   try {
-    await s3.send(new HeadObjectCommand(objectParams))
+    const h = await s3.headObject(objectParams).promise()
   } catch (e) {
     return error(res, `Cache entry ${cacheId} not found!`, 404)
   }
   try {
-    // See migration docs
-    // https://github.com/aws/aws-sdk-js-v3/blob/794a37e9795f390d15c9530209e465d099716c86/UPGRADING.md#s3-presigned-url
-    const signedUrl = await getSignedUrl(
-      s3,
-      new GetObjectCommand(objectParams),
-      {
-        expiresIn: SIGNED_URL_TTL,
-      },
-    )
+    const signedUrl = await s3.getSignedUrlPromise('getObject', {
+      ...objectParams,
+      Expires: 60,
+    })
     logger.info(`Signed url: ${signedUrl}`)
     res.send({ archiveLocation: signedUrl, cacheKey: keys as string })
   } catch (e) {
diff --git a/apps/github-actions-cache/src/app/utils.ts b/apps/github-actions-cache/src/app/utils.ts
index 2a00171dc591..56b9894ba786 100644
--- a/apps/github-actions-cache/src/app/utils.ts
+++ b/apps/github-actions-cache/src/app/utils.ts
@@ -1,5 +1,5 @@
 import * as express from 'express'
-import { S3Client, UploadPartCommand } from '@aws-sdk/client-s3'
+import { S3 } from 'aws-sdk'
 import { logger } from '@island.is/logging'
 
 import stream from 'stream'
@@ -17,7 +17,7 @@ export const getCacheId = (key: string, version: string) =>
 const uploadChunkSize = 32 * 1024 * 1024
 
 export const uploadChunkStream = (
-  s3: S3Client,
+  s3: S3,
   Bucket: string,
   UploadId: string,
   key: string,
@@ -27,16 +27,16 @@ export const uploadChunkStream = (
   const pass = new stream.PassThrough()
   return {
     writeStream: pass,
-    promise: s3.send(
-      new UploadPartCommand({
+    promise: s3
+      .uploadPart({
         Body: pass,
         Bucket,
         Key: key,
         PartNumber,
         ContentLength,
         UploadId,
-      }),
-    ),
+      })
+      .promise(),
   }
 }
 
diff --git a/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts b/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts
index e345c8eb040b..40e3ff319e56 100644
--- a/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts
+++ b/apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts
@@ -118,8 +118,10 @@ export const getIndictmentInfo = (
   ).toISOString()
 
   if (defendants) {
-    const verdictViewDates = defendants?.map(
-      (defendant) => defendant.verdictViewDate,
+    const verdictViewDates = defendants?.map((defendant) =>
+      defendant.verdictViewDate
+        ? new Date(defendant.verdictViewDate)
+        : undefined,
     )
 
     const verdictAppealDeadline =
diff --git a/apps/judicial-system/api/src/app/modules/file/dto/createFile.input.ts b/apps/judicial-system/api/src/app/modules/file/dto/createFile.input.ts
index ec1b593eb949..51137a3310e5 100644
--- a/apps/judicial-system/api/src/app/modules/file/dto/createFile.input.ts
+++ b/apps/judicial-system/api/src/app/modules/file/dto/createFile.input.ts
@@ -65,4 +65,9 @@ export class CreateFileInput {
   @IsOptional()
   @Field(() => String, { nullable: true })
   readonly policeFileId?: string
+
+  @Allow()
+  @IsOptional()
+  @Field(() => String, { nullable: true })
+  readonly userGeneratedFilename?: string
 }
diff --git a/apps/judicial-system/api/src/app/modules/file/models/file.model.ts b/apps/judicial-system/api/src/app/modules/file/models/file.model.ts
index cb7c9c13c2b6..f7d619e9cc34 100644
--- a/apps/judicial-system/api/src/app/modules/file/models/file.model.ts
+++ b/apps/judicial-system/api/src/app/modules/file/models/file.model.ts
@@ -57,4 +57,7 @@ export class CaseFile {
 
   @Field(() => String, { nullable: true })
   readonly policeFileId?: string
+
+  @Field(() => String, { nullable: true })
+  readonly submittedBy?: string
 }
diff --git a/apps/judicial-system/backend/src/app/formatters/formatters.ts b/apps/judicial-system/backend/src/app/formatters/formatters.ts
index 7133cdac313f..babb0c0da5e6 100644
--- a/apps/judicial-system/backend/src/app/formatters/formatters.ts
+++ b/apps/judicial-system/backend/src/app/formatters/formatters.ts
@@ -19,6 +19,7 @@ import {
   CaseCustodyRestrictions,
   CaseLegalProvisions,
   CaseType,
+  courtSessionTypeNames,
   isIndictmentCase,
   isInvestigationCase,
   isRestrictionCase,
@@ -249,6 +250,9 @@ export const formatPostponedCourtDateEmailNotification = (
     courtName: theCase.court?.name ?? '',
     courtCaseNumber: theCase.courtCaseNumber,
     courtDate: formatDate(courtDate.date, 'PPPp')?.replace(' kl.', ', kl.'),
+    courtSessionTypeName: theCase.courtSessionType
+      ? courtSessionTypeNames[theCase.courtSessionType]
+      : 'Óþekkt',
     courtRoomText,
     judgeText,
     hasAccessToRvg: Boolean(overviewUrl),
diff --git a/apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts b/apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts
index 0229097bc1c0..40af05fe4ba9 100644
--- a/apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts
+++ b/apps/judicial-system/backend/src/app/formatters/subpoenaPdf.ts
@@ -7,12 +7,7 @@ import {
   formatDOB,
   lowercase,
 } from '@island.is/judicial-system/formatters'
-import {
-  DateType,
-  DistrictCourtLocation,
-  DistrictCourts,
-  SubpoenaType,
-} from '@island.is/judicial-system/types'
+import { DateType, SubpoenaType } from '@island.is/judicial-system/types'
 
 import { subpoena as strings } from '../messages'
 import { Case } from '../modules/case'
@@ -27,6 +22,28 @@ import {
   setTitle,
 } from './pdfHelpers'
 
+type DistrictCourts =
+  | 'Héraðsdómur Reykjavíkur'
+  | 'Héraðsdómur Reykjaness'
+  | 'Héraðsdómur Vesturlands'
+  | 'Héraðsdómur Vestfjarða'
+  | 'Héraðsdómur Norðurlands vestra'
+  | 'Héraðsdómur Norðurlands eystra'
+  | 'Héraðsdómur Austurlands'
+  | 'Héraðsdómur Suðurlands'
+
+// TODO: Move to databas
+const DistrictCourtLocation: Record<DistrictCourts, string> = {
+  'Héraðsdómur Reykjavíkur': 'Dómhúsið við Lækjartorg, Reykjavík',
+  'Héraðsdómur Reykjaness': 'Fjarðargata 9, Hafnarfirði',
+  'Héraðsdómur Vesturlands': 'Bjarnarbraut 8, Borgarnesi',
+  'Héraðsdómur Vestfjarða': 'Hafnarstræti 9, Ísafirði',
+  'Héraðsdómur Norðurlands vestra': 'Skagfirðingabraut 21, Sauðárkróki',
+  'Héraðsdómur Norðurlands eystra': 'Hafnarstræti 107, 4. hæð, Akureyri',
+  'Héraðsdómur Austurlands': 'Lyngás 15, Egilsstöðum',
+  'Héraðsdómur Suðurlands': 'Austurvegur 4, Selfossi',
+}
+
 export const createSubpoena = (
   theCase: Case,
   defendant: Defendant,
diff --git a/apps/judicial-system/backend/src/app/messages/notifications.ts b/apps/judicial-system/backend/src/app/messages/notifications.ts
index c64652bb07d0..a8868a3b3595 100644
--- a/apps/judicial-system/backend/src/app/messages/notifications.ts
+++ b/apps/judicial-system/backend/src/app/messages/notifications.ts
@@ -195,15 +195,15 @@ export const notifications = {
   }),
   postponedCourtDateEmail: defineMessages({
     subject: {
-      id: 'judicial.system.backend:notifications.postponed_court_date_email.subject',
-      defaultMessage: 'Frestun - nýtt þinghald í máli {courtCaseNumber}',
+      id: 'judicial.system.backend:notifications.postponed_court_date_email.subject_v1',
+      defaultMessage: 'Nýtt þinghald í máli {courtCaseNumber}',
       description:
         'Notaður sem titill á pósti til sækjanda og verjenda þegar þinghaldi er frestað',
     },
     body: {
-      id: 'judicial.system.backend:notifications.postponed_court_date_email.body_v3',
+      id: 'judicial.system.backend:notifications.postponed_court_date_email.body_v4',
       defaultMessage:
-        '{courtName} boðar til þinghalds í máli {courtCaseNumber}.<br />Fyrirtaka mun fara fram {courtDate}.<br /><br />{courtRoomText}<br /><br />{judgeText}<br /><br />{hasAccessToRvg, select, false {Hægt er að nálgast gögn málsins hjá {courtName}} other {Hægt er að nálgast gögn málsins á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}}}.',
+        '{courtName} boðar til þinghalds í máli {courtCaseNumber}.<br />Fyrirtaka mun fara fram {courtDate}.<br /><br />Tegund þinghalds: {courtSessionTypeName}.<br /><br />{courtRoomText}<br /><br />{judgeText}<br /><br />{hasAccessToRvg, select, false {Hægt er að nálgast gögn málsins hjá {courtName}} other {Hægt er að nálgast gögn málsins á {linkStart}yfirlitssíðu málsins í Réttarvörslugátt{linkEnd}}}.',
       description:
         'Notaður sem texti á pósti til sækjanda og verjenda þegar þinghaldi er frestað',
     },
@@ -221,7 +221,7 @@ export const notifications = {
       defaultMessage:
         '{court} boðar til þingfestingar í máli {courtCaseNumber}.',
       description:
-        'Notaður sem texti í pósti sem tilgreinir að dómstól boði til þingfestingar',
+        'Notaður sem texti í pósti sem tilgreinir að dómstóll boði til þingfestingar',
     },
     courtDate: {
       id: 'judicial.system.backend:notifications.prosecutor_court_date_email.court_date',
diff --git a/apps/judicial-system/backend/src/app/modules/aws-s3/awsS3.service.ts b/apps/judicial-system/backend/src/app/modules/aws-s3/awsS3.service.ts
index 472635873cfb..04c57cf5f55e 100644
--- a/apps/judicial-system/backend/src/app/modules/aws-s3/awsS3.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/aws-s3/awsS3.service.ts
@@ -1,12 +1,4 @@
-import {
-  DeleteObjectCommand,
-  GetObjectCommand,
-  HeadObjectCommand,
-  PutObjectCommand,
-  S3Client,
-} from '@aws-sdk/client-s3'
-import { createPresignedPost } from '@aws-sdk/s3-presigned-post'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { S3 } from 'aws-sdk'
 
 import { Inject, Injectable } from '@nestjs/common'
 
@@ -45,66 +37,72 @@ const formatS3Key = (caseType: CaseType, key: string) => {
 
 @Injectable()
 export class AwsS3Service {
-  private readonly s3Client: S3Client
+  private readonly s3: S3
 
   constructor(
     @Inject(awsS3ModuleConfig.KEY)
     private readonly config: ConfigType<typeof awsS3ModuleConfig>,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
   ) {
-    this.s3Client = new S3Client({ region: this.config.region })
+    this.s3 = new S3({ region: this.config.region })
   }
 
-  async createPresignedPost(
+  createPresignedPost(
     caseType: CaseType,
     key: string,
     type: string,
-  ): Promise<{ url: string; fields: Record<string, string> }> {
-    const { url, fields } = await createPresignedPost(this.s3Client, {
-      Bucket: this.config.bucket,
-      Key: formatS3Key(caseType, key),
-      Conditions: [
-        ['content-length-range', 0, 104857600], // 100 MB
-        ['starts-with', '$Content-Type', type],
-      ],
-      Fields: {
-        'content-type': type,
-        'Content-Disposition': 'inline',
-      },
-      Expires: this.config.timeToLivePost,
+  ): Promise<S3.PresignedPost> {
+    return new Promise((resolve, reject) => {
+      this.s3.createPresignedPost(
+        {
+          Bucket: this.config.bucket,
+          Expires: this.config.timeToLivePost,
+          Fields: {
+            key: formatS3Key(caseType, key),
+            'content-type': type,
+            'Content-Disposition': 'inline',
+          },
+        },
+        (err, data) => {
+          if (err) {
+            reject(err)
+          } else {
+            resolve(data)
+          }
+        },
+      )
     })
-
-    return { url, fields }
   }
 
-  async objectExists(caseType: CaseType, key: string): Promise<boolean> {
-    try {
-      await this.s3Client.send(
-        new HeadObjectCommand({
-          Bucket: this.config.bucket,
-          Key: formatS3Key(caseType, key),
-        }),
+  objectExists(caseType: CaseType, key: string): Promise<boolean> {
+    return this.s3
+      .headObject({
+        Bucket: this.config.bucket,
+        Key: formatS3Key(caseType, key),
+      })
+      .promise()
+      .then(
+        () => true,
+        () => {
+          // The error is either 404 Not Found or 403 Forbidden.
+          // Normally, we would check if the error is 404 Not Found.
+          // However, to avoid granting the service ListBucket permissions,
+          // we also allow 403 Forbidden.
+          return false
+        },
       )
-      return true
-    } catch (error) {
-      // The error is either 404 Not Found or 403 Forbidden.
-      // Normally, we would check if the error is 404 Not Found.
-      // However, to avoid granting the service ListBucket permissions,
-      // we also allow 403 Forbidden.
-      return false
-    }
   }
 
   private async putObjectToS3(key: string, content: string): Promise<string> {
-    await this.s3Client.send(
-      new PutObjectCommand({
+    return this.s3
+      .putObject({
         Bucket: this.config.bucket,
         Key: key,
         Body: Buffer.from(content, 'binary'),
         ContentType: 'application/pdf',
-      }),
-    )
-    return key
+      })
+      .promise()
+      .then(() => key)
   }
 
   putObject(caseType: CaseType, key: string, content: string): Promise<string> {
@@ -123,7 +121,7 @@ export class AwsS3Service {
     return this.putObjectToS3(formatGeneratedRequestCaseKey(key), content)
   }
 
-  async getSignedUrl(
+  getSignedUrl(
     caseType: CaseType,
     key?: string,
     timeToLive?: number,
@@ -132,13 +130,22 @@ export class AwsS3Service {
       throw new Error('Key is required')
     }
 
-    const command = new GetObjectCommand({
-      Bucket: this.config.bucket,
-      Key: formatS3Key(caseType, key),
-    })
-
-    return getSignedUrl(this.s3Client, command, {
-      expiresIn: timeToLive ?? this.config.timeToLiveGet,
+    return new Promise((resolve, reject) => {
+      this.s3.getSignedUrl(
+        'getObject',
+        {
+          Bucket: this.config.bucket,
+          Key: formatS3Key(caseType, key),
+          Expires: timeToLive ?? this.config.timeToLiveGet,
+        },
+        (err, url) => {
+          if (err) {
+            reject(err)
+          } else {
+            resolve(url)
+          }
+        },
+      )
     })
   }
 
@@ -177,17 +184,13 @@ export class AwsS3Service {
   }
 
   private async getObjectFromS3(key: string): Promise<Buffer> {
-    const { Body } = await this.s3Client.send(
-      new GetObjectCommand({
+    return this.s3
+      .getObject({
         Bucket: this.config.bucket,
         Key: key,
-      }),
-    )
-    if (!Body) {
-      this.logger.error(`Failure when getting object from S3`, { key })
-      throw new Error('Failure when getting object from S3')
-    }
-    return Buffer.from(await Body.transformToByteArray())
+      })
+      .promise()
+      .then((data) => data.Body as Buffer)
   }
 
   async getObject(caseType: CaseType, key?: string): Promise<Buffer> {
@@ -245,21 +248,21 @@ export class AwsS3Service {
   async deleteObject(caseType: CaseType, key: string): Promise<boolean> {
     const s3Key = formatS3Key(caseType, key)
 
-    try {
-      await this.s3Client.send(
-        new DeleteObjectCommand({
-          Bucket: this.config.bucket,
-          Key: s3Key,
-        }),
-      )
-      return true
-    } catch (error) {
-      // Tolerate failure, but log error
-      this.logger.error(`Failed to delete object ${s3Key} from AWS S3`, {
-        reason: error,
+    return this.s3
+      .deleteObject({
+        Bucket: this.config.bucket,
+        Key: s3Key,
+      })
+      .promise()
+      .then(() => true)
+      .catch((reason) => {
+        // Tolerate failure, but log error
+        this.logger.error(`Failed to delete object ${s3Key} from AWS S3`, {
+          reason,
+        })
+
+        return false
       })
-      return false
-    }
   }
 
   deleteConfirmedIndictmentCaseObject(
diff --git a/apps/judicial-system/backend/src/app/modules/case/case.controller.ts b/apps/judicial-system/backend/src/app/modules/case/case.controller.ts
index 954025e9b815..cca384ac525a 100644
--- a/apps/judicial-system/backend/src/app/modules/case/case.controller.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/case.controller.ts
@@ -150,7 +150,7 @@ export class CaseController {
 
     const createdCase = await this.caseService.create(caseToCreate, user)
 
-    this.eventService.postEvent(CaseEvent.CREATE, createdCase as Case)
+    this.eventService.postEvent('CREATE', createdCase)
 
     return createdCase
   }
@@ -419,10 +419,7 @@ export class CaseController {
     )
 
     // No need to wait
-    this.eventService.postEvent(
-      transition.transition as unknown as CaseEvent,
-      updatedCase ?? theCase,
-    )
+    this.eventService.postEvent(transition.transition, updatedCase ?? theCase)
 
     return updatedCase ?? theCase
   }
@@ -891,7 +888,7 @@ export class CaseController {
 
     const extendedCase = await this.caseService.extend(theCase, user)
 
-    this.eventService.postEvent(CaseEvent.EXTEND, extendedCase as Case)
+    this.eventService.postEvent('EXTEND', extendedCase as Case)
 
     return extendedCase
   }
diff --git a/apps/judicial-system/backend/src/app/modules/case/case.service.ts b/apps/judicial-system/backend/src/app/modules/case/case.service.ts
index faaa1375015f..65a7daca3a84 100644
--- a/apps/judicial-system/backend/src/app/modules/case/case.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/case.service.ts
@@ -1671,7 +1671,7 @@ export class CaseService {
         await this.addMessagesForUpdatedCaseToQueue(theCase, updatedCase, user)
 
         if (receivingCase) {
-          this.eventService.postEvent(CaseEvent.RECEIVE, updatedCase)
+          this.eventService.postEvent(CaseTransition.RECEIVE, updatedCase)
         }
 
         if (returnUpdatedCase) {
diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts b/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts
index 8d6c854a4578..d49a4ea4a964 100644
--- a/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts
@@ -24,6 +24,7 @@ import {
 
 import { nowFactory } from '../../../factories'
 import { Case } from '../models/case.model'
+import { DateLog } from '../models/dateLog.model'
 
 const canProsecutionUserAccessCase = (
   theCase: Case,
@@ -185,8 +186,8 @@ const canPrisonSystemUserAccessCase = (
   // Check case type access
   if (user.institution?.type === InstitutionType.PRISON_ADMIN) {
     if (isIndictmentCase(theCase.type)) {
-      const verdictViewDates = theCase.defendants?.map((defendant) =>
-        defendant.verdictViewDate?.toISOString(),
+      const verdictViewDates = theCase.defendants?.map(
+        (defendant) => defendant.verdictViewDate,
       )
 
       const indictmentVerdictAppealDeadline =
@@ -269,9 +270,7 @@ const canDefenceUserAccessCase = (theCase: Case, user: User): boolean => {
     return false
   }
 
-  const arraignmentDate = theCase.dateLogs?.find(
-    (d) => d.dateType === DateType.ARRAIGNMENT_DATE,
-  )?.date
+  const arraignmentDate = DateLog.arraignmentDate(theCase.dateLogs)
 
   // Check submitted case access
   const canDefenderAccessSubmittedCase =
diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts b/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
index d3fe3fb0aa59..c4bfe1eb6331 100644
--- a/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts
@@ -263,9 +263,7 @@ const getDefenceUserCasesQueryFilter = (user: User): WhereOptions => {
               ],
             },
             {
-              defender_national_id: {
-                [Op.or]: [user.nationalId, formattedNationalId],
-              },
+              defender_national_id: [user.nationalId, formattedNationalId],
             },
           ],
         },
@@ -280,9 +278,10 @@ const getDefenceUserCasesQueryFilter = (user: User): WhereOptions => {
               ],
             },
             {
-              '$defendants.defender_national_id$': {
-                [Op.or]: [user.nationalId, formattedNationalId],
-              },
+              '$defendants.defender_national_id$': [
+                user.nationalId,
+                formattedNationalId,
+              ],
             },
           ],
         },
diff --git a/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts b/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
index a698194f4ce3..8c93ddecc010 100644
--- a/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts
@@ -446,9 +446,7 @@ describe('getCasesQueryFilter', () => {
                   ],
                 },
                 {
-                  defender_national_id: {
-                    [Op.or]: [user.nationalId, user.nationalId],
-                  },
+                  defender_national_id: [user.nationalId, user.nationalId],
                 },
               ],
             },
@@ -463,9 +461,10 @@ describe('getCasesQueryFilter', () => {
                   ],
                 },
                 {
-                  '$defendants.defender_national_id$': {
-                    [Op.or]: [user.nationalId, user.nationalId],
-                  },
+                  '$defendants.defender_national_id$': [
+                    user.nationalId,
+                    user.nationalId,
+                  ],
                 },
               ],
             },
diff --git a/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts b/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts
index 0f49489d0179..9149585ce497 100644
--- a/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts
@@ -54,7 +54,7 @@ export class InternalCaseController {
 
     const createdCase = await this.internalCaseService.create(caseToCreate)
 
-    this.eventService.postEvent(CaseEvent.CREATE_XRD, createdCase as Case)
+    this.eventService.postEvent('CREATE_XRD', createdCase as Case)
 
     return createdCase
   }
diff --git a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
index 1947fce47527..ebee2422a741 100644
--- a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
@@ -511,7 +511,7 @@ export class InternalCaseService {
       )
     })
 
-    this.eventService.postEvent(CaseEvent.ARCHIVE, theCase)
+    this.eventService.postEvent('ARCHIVE', theCase)
 
     return { caseArchived: true }
   }
diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.controller.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.controller.ts
index aee8f67f1e40..7e17c55bab85 100644
--- a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.controller.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.controller.ts
@@ -182,10 +182,7 @@ export class LimitedAccessCaseController {
       user,
     )
 
-    this.eventService.postEvent(
-      transition.transition as unknown as CaseEvent,
-      updatedCase,
-    )
+    this.eventService.postEvent(transition.transition, updatedCase)
 
     return updatedCase
   }
diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
index 098b175f67ee..691c040563a7 100644
--- a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
@@ -192,6 +192,8 @@ export const include: Includeable[] = [
         CaseFileCategory.COST_BREAKDOWN,
         CaseFileCategory.CASE_FILE,
         CaseFileCategory.CASE_FILE_RECORD,
+        CaseFileCategory.PROSECUTOR_CASE_FILE,
+        CaseFileCategory.DEFENDANT_CASE_FILE,
       ],
     },
   },
diff --git a/apps/judicial-system/backend/src/app/modules/defendant/defendant.controller.ts b/apps/judicial-system/backend/src/app/modules/defendant/defendant.controller.ts
index 3f45b1d50d1b..5905ae989067 100644
--- a/apps/judicial-system/backend/src/app/modules/defendant/defendant.controller.ts
+++ b/apps/judicial-system/backend/src/app/modules/defendant/defendant.controller.ts
@@ -27,6 +27,7 @@ import {
 } from '@island.is/judicial-system/auth'
 import {
   indictmentCases,
+  ServiceRequirement,
   SubpoenaType,
   type User,
 } from '@island.is/judicial-system/types'
@@ -108,6 +109,17 @@ export class DefendantController {
   ): Promise<Defendant> {
     this.logger.debug(`Updating defendant ${defendantId} of case ${caseId}`)
 
+    // If the defendant was present at the court hearing,
+    // then set the verdict view date to the case ruling date
+    if (
+      defendantToUpdate.serviceRequirement === ServiceRequirement.NOT_APPLICABLE
+    ) {
+      defendantToUpdate = {
+        ...defendantToUpdate,
+        verdictViewDate: theCase.rulingDate,
+      }
+    }
+
     return this.defendantService.update(
       theCase,
       defendant,
diff --git a/apps/judicial-system/backend/src/app/modules/event/event.service.ts b/apps/judicial-system/backend/src/app/modules/event/event.service.ts
index ce212f4a386e..e66825a614af 100644
--- a/apps/judicial-system/backend/src/app/modules/event/event.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/event/event.service.ts
@@ -12,7 +12,10 @@ import {
   formatDate,
   readableIndictmentSubtypes,
 } from '@island.is/judicial-system/formatters'
-import { isIndictmentCase } from '@island.is/judicial-system/types'
+import {
+  CaseTransition,
+  isIndictmentCase,
+} from '@island.is/judicial-system/types'
 
 import { type Case } from '../case'
 import { DateLog } from '../case/models/dateLog.model'
@@ -37,50 +40,42 @@ const errorEmojis = [
   ':x:',
 ]
 
-const caseEvent = {
+const caseEvent: Record<CaseEvent, string> = {
+  [CaseTransition.ACCEPT]: ':white_check_mark: Samþykkt',
+  [CaseTransition.APPEAL]: ':judge: Kæra',
+  ARCHIVE: ':file_cabinet: Sett í geymslu',
+  [CaseTransition.ASK_FOR_CANCELLATION]: ':interrobang: Beðið um aftuköllun',
+  [CaseTransition.ASK_FOR_CONFIRMATION]: ':question: Beðið um staðfestingu',
+  [CaseTransition.COMPLETE]: ':white_check_mark: Lokið',
+  [CaseTransition.COMPLETE_APPEAL]: ':white_check_mark: Kæru lokið',
+  [CaseTransition.DELETE]: ':fire: Afturkallað',
+  [CaseTransition.DENY_INDICTMENT]: ':no_entry_sign: Ákæru hafnað',
+  [CaseTransition.DISMISS]: ':woman-shrugging: Vísað frá',
   CREATE: ':new: Mál stofnað',
   CREATE_XRD: ':new: Mál stofnað í gegnum Strauminn',
   EXTEND: ':recycle: Mál framlengt',
-  OPEN: ':unlock: Opnað fyrir dómstól',
-  ASK_FOR_CONFIRMATION: ':question: Beðið um staðfestingu',
-  SUBMIT: ':mailbox_with_mail: Sent',
+  [CaseTransition.OPEN]: ':unlock: Opnað fyrir dómstól',
+  [CaseTransition.RECEIVE]: ':eyes: Móttekið',
+  [CaseTransition.RECEIVE_APPEAL]: ':eyes: Kæra móttekin',
+  [CaseTransition.REJECT]: ':negative_squared_cross_mark: Hafnað',
+  [CaseTransition.REOPEN]: ':construction: Opnað aftur',
+  [CaseTransition.REOPEN_APPEAL]: ':building_construction: Kæra opnuð aftur',
   RESUBMIT: ':mailbox_with_mail: Sent aftur',
-  RECEIVE: ':eyes: Móttekið',
-  ACCEPT: ':white_check_mark: Samþykkt',
-  REJECT: ':negative_squared_cross_mark: Hafnað',
-  DISMISS: ':woman-shrugging: Vísað frá',
-  COMPLETE: ':white_check_mark: Lokið',
-  DELETE: ':fire: Afturkallað',
+  [CaseTransition.RETURN_INDICTMENT]: ':woman-gesturing-no: Ákæru afturkallað',
   SCHEDULE_COURT_DATE: ':timer_clock: Fyrirtökutíma úthlutað',
-  ARCHIVE: ':file_cabinet: Sett í geymslu',
-  REOPEN: ':construction: Opnað aftur',
-  APPEAL: ':judge: Kæra',
-  RECEIVE_APPEAL: ':eyes: Kæra móttekin',
-  COMPLETE_APPEAL: ':white_check_mark: Kæru lokið',
-  REOPEN_APPEAL: ':building_construction: Kæra opnuð aftur',
+  [CaseTransition.SUBMIT]: ':mailbox_with_mail: Sent',
+  [CaseTransition.WITHDRAW_APPEAL]:
+    ':leftwards_arrow_with_hook: Kæru afturkallað',
 }
 
-export enum CaseEvent {
-  CREATE = 'CREATE',
-  CREATE_XRD = 'CREATE_XRD',
-  EXTEND = 'EXTEND',
-  OPEN = 'OPEN',
-  ASK_FOR_CONFIRMATION = 'ASK_FOR_CONFIRMATION',
-  SUBMIT = 'SUBMIT',
-  RESUBMIT = 'RESUBMIT',
-  RECEIVE = 'RECEIVE',
-  ACCEPT = 'ACCEPT',
-  REJECT = 'REJECT',
-  DELETE = 'DELETE',
-  SCHEDULE_COURT_DATE = 'SCHEDULE_COURT_DATE',
-  DISMISS = 'DISMISS',
-  ARCHIVE = 'ARCHIVE',
-  REOPEN = 'REOPEN',
-  APPEAL = 'APPEAL',
-  RECEIVE_APPEAL = 'RECEIVE_APPEAL',
-  COMPLETE_APPEAL = 'COMPLETE_APPEAL',
-  REOPEN_APPEAL = 'REOPEN_APPEAL',
-}
+export type CaseEvent =
+  | CaseTransition
+  | 'ARCHIVE'
+  | 'CREATE'
+  | 'CREATE_XRD'
+  | 'EXTEND'
+  | 'RESUBMIT'
+  | 'SCHEDULE_COURT_DATE'
 
 @Injectable()
 export class EventService {
@@ -120,7 +115,7 @@ export class EventService {
         ? `\n>Landsréttur *${theCase.appealCaseNumber}*`
         : ''
       const extraText =
-        event === CaseEvent.SCHEDULE_COURT_DATE
+        event === 'SCHEDULE_COURT_DATE'
           ? `\n>Dómari ${
               theCase.judge?.name ?? 'er ekki skráður'
             }\n>Dómritari ${
diff --git a/apps/judicial-system/backend/src/app/modules/file/dto/createFile.dto.ts b/apps/judicial-system/backend/src/app/modules/file/dto/createFile.dto.ts
index d96df0d3d238..de31caf5e46b 100644
--- a/apps/judicial-system/backend/src/app/modules/file/dto/createFile.dto.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/dto/createFile.dto.ts
@@ -58,4 +58,9 @@ export class CreateFileDto {
   @IsString()
   @ApiPropertyOptional({ type: String })
   readonly policeFileId?: string
+
+  @IsOptional()
+  @IsString()
+  @ApiPropertyOptional({ type: String })
+  readonly userGeneratedFilename?: string
 }
diff --git a/apps/judicial-system/backend/src/app/modules/file/file.service.ts b/apps/judicial-system/backend/src/app/modules/file/file.service.ts
index ddcae8eed39f..5fa7a343528d 100644
--- a/apps/judicial-system/backend/src/app/modules/file/file.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/file.service.ts
@@ -308,7 +308,8 @@ export class FileService {
       state: CaseFileState.STORED_IN_RVG,
       caseId: theCase.id,
       name: fileName,
-      userGeneratedFilename: fileName.replace(/\.pdf$/, ''),
+      userGeneratedFilename:
+        createFile.userGeneratedFilename ?? fileName.replace(/\.pdf$/, ''),
       submittedBy: user.name,
     })
 
diff --git a/apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts b/apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts
index dd27353157d3..5455ad7976b0 100644
--- a/apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts
@@ -19,4 +19,6 @@ export const defenderCaseFileCategoriesForIndictmentCases = [
   CaseFileCategory.CRIMINAL_RECORD,
   CaseFileCategory.COST_BREAKDOWN,
   CaseFileCategory.CASE_FILE,
+  CaseFileCategory.PROSECUTOR_CASE_FILE,
+  CaseFileCategory.DEFENDANT_CASE_FILE,
 ]
diff --git a/apps/judicial-system/backend/src/app/modules/file/guards/limitedAccessWriteCaseFile.guard.ts b/apps/judicial-system/backend/src/app/modules/file/guards/limitedAccessWriteCaseFile.guard.ts
index 224cf0ed458d..42fb0abf30b7 100644
--- a/apps/judicial-system/backend/src/app/modules/file/guards/limitedAccessWriteCaseFile.guard.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/guards/limitedAccessWriteCaseFile.guard.ts
@@ -8,16 +8,24 @@ import {
 
 import {
   CaseFileCategory,
+  isIndictmentCase,
   User,
   UserRole,
 } from '@island.is/judicial-system/types'
 
+import { Case } from '../../case'
+
 @Injectable()
 export class LimitedAccessWriteCaseFileGuard implements CanActivate {
   canActivate(context: ExecutionContext): boolean {
     const request = context.switchToHttp().getRequest()
 
     const user: User = request.user
+    const theCase: Case = request.case
+
+    if (!theCase) {
+      throw new InternalServerErrorException('Missing case')
+    }
 
     if (!user) {
       throw new InternalServerErrorException('Missing user')
@@ -32,17 +40,22 @@ export class LimitedAccessWriteCaseFileGuard implements CanActivate {
       throw new InternalServerErrorException('Missing case file category')
     }
 
-    if (
-      user.role === UserRole.DEFENDER &&
-      [
-        CaseFileCategory.DEFENDANT_APPEAL_BRIEF,
-        CaseFileCategory.DEFENDANT_APPEAL_BRIEF_CASE_FILE,
-        CaseFileCategory.DEFENDANT_APPEAL_STATEMENT,
-        CaseFileCategory.DEFENDANT_APPEAL_STATEMENT_CASE_FILE,
-        CaseFileCategory.DEFENDANT_APPEAL_CASE_FILE,
-      ].includes(caseFileCategory)
-    ) {
-      return true
+    if (user.role === UserRole.DEFENDER) {
+      if (isIndictmentCase(theCase.type)) {
+        if (caseFileCategory === CaseFileCategory.DEFENDANT_CASE_FILE) {
+          return true
+        }
+      } else if (
+        [
+          CaseFileCategory.DEFENDANT_APPEAL_BRIEF,
+          CaseFileCategory.DEFENDANT_APPEAL_BRIEF_CASE_FILE,
+          CaseFileCategory.DEFENDANT_APPEAL_STATEMENT,
+          CaseFileCategory.DEFENDANT_APPEAL_STATEMENT_CASE_FILE,
+          CaseFileCategory.DEFENDANT_APPEAL_CASE_FILE,
+        ].includes(caseFileCategory)
+      ) {
+        return true
+      }
     }
 
     throw new ForbiddenException(`Forbidden for ${user.role}`)
diff --git a/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts b/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts
index e80074e5236a..dd31ac1d7816 100644
--- a/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts
@@ -158,6 +158,8 @@ describe('Limited Access View Case File Guard', () => {
           CaseFileCategory.CRIMINAL_RECORD,
           CaseFileCategory.COST_BREAKDOWN,
           CaseFileCategory.CASE_FILE,
+          CaseFileCategory.PROSECUTOR_CASE_FILE,
+          CaseFileCategory.DEFENDANT_CASE_FILE,
         ]
 
         describe.each(allowedCaseFileCategories)(
diff --git a/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessWriteCaseFileGuard.spec.ts b/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessWriteCaseFileGuard.spec.ts
index b4a05453cfa5..5b5854214b6f 100644
--- a/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessWriteCaseFileGuard.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessWriteCaseFileGuard.spec.ts
@@ -4,7 +4,11 @@ import {
   InternalServerErrorException,
 } from '@nestjs/common'
 
-import { CaseFileCategory, UserRole } from '@island.is/judicial-system/types'
+import {
+  CaseFileCategory,
+  CaseType,
+  UserRole,
+} from '@island.is/judicial-system/types'
 
 import { LimitedAccessWriteCaseFileGuard } from '../limitedAccessWriteCaseFile.guard'
 
@@ -52,6 +56,7 @@ describe('LimitedAccess Write Case File Guard', () => {
         beforeEach(() => {
           mockRequest.mockImplementationOnce(() => ({
             user: { role: UserRole.DEFENDER },
+            case: {},
             body: { category },
           }))
 
@@ -69,6 +74,7 @@ describe('LimitedAccess Write Case File Guard', () => {
         beforeEach(() => {
           mockRequest.mockImplementationOnce(() => ({
             user: { role: UserRole.DEFENDER },
+            case: {},
             caseFile: { category },
           }))
 
@@ -94,6 +100,7 @@ describe('LimitedAccess Write Case File Guard', () => {
       beforeEach(() => {
         mockRequest.mockImplementationOnce(() => ({
           user: { role: UserRole.DEFENDER },
+          case: {},
           body: { category },
         }))
 
@@ -112,6 +119,7 @@ describe('LimitedAccess Write Case File Guard', () => {
       beforeEach(() => {
         mockRequest.mockImplementationOnce(() => ({
           user: { role: UserRole.DEFENDER },
+          case: {},
           caseFile: { category },
         }))
 
@@ -137,6 +145,7 @@ describe('LimitedAccess Write Case File Guard', () => {
           beforeEach(() => {
             mockRequest.mockImplementationOnce(() => ({
               user: { role },
+              case: {},
               body: { category },
             }))
 
@@ -155,6 +164,7 @@ describe('LimitedAccess Write Case File Guard', () => {
           beforeEach(() => {
             mockRequest.mockImplementationOnce(() => ({
               user: { role },
+              case: {},
               caseFile: { category },
             }))
 
@@ -174,7 +184,7 @@ describe('LimitedAccess Write Case File Guard', () => {
     let then: Then
 
     beforeEach(() => {
-      mockRequest.mockImplementationOnce(() => ({}))
+      mockRequest.mockImplementationOnce(() => ({ case: {} }))
 
       then = givenWhenThen()
     })
@@ -185,6 +195,21 @@ describe('LimitedAccess Write Case File Guard', () => {
     })
   })
 
+  describe('missing case', () => {
+    let then: Then
+
+    beforeEach(() => {
+      mockRequest.mockImplementationOnce(() => ({ user: {} }))
+
+      then = givenWhenThen()
+    })
+
+    it('should throw InternalServerErrorException', () => {
+      expect(then.error).toBeInstanceOf(InternalServerErrorException)
+      expect(then.error.message).toBe('Missing case')
+    })
+  })
+
   describe('missing case file category', () => {
     let then: Then
 
@@ -199,4 +224,84 @@ describe('LimitedAccess Write Case File Guard', () => {
       expect(then.error.message).toBe('Missing case file category')
     })
   })
+
+  describe('a defender can view DEFENDANT_CASE_FILE in indictment cases', () => {
+    describe('when creating a case file', () => {
+      let then: Then
+
+      beforeEach(() => {
+        mockRequest.mockImplementationOnce(() => ({
+          user: { role: UserRole.DEFENDER },
+          case: { type: CaseType.INDICTMENT },
+          body: { category: CaseFileCategory.DEFENDANT_CASE_FILE },
+        }))
+
+        then = givenWhenThen()
+      })
+
+      it('should activate', () => {
+        expect(then.result).toBe(true)
+      })
+    })
+
+    describe('when deleting a case file', () => {
+      let then: Then
+
+      beforeEach(() => {
+        mockRequest.mockImplementationOnce(() => ({
+          user: { role: UserRole.DEFENDER },
+          case: { type: CaseType.INDICTMENT },
+          caseFile: { category: CaseFileCategory.DEFENDANT_CASE_FILE },
+        }))
+
+        then = givenWhenThen()
+      })
+
+      it('should activate', () => {
+        expect(then.result).toBe(true)
+      })
+    })
+  })
+
+  describe.each(
+    Object.keys(CaseType).filter((ct) => ct !== CaseType.INDICTMENT),
+  )('a defender can not view DEFENDANT_CASE_FILE in %s cases', (caseType) => {
+    describe('when creating a case file', () => {
+      let then: Then
+
+      beforeEach(() => {
+        mockRequest.mockImplementationOnce(() => ({
+          user: { role: UserRole.DEFENDER },
+          case: { type: caseType },
+          body: { category: CaseFileCategory.DEFENDANT_CASE_FILE },
+        }))
+
+        then = givenWhenThen()
+      })
+
+      it('should throw ForbiddenException', () => {
+        expect(then.error).toBeInstanceOf(ForbiddenException)
+        expect(then.error.message).toBe(`Forbidden for DEFENDER`)
+      })
+    })
+
+    describe('when deleting a case file', () => {
+      let then: Then
+
+      beforeEach(() => {
+        mockRequest.mockImplementationOnce(() => ({
+          user: { role: UserRole.DEFENDER },
+          case: { type: caseType },
+          caseFile: { category: CaseFileCategory.DEFENDANT_CASE_FILE },
+        }))
+
+        then = givenWhenThen()
+      })
+
+      it('should throw ForbiddenException', () => {
+        expect(then.error).toBeInstanceOf(ForbiddenException)
+        expect(then.error.message).toBe(`Forbidden for DEFENDER`)
+      })
+    })
+  })
 })
diff --git a/apps/judicial-system/backend/src/app/modules/file/limitedAccessFile.controller.ts b/apps/judicial-system/backend/src/app/modules/file/limitedAccessFile.controller.ts
index 3d8b09f65443..395a9ef78d84 100644
--- a/apps/judicial-system/backend/src/app/modules/file/limitedAccessFile.controller.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/limitedAccessFile.controller.ts
@@ -21,6 +21,7 @@ import {
 } from '@island.is/judicial-system/auth'
 import type { User } from '@island.is/judicial-system/types'
 import {
+  indictmentCases,
   investigationCases,
   restrictionCases,
 } from '@island.is/judicial-system/types'
@@ -57,9 +58,12 @@ export class LimitedAccessFileController {
   ) {}
 
   @UseGuards(
-    new CaseTypeGuard([...restrictionCases, ...investigationCases]),
+    new CaseTypeGuard([
+      ...restrictionCases,
+      ...investigationCases,
+      ...indictmentCases,
+    ]),
     CaseWriteGuard,
-    CaseCompletedGuard,
   )
   @RolesRules(defenderRule)
   @Post('file/url')
@@ -78,9 +82,12 @@ export class LimitedAccessFileController {
   }
 
   @UseGuards(
-    new CaseTypeGuard([...restrictionCases, ...investigationCases]),
+    new CaseTypeGuard([
+      ...restrictionCases,
+      ...investigationCases,
+      ...indictmentCases,
+    ]),
     CaseWriteGuard,
-    CaseCompletedGuard,
     LimitedAccessWriteCaseFileGuard,
   )
   @RolesRules(defenderRule)
diff --git a/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createCaseFileGuards.spec.ts b/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createCaseFileGuards.spec.ts
index b18200a5cb3e..7ca557087cb9 100644
--- a/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createCaseFileGuards.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createCaseFileGuards.spec.ts
@@ -1,13 +1,10 @@
 import {
+  indictmentCases,
   investigationCases,
   restrictionCases,
 } from '@island.is/judicial-system/types'
 
-import {
-  CaseCompletedGuard,
-  CaseTypeGuard,
-  CaseWriteGuard,
-} from '../../../case'
+import { CaseTypeGuard, CaseWriteGuard } from '../../../case'
 import { LimitedAccessWriteCaseFileGuard } from '../../guards/limitedAccessWriteCaseFile.guard'
 import { LimitedAccessFileController } from '../../limitedAccessFile.controller'
 
@@ -23,13 +20,16 @@ describe('LimitedAccessFileController - Create case file guards', () => {
   })
 
   it('should have the right guard configuration', () => {
-    expect(guards).toHaveLength(4)
+    expect(guards).toHaveLength(3)
     expect(guards[0]).toBeInstanceOf(CaseTypeGuard)
     expect(guards[0]).toEqual({
-      allowedCaseTypes: [...restrictionCases, ...investigationCases],
+      allowedCaseTypes: [
+        ...restrictionCases,
+        ...investigationCases,
+        ...indictmentCases,
+      ],
     })
     expect(new guards[1]()).toBeInstanceOf(CaseWriteGuard)
-    expect(new guards[2]()).toBeInstanceOf(CaseCompletedGuard)
-    expect(new guards[3]()).toBeInstanceOf(LimitedAccessWriteCaseFileGuard)
+    expect(new guards[2]()).toBeInstanceOf(LimitedAccessWriteCaseFileGuard)
   })
 })
diff --git a/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createPresignedPostGuards.spec.ts b/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createPresignedPostGuards.spec.ts
index 6483025331da..310e6b9f70c2 100644
--- a/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createPresignedPostGuards.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/file/test/limitedAccessFileController/createPresignedPostGuards.spec.ts
@@ -1,4 +1,5 @@
 import {
+  indictmentCases,
   investigationCases,
   restrictionCases,
 } from '@island.is/judicial-system/types'
@@ -22,12 +23,15 @@ describe('LimitedAccessFileController - Create presigned post guards', () => {
   })
 
   it('should have the right guard configuration', () => {
-    expect(guards).toHaveLength(3)
+    expect(guards).toHaveLength(2)
     expect(guards[0]).toBeInstanceOf(CaseTypeGuard)
     expect(guards[0]).toEqual({
-      allowedCaseTypes: [...restrictionCases, ...investigationCases],
+      allowedCaseTypes: [
+        ...restrictionCases,
+        ...investigationCases,
+        ...indictmentCases,
+      ],
     })
     expect(new guards[1]()).toBeInstanceOf(CaseWriteGuard)
-    expect(new guards[2]()).toBeInstanceOf(CaseCompletedGuard)
   })
 })
diff --git a/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts b/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts
index 85312b0bb572..2c6aa5278d6d 100644
--- a/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/notification/internalNotification.service.ts
@@ -416,7 +416,7 @@ export class InternalNotificationService extends BaseNotificationService {
     } else if (theCase.state === CaseState.RECEIVED) {
       promises.push(this.sendResubmittedToCourtSmsNotificationToCourt(theCase))
 
-      this.eventService.postEvent(CaseEvent.RESUBMIT, theCase)
+      this.eventService.postEvent('RESUBMIT', theCase)
     }
 
     if (
@@ -716,14 +716,6 @@ export class InternalNotificationService extends BaseNotificationService {
     theCase: Case,
     user: User,
   ): Promise<Recipient>[] {
-    if (
-      ExplanatoryComment.postponedIndefinitelyExplanation(
-        theCase.explanatoryComments,
-      )
-    ) {
-      return []
-    }
-
     const courtDate = DateLog.courtDate(theCase.dateLogs)
 
     if (!courtDate) {
@@ -776,7 +768,7 @@ export class InternalNotificationService extends BaseNotificationService {
     theCase: Case,
     user: User,
   ): Promise<DeliverResponse> {
-    this.eventService.postEvent(CaseEvent.SCHEDULE_COURT_DATE, theCase)
+    this.eventService.postEvent('SCHEDULE_COURT_DATE', theCase)
 
     const promises: Promise<Recipient>[] = []
 
diff --git a/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts b/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts
index a93d21be152f..8a9e78671c95 100644
--- a/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts
@@ -56,11 +56,7 @@ export class NotificationService {
         break
       case NotificationType.COURT_DATE:
         if (eventOnly) {
-          this.eventService.postEvent(
-            CaseEvent.SCHEDULE_COURT_DATE,
-            theCase,
-            true,
-          )
+          this.eventService.postEvent('SCHEDULE_COURT_DATE', theCase, true)
 
           // We still want to send the defender a link to the case even if
           // the judge chooses not to send a calendar invitation
diff --git a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendCourtDateNotifications.spec.ts b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendCourtDateNotifications.spec.ts
index 43a603c94540..a4cb1495e900 100644
--- a/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendCourtDateNotifications.spec.ts
+++ b/apps/judicial-system/backend/src/app/modules/notification/test/internalNotificationController/sendCourtDateNotifications.spec.ts
@@ -163,7 +163,7 @@ describe('InternalNotificationController - Send court date notifications', () =>
     })
   })
 
-  describe('notification sent for postponed indictment', () => {
+  describe('notification sent for indictment', () => {
     let then: Then
 
     const notificationDto: CaseNotificationDto = {
@@ -195,16 +195,16 @@ describe('InternalNotificationController - Send court date notifications', () =>
       expect(mockEmailService.sendEmail).toHaveBeenCalledWith(
         expect.objectContaining({
           to: [{ name: prosecutorName, address: prosecutorEmail }],
-          subject: `Frestun - nýtt þinghald í máli ${courtCaseNumber}`,
-          html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.<br />Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.<br /><br />Dómsalur hefur ekki verið skráður.<br /><br />Dómari hefur ekki verið skráður.<br /><br />Hægt er að nálgast gögn málsins á <a href="http://localhost:4200/akaera/stadfesta/${caseId}">yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
+          subject: `Nýtt þinghald í máli ${courtCaseNumber}`,
+          html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.<br />Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.<br /><br />Tegund þinghalds: Óþekkt.<br /><br />Dómsalur hefur ekki verið skráður.<br /><br />Dómari hefur ekki verið skráður.<br /><br />Hægt er að nálgast gögn málsins á <a href="http://localhost:4200/akaera/stadfesta/${caseId}">yfirlitssíðu málsins í Réttarvörslugátt</a>.`,
         }),
       )
 
       expect(mockEmailService.sendEmail).toHaveBeenCalledWith(
         expect.objectContaining({
           to: [{ name: defenderName, address: defenderEmail }],
-          subject: `Frestun - nýtt þinghald í máli ${courtCaseNumber}`,
-          html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.<br />Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.<br /><br />Dómsalur hefur ekki verið skráður.<br /><br />Dómari hefur ekki verið skráður.<br /><br />Hægt er að nálgast gögn málsins hjá Héraðsdómur Reykjavíkur.`,
+          subject: `Nýtt þinghald í máli ${courtCaseNumber}`,
+          html: `Héraðsdómur Reykjavíkur boðar til þinghalds í máli ${courtCaseNumber}.<br />Fyrirtaka mun fara fram 2. maí 2024, kl. 14:32.<br /><br />Tegund þinghalds: Óþekkt.<br /><br />Dómsalur hefur ekki verið skráður.<br /><br />Dómari hefur ekki verið skráður.<br /><br />Hægt er að nálgast gögn málsins hjá Héraðsdómur Reykjavíkur.`,
         }),
       )
 
diff --git a/apps/judicial-system/web/messages/Core/errors.ts b/apps/judicial-system/web/messages/Core/errors.ts
index 806d5db20aec..406e594e9e3e 100644
--- a/apps/judicial-system/web/messages/Core/errors.ts
+++ b/apps/judicial-system/web/messages/Core/errors.ts
@@ -122,4 +122,9 @@ export const errors = defineMessages({
     defaultMessage: 'Upp kom villa við að skrá aðgerð',
     description: 'Notaður sem villuskilaboð þegar ekki gengur að skrá atburð',
   },
+  openDocument: {
+    id: 'judicial.system.core:errors.open_document',
+    defaultMessage: 'Upp kom villa við að opna skjal',
+    description: 'Notaður sem villuskilaboð þegar ekki gengur að opna skjal',
+  },
 })
diff --git a/apps/judicial-system/web/messages/Core/index.ts b/apps/judicial-system/web/messages/Core/index.ts
index 14f4fdeda0d7..f783a0114759 100644
--- a/apps/judicial-system/web/messages/Core/index.ts
+++ b/apps/judicial-system/web/messages/Core/index.ts
@@ -184,11 +184,6 @@ export const core = defineMessages({
     defaultMessage: 'Tími handtöku',
     description: 'Notað fyrir orðið Tími handtöku í öllum flæðum.',
   },
-  confirmedCourtDate: {
-    id: 'judicial.system.core:confirmed_court_date',
-    defaultMessage: 'Staðfestur fyrirtökutími',
-    description: 'Notað fyrir orðið Staðfestur fyrirtökutími í öllum flæðum.',
-  },
   update: {
     id: 'judicial.system.core:update',
     defaultMessage: 'Uppfæra',
diff --git a/apps/judicial-system/web/messages/Core/tables.ts b/apps/judicial-system/web/messages/Core/tables.ts
index 77d642b8cb3c..66879b64ce6a 100644
--- a/apps/judicial-system/web/messages/Core/tables.ts
+++ b/apps/judicial-system/web/messages/Core/tables.ts
@@ -119,4 +119,19 @@ export const tables = defineMessages({
     description:
       'Notaður sem titill fyrir Dómsuppkvaðning dálk í lista yfir mál.',
   },
+  caseFileName: {
+    id: 'judicial.system.core:tables.case_file_name',
+    defaultMessage: 'Nafn skjals',
+    description: 'Notaður sem titill fyrir nafn dálk í lista yfir mál.',
+  },
+  caseFileDate: {
+    id: 'judicial.system.core:tables.case_file_date',
+    defaultMessage: 'Dagsetning skjals',
+    description: 'Notaður sem titill fyrir dagsetningu í lista yfir mál.',
+  },
+  sent: {
+    id: 'judicial.system.core:tables.sent',
+    defaultMessage: 'Sent',
+    description: 'Notaður sem titill fyrir sent dálk í lista yfir mál.',
+  },
 })
diff --git a/apps/judicial-system/web/messages/Core/titles.ts b/apps/judicial-system/web/messages/Core/titles.ts
index f44b175d28cc..02b63cf687d5 100644
--- a/apps/judicial-system/web/messages/Core/titles.ts
+++ b/apps/judicial-system/web/messages/Core/titles.ts
@@ -109,6 +109,12 @@ export const titles = {
         description:
           'Notaður sem titill fyrir Yfirlit ákæru skjá hjá saksóknara í ákærum',
       }),
+      addFiles: defineMessage({
+        id: 'judicial.system.core:titles.prosecutor.indictments.add_files',
+        defaultMessage: 'Bæta við gögnum - Réttarvörslugátt',
+        description:
+          'Notaður sem titill fyrir Bæta við gögnum skjá hjá saksóknara í ákærum',
+      }),
     },
   },
   court: {
diff --git a/apps/judicial-system/web/pages/_app.tsx b/apps/judicial-system/web/pages/_app.tsx
index 0a2b1e799ec4..05e88de3cff4 100644
--- a/apps/judicial-system/web/pages/_app.tsx
+++ b/apps/judicial-system/web/pages/_app.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import App, { AppContext, AppProps } from 'next/app'
 import getConfig from 'next/config'
 import Head from 'next/head'
diff --git a/apps/judicial-system/web/pages/_document.tsx b/apps/judicial-system/web/pages/_document.tsx
index c920f17d3807..1ffe9864b38a 100644
--- a/apps/judicial-system/web/pages/_document.tsx
+++ b/apps/judicial-system/web/pages/_document.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Document, { Head, Html, Main, NextScript } from 'next/document'
 
 export default class MyDocument extends Document {
diff --git a/apps/judicial-system/web/pages/akaera/gogn/[id].ts b/apps/judicial-system/web/pages/akaera/gogn/[id].ts
new file mode 100644
index 000000000000..2efcee1d7471
--- /dev/null
+++ b/apps/judicial-system/web/pages/akaera/gogn/[id].ts
@@ -0,0 +1,3 @@
+import AddFiles from '@island.is/judicial-system-web/src/routes/Shared/AddFiles/AddFiles'
+
+export default AddFiles
diff --git a/apps/judicial-system/web/pages/verjandi/akaera/gogn/[id].ts b/apps/judicial-system/web/pages/verjandi/akaera/gogn/[id].ts
new file mode 100644
index 000000000000..e15aa0356897
--- /dev/null
+++ b/apps/judicial-system/web/pages/verjandi/akaera/gogn/[id].ts
@@ -0,0 +1,3 @@
+import AddFiles from '@island.is/judicial-system-web/pages/akaera/gogn/[id]'
+
+export default AddFiles
diff --git a/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/CaseFilesAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/CaseFilesAccordionItem.tsx
index 8d1c564b4f0e..e4573e6bfc86 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/CaseFilesAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/CaseFilesAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/UploadStateMessage.tsx b/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/UploadStateMessage.tsx
index aa1050c8fb89..1162e5eec194 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/UploadStateMessage.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/CaseFilesAccordionItem/UploadStateMessage.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { motion } from 'framer-motion'
 
 import { Box, Icon, IconMapIcon, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionItems/CommentsAccordionItem/CommentsAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/CommentsAccordionItem/CommentsAccordionItem.tsx
index 97cc6b08e1d7..7ab75ca1c479 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/CommentsAccordionItem/CommentsAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/CommentsAccordionItem/CommentsAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AccordionItem, Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionItems/ConnectedCaseFilesAccordionItem/ConnectedCaseFilesAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/ConnectedCaseFilesAccordionItem/ConnectedCaseFilesAccordionItem.tsx
index cc7ac46083c5..c65bf82aa94c 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/ConnectedCaseFilesAccordionItem/ConnectedCaseFilesAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/ConnectedCaseFilesAccordionItem/ConnectedCaseFilesAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AccordionItem } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionItems/CourtRecordAccordionItem/CourtRecordAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/CourtRecordAccordionItem/CourtRecordAccordionItem.tsx
index 8d4682aa20ad..033973403713 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/CourtRecordAccordionItem/CourtRecordAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/CourtRecordAccordionItem/CourtRecordAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import isSameDay from 'date-fns/isSameDay'
 
diff --git a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.css.ts b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.css.ts
index 0db5e6484397..173b9d5f50d5 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.css.ts
+++ b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.css.ts
@@ -17,42 +17,5 @@ export const reorderGroup = style({
 
 export const reorderItem = style({
   position: 'relative',
-  borderRadius: theme.border.radius.large,
   overflow: 'hidden',
 })
-
-export const caseFileWrapper = style({
-  display: 'flex',
-  alignItems: 'center',
-  background: theme.color.blue100,
-  paddingRight: `${theme.spacing[2]}px`,
-})
-
-export const editCaseFileInputContainer = style({
-  display: 'flex',
-  flexDirection: 'row',
-  flexGrow: 1,
-  marginRight: theme.spacing[2],
-})
-
-export const editCaseFileName = style({
-  flex: 2,
-  marginRight: theme.spacing[1],
-})
-
-export const editCaseFileDisplayDate = style({
-  flex: 1,
-})
-
-export const editCaseFileButton = style({
-  width: '32px',
-  height: '34px',
-  padding: '4px',
-  borderRadius: theme.border.radius.large,
-  transition: 'background-color 0.2s ease-in-out',
-  selectors: {
-    '&:hover': {
-      backgroundColor: theme.color.blue200,
-    },
-  },
-})
diff --git a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.spec.tsx b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.spec.tsx
index e5c3cf810811..01540f13263d 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.spec.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.spec.tsx
@@ -8,58 +8,6 @@ import {
   sortedFilesInChapter,
 } from './IndictmentsCaseFilesAccordionItem'
 
-const items: ReorderableItem[] = [
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: false,
-    chapter: 0,
-    orderWithinChapter: 0,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: false,
-    chapter: 0,
-    orderWithinChapter: 1,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: true,
-    chapter: 1,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: false,
-    chapter: 1,
-    orderWithinChapter: 0,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: true,
-    isHeading: false,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: false,
-  },
-  {
-    id: faker.datatype.uuid(),
-    displayText: faker.lorem.words(2),
-    isDivider: false,
-    isHeading: false,
-  },
-]
-
 const caseFiles = [
   {
     id: faker.datatype.uuid(),
@@ -117,29 +65,233 @@ describe('getFilesToUpdate', () => {
   })
 
   it('should return the item if a file is reordered but not put under a chapter', () => {
-    expect(getFilesToUpdate(items[items.length - 1].id || '', items)).toEqual([
+    const items: ReorderableItem[] = [
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: true,
+        chapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 1,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: true,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 2,
+        orderWithinChapter: 0,
+      },
+    ]
+
+    expect(getFilesToUpdate(items[items.length - 1].id, items)).toEqual([
       null,
       null,
       [items[items.length - 1]],
     ])
   })
 
-  it('should return the correct chapter, orderWithinChapter and items if a file is reordered under a chapter', () => {
-    expect(getFilesToUpdate(items[0].id || '', items)).toEqual([
+  it('should return the correct chapter, orderWithinChapter and items if a file is reordered as the first item in a chapter', () => {
+    const items: ReorderableItem[] = [
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: true,
+        chapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 1,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: true,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+    ]
+
+    expect(getFilesToUpdate(items[0].id, items)).toEqual([
       0,
       0,
       [items[0], items[1]],
     ])
-    expect(getFilesToUpdate(items[1].id || '', items)).toEqual([
-      0,
-      1,
-      [items[1]],
-    ])
-    expect(getFilesToUpdate(items[3].id || '', items)).toEqual([
-      1,
-      0,
-      [items[3]],
-    ])
+  })
+
+  it('should return the correct chapter, orderWithinChapter and items if a file is reordered as the last item in a chapter', () => {
+    const items: ReorderableItem[] = [
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: true,
+        chapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 1,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: true,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+    ]
+
+    expect(getFilesToUpdate(items[1].id, items)).toEqual([0, 1, [items[1]]])
+  })
+
+  it('should return the correct chapter, orderWithinChapter and items if a file is reordered under a previously empty chapter', () => {
+    const items: ReorderableItem[] = [
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 0,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 0,
+        orderWithinChapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: true,
+        chapter: 1,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+        chapter: 4,
+        orderWithinChapter: 4,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: true,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+      {
+        id: faker.datatype.uuid(),
+        displayText: faker.lorem.words(2),
+        isDivider: false,
+        isHeading: false,
+      },
+    ]
+
+    expect(getFilesToUpdate(items[3].id, items)).toEqual([1, 0, [items[3]]])
   })
 })
 
@@ -151,6 +303,11 @@ describe('sortedFilesInChapter', () => {
   it('should return an array of files in chapter sorted by orderWithinChapter', () => {
     expect(sortedFilesInChapter(0, caseFiles)).toEqual([
       {
+        canEdit: true,
+        category: undefined,
+        displayDate: undefined,
+        status: 'done',
+        userGeneratedFilename: undefined,
         displayText: caseFiles[1].name,
         isDivider: false,
         isHeading: false,
@@ -161,6 +318,11 @@ describe('sortedFilesInChapter', () => {
         canOpen: false,
       },
       {
+        canEdit: true,
+        category: undefined,
+        displayDate: undefined,
+        status: 'done',
+        userGeneratedFilename: undefined,
         displayText: caseFiles[0].name,
         isDivider: false,
         isHeading: false,
@@ -171,6 +333,11 @@ describe('sortedFilesInChapter', () => {
         canOpen: false,
       },
       {
+        canEdit: true,
+        category: undefined,
+        displayDate: undefined,
+        status: 'done',
+        userGeneratedFilename: undefined,
         displayText: caseFiles[2].name,
         isDivider: false,
         isHeading: false,
diff --git a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.strings.ts b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.strings.ts
index c180d7a0a40b..13e7cd0862c0 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.strings.ts
+++ b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.strings.ts
@@ -1,6 +1,6 @@
 import { defineMessages } from 'react-intl'
 
-export const indictmentsCaseFilesAccordionItem = defineMessages({
+export const strings = defineMessages({
   title: {
     id: 'judicial.system.core:indictments_case_files_accordion_item.title',
     defaultMessage: 'Gögn úr LÖKE máli {policeCaseNumber}',
@@ -68,32 +68,14 @@ export const indictmentsCaseFilesAccordionItem = defineMessages({
     description:
       'Notaður sem titill á kafla í fellilista í skjalaskrá skrefi í ákærum.',
   },
-  simpleInputPlaceholder: {
-    id: 'judicial.system.core:indictments_case_files_accordion_item.simple_input_placeholder',
-    defaultMessage: 'Skráðu inn heiti á skjali',
-    description:
-      'Notaður sem skýritexti í textasvæði reit til að breyta heiti skjals.',
-  },
-  invalidDateErrorMessage: {
-    id: 'judicial.system.core:indictments_case_files_accordion_item.invalid_date_error_message',
-    defaultMessage:
-      'Ekki tókst að uppfæra skjal, dagsetning er ekki á réttu formi',
-    description:
-      'Notaður sem villuboð þegar tekst ekki að uppfæra dagsetningu á skjali.',
-  },
-  renameFailedErrorMessage: {
-    id: 'judicial.system.core:indictments_case_files_accordion_item.rename_failed_error_message',
-    defaultMessage: 'Ekki tókst að endurnefna skjal',
-    description: 'Notaður sem villuboð þegar endurnefning á skjali mistókst.',
-  },
   reorderFailedErrorMessage: {
     id: 'judicial.system.core:indictments_case_files_accordion_item.reorder_failed_error_message',
     defaultMessage: 'Ekki tókst að endurraða skjölum',
     description: 'Notaður sem villuboð þegar endurröðun á skjölum mistókst.',
   },
-  removeFailedErrorMessage: {
-    id: 'judicial.system.core:indictments_case_files_accordion_item.remove_failed_error_message',
-    defaultMessage: 'Ekki tókst að eyða skjali',
-    description: 'Notaður sem villuboð þegar eyða skjali mistókst.',
+  renameFailedErrorMessage: {
+    id: 'judicial.system.core:indictments_case_files_accordion_item.rename_failed_error_message',
+    defaultMessage: 'Ekki tókst að endurnefna skjal',
+    description: 'Notaður sem villuboð þegar endurnefning á skjali mistókst.',
   },
 })
diff --git a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.tsx
index f1111ccf06b0..1061882823f0 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsCaseFilesAccordionItem/IndictmentsCaseFilesAccordionItem.tsx
@@ -1,9 +1,12 @@
-import React, { FC, PointerEvent, useEffect, useMemo, useState } from 'react'
-import InputMask from 'react-input-mask'
+import {
+  Dispatch,
+  FC,
+  PointerEvent,
+  SetStateAction,
+  useEffect,
+  useState,
+} from 'react'
 import { useIntl } from 'react-intl'
-import { useMeasure } from 'react-use'
-import isValid from 'date-fns/isValid'
-import parseISO from 'date-fns/parseISO'
 import {
   animate,
   AnimatePresence,
@@ -19,12 +22,10 @@ import {
   AccordionItem,
   AlertMessage,
   Box,
-  Icon,
-  Input,
   Text,
   toast,
+  UploadFileStatus,
 } from '@island.is/island-ui/core'
-import { formatDate } from '@island.is/judicial-system/formatters'
 import {
   CrimeSceneMap,
   IndictmentSubtypeMap,
@@ -40,8 +41,11 @@ import {
   useS3Upload,
 } from '@island.is/judicial-system-web/src/utils/hooks'
 
+import EditableCaseFile, {
+  TEditableCaseFile,
+} from '../../EditableCaseFile/EditableCaseFile'
 import { useUpdateFilesMutation } from './updateFiles.generated'
-import { indictmentsCaseFilesAccordionItem as m } from './IndictmentsCaseFilesAccordionItem.strings'
+import { strings } from './IndictmentsCaseFilesAccordionItem.strings'
 import * as styles from './IndictmentsCaseFilesAccordionItem.css'
 
 interface Props {
@@ -51,27 +55,23 @@ interface Props {
   shouldStartExpanded: boolean
   subtypes?: IndictmentSubtypeMap
   crimeScenes?: CrimeSceneMap
+  setEditCount: Dispatch<SetStateAction<number>>
 }
 
 interface CaseFileProps {
   caseFile: ReorderableItem
   onReorder: (id?: string) => void
   onOpen: (id: string) => void
-  onRename: (id: string, name?: string, displayDate?: string) => void
-  onDelete: (id: string) => void
+  onRename: (id: string, name: string, displayDate: string) => void
+  onDelete: (file: TUploadFile) => void
+  setEditCount: Dispatch<SetStateAction<number>>
 }
 
-export interface ReorderableItem {
-  id: string
-  displayText?: string | null
+export interface ReorderableItem extends TEditableCaseFile {
   isDivider: boolean
   isHeading: boolean
-  created?: string | null
   chapter?: number | null
   orderWithinChapter?: number | null
-  userGeneratedFilename?: string | null
-  displayDate?: string | null
-  canOpen?: boolean
 }
 
 const useRaisedShadow = (value: MotionValue<number>) => {
@@ -80,7 +80,7 @@ const useRaisedShadow = (value: MotionValue<number>) => {
 
   useEffect(() => {
     let isActive = false
-    value.onChange((latest) => {
+    value.on('change', (latest) => {
       const wasActive = isActive
       if (latest !== 0) {
         isActive = true
@@ -115,12 +115,25 @@ export const getFilesToUpdate = (
       files[index - 1].chapter === null)
   ) {
     // The file is not in a chapter
-    return [null, null, [files[index]]]
+    return [
+      null,
+      null,
+      files[index].chapter === undefined || files[index].chapter === null
+        ? []
+        : [files[index]],
+    ]
   }
 
   const chapter = files[index - 1]?.chapter ?? 0
   const orderWithinChapter = (files[index - 1]?.orderWithinChapter ?? -1) + 1
 
+  if (
+    files[index].chapter === chapter &&
+    files[index].orderWithinChapter === orderWithinChapter
+  ) {
+    return [chapter, orderWithinChapter, []]
+  }
+
   const filesToUpdate: ReorderableItem[] = [files[index]]
   while (files[++index].chapter === chapter) {
     filesToUpdate.push(files[index])
@@ -137,16 +150,19 @@ export const sortedFilesInChapter = (
     .filter((file) => file.chapter === chapter)
     .map((file) => {
       return {
-        id: file.id,
-        displayText: file.name,
         isDivider: false,
         isHeading: false,
-        created: file.created,
         chapter: file.chapter,
         orderWithinChapter: file.orderWithinChapter,
+        id: file.id,
+        category: file.category,
+        created: file.created,
+        displayText: file.name,
         userGeneratedFilename: file.userGeneratedFilename,
         displayDate: file.displayDate,
         canOpen: Boolean(file.key),
+        status: 'done' as UploadFileStatus,
+        canEdit: true,
       }
     })
     .sort((a, b) => {
@@ -173,39 +189,12 @@ const renderChapter = (chapter: number, name?: string | null) => (
 )
 
 const CaseFile: FC<CaseFileProps> = (props) => {
-  const { caseFile, onReorder, onOpen, onRename, onDelete } = props
-  const { formatMessage } = useIntl()
+  const { caseFile, onReorder, onOpen, onRename, onDelete, setEditCount } =
+    props
   const y = useMotionValue(0)
   const boxShadow = useRaisedShadow(y)
   const controls = useDragControls()
   const [isDragging, setIsDragging] = useState<boolean>(false)
-  const [isEditing, setIsEditing] = useState<boolean>(false)
-  const [editedFilename, setEditedFilename] = useState<
-    string | undefined | null
-  >(caseFile.userGeneratedFilename)
-  const [ref, { width }] = useMeasure<HTMLDivElement>()
-
-  const [editedDisplayDate, setEditedDisplayDate] = useState<
-    string | undefined
-  >(formatDate(caseFile.displayDate) ?? undefined)
-  const displayName = caseFile.userGeneratedFilename ?? caseFile.displayText
-
-  const handleEditFileButtonClick = () => {
-    const trimmedFilename = editedFilename?.trim()
-    const trimmedDisplayDate = editedDisplayDate?.trim()
-
-    if (trimmedFilename || trimmedDisplayDate) {
-      onRename(caseFile.id, trimmedFilename, trimmedDisplayDate)
-      setIsEditing(false)
-      setEditedDisplayDate(formatDate(caseFile.displayDate) ?? '')
-    }
-
-    setIsEditing(false)
-  }
-
-  const displayDate = useMemo(() => {
-    return formatDate(caseFile.displayDate ?? caseFile.created)
-  }, [caseFile.displayDate, caseFile.created])
 
   const getCursorStyle = () => {
     if (caseFile.isDivider || caseFile.isHeading) {
@@ -262,132 +251,15 @@ const CaseFile: FC<CaseFileProps> = (props) => {
           <Text>{caseFile.displayText?.split('|')[1]}</Text>
         </Box>
       ) : (
-        <div className={styles.caseFileWrapper}>
-          <Box
-            data-testid="caseFileDragHandle"
-            display="flex"
-            paddingX={3}
-            paddingY={2}
-          >
-            <Icon icon="menu" color="blue400" />
-          </Box>
-          <Box width="full">
-            <AnimatePresence initial={false} mode="wait">
-              {isEditing ? (
-                <motion.div
-                  initial={{ y: 10, opacity: 0 }}
-                  animate={{ y: 0, opacity: 1 }}
-                  exit={{ y: 10, opacity: 0 }}
-                  transition={{ duration: 0.2 }}
-                  key={`${caseFile.id}-edit`}
-                >
-                  <Box display="flex">
-                    <Box className={styles.editCaseFileInputContainer}>
-                      <Box className={styles.editCaseFileName}>
-                        <Input
-                          name="fileName"
-                          size="xs"
-                          placeholder={formatMessage(m.simpleInputPlaceholder)}
-                          defaultValue={displayName ?? undefined}
-                          onChange={(evt) =>
-                            setEditedFilename(evt.target.value)
-                          }
-                        />
-                      </Box>
-                      <Box className={styles.editCaseFileDisplayDate}>
-                        <InputMask
-                          mask={'99.99.9999'}
-                          maskPlaceholder={null}
-                          value={editedDisplayDate || ''}
-                          onChange={(evt) => {
-                            setEditedDisplayDate(evt.target.value)
-                          }}
-                        >
-                          <Input
-                            name="fileDisplayDate"
-                            size="xs"
-                            placeholder={formatDate(new Date())}
-                            autoComplete="off"
-                          />
-                        </InputMask>
-                      </Box>
-                    </Box>
-                    <Box display="flex" alignItems="center">
-                      <button
-                        onClick={handleEditFileButtonClick}
-                        className={styles.editCaseFileButton}
-                      >
-                        <Icon icon="checkmark" color="blue400" />
-                      </button>
-                      <Box marginLeft={1}>
-                        <button
-                          onClick={() => onDelete(caseFile.id)}
-                          className={styles.editCaseFileButton}
-                        >
-                          <Icon icon="trash" color="blue400" type="outline" />
-                        </button>
-                      </Box>
-                    </Box>
-                  </Box>
-                </motion.div>
-              ) : (
-                <motion.div
-                  initial={{ y: -10, opacity: 0 }}
-                  animate={{ y: 0, opacity: 1 }}
-                  exit={{ y: -10, opacity: 0 }}
-                  transition={{ duration: 0.2 }}
-                  key={`${caseFile.id}-view`}
-                  ref={ref}
-                  style={{
-                    display: 'flex',
-                    justifyContent: 'space-between',
-                  }}
-                >
-                  <Box
-                    display="flex"
-                    alignItems="center"
-                    component={caseFile.canOpen ? 'button' : undefined}
-                    onClick={() => {
-                      if (caseFile.canOpen && caseFile.id) {
-                        onOpen(caseFile.id)
-                      }
-                    }}
-                  >
-                    <Text variant="h5">
-                      <span
-                        style={{
-                          display: 'block',
-                          maxWidth: `${width - 180}px`,
-                          overflow: 'hidden',
-                          textOverflow: 'ellipsis',
-                          whiteSpace: 'nowrap',
-                        }}
-                      >
-                        {displayName}
-                      </span>
-                    </Text>
-                    {caseFile.canOpen && (
-                      <Box marginLeft={2}>
-                        <Icon icon="open" type="outline" size="small" />
-                      </Box>
-                    )}
-                  </Box>
-                  <Box display="flex" alignItems="center">
-                    <Box marginRight={1}>
-                      <Text variant="small">{displayDate}</Text>
-                    </Box>
-                    <button
-                      onClick={() => setIsEditing(true)}
-                      className={styles.editCaseFileButton}
-                    >
-                      <Icon icon="pencil" color="blue400" />
-                    </button>
-                  </Box>
-                </motion.div>
-              )}
-            </AnimatePresence>
-          </Box>
-        </div>
+        <EditableCaseFile
+          caseFile={caseFile}
+          enableDrag
+          onDelete={onDelete}
+          onOpen={onOpen}
+          onRename={onRename}
+          onStartEditing={() => setEditCount((count) => count + 1)}
+          onStopEditing={() => setEditCount((count) => count - 1)}
+        />
       )}
     </Reorder.Item>
   )
@@ -401,13 +273,14 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
     shouldStartExpanded,
     subtypes,
     crimeScenes,
+    setEditCount,
   } = props
   const { formatMessage } = useIntl()
   const [updateFilesMutation] = useUpdateFilesMutation()
-
-  const { onOpen, fileNotFound, dismissFileNotFound } = useFileList({ caseId })
+  const { onOpen, fileNotFound, dismissFileNotFound } = useFileList({
+    caseId,
+  })
   const { handleRemove } = useS3Upload(caseId)
-
   const [reorderableItems, setReorderableItems] = useState<ReorderableItem[]>(
     [],
   )
@@ -417,7 +290,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(0, caseFiles),
       {
         id: uuid(),
-        displayText: formatMessage(m.chapterInvesitgationProcess),
+        displayText: formatMessage(strings.chapterInvesitgationProcess),
         chapter: 1,
         isHeading: true,
         isDivider: false,
@@ -425,7 +298,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(1, caseFiles),
       {
         id: uuid(),
-        displayText: formatMessage(m.chapterWitnesses),
+        displayText: formatMessage(strings.chapterWitnesses),
         chapter: 2,
         isHeading: true,
         isDivider: false,
@@ -433,7 +306,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(2, caseFiles),
       {
         id: uuid(),
-        displayText: formatMessage(m.chapterDefendant),
+        displayText: formatMessage(strings.chapterDefendant),
         chapter: 3,
         isHeading: true,
         isDivider: false,
@@ -441,7 +314,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(3, caseFiles),
       {
         id: uuid(),
-        displayText: formatMessage(m.chapterCaseFiles),
+        displayText: formatMessage(strings.chapterCaseFiles),
         chapter: 4,
         isHeading: true,
         isDivider: false,
@@ -449,7 +322,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(4, caseFiles),
       {
         id: uuid(),
-        displayText: formatMessage(m.chapterElectronicDocuments),
+        displayText: formatMessage(strings.chapterElectronicDocuments),
         chapter: 5,
         isHeading: true,
         isDivider: false,
@@ -457,9 +330,9 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       ...sortedFilesInChapter(5, caseFiles),
       {
         id: uuid(),
-        displayText: `${formatMessage(m.unorderedFilesTitle)}|${formatMessage(
-          m.unorderedFilesExplanation,
-        )}`,
+        displayText: `${formatMessage(
+          strings.unorderedFilesTitle,
+        )}|${formatMessage(strings.unorderedFilesExplanation)}`,
         isHeading: false,
         isDivider: true,
       },
@@ -470,14 +343,17 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
         )
         .map((caseFile) => {
           return {
+            isDivider: false,
+            isHeading: false,
             id: caseFile.id,
+            category: caseFile.category,
             created: caseFile.created,
             displayText: caseFile.name,
             userGeneratedFilename: caseFile.userGeneratedFilename,
-            isDivider: false,
-            isHeading: false,
-            canOpen: Boolean(caseFile.key),
             displayDate: caseFile.displayDate,
+            canOpen: Boolean(caseFile.key),
+            status: 'done' as UploadFileStatus,
+            canEdit: true,
           }
         }),
     ])
@@ -493,6 +369,10 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
       reorderableItems,
     )
 
+    if (filesToUpdate.length === 0) {
+      return
+    }
+
     const { errors } = await updateFilesMutation({
       variables: {
         input: {
@@ -516,45 +396,27 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
     })
 
     if (errors) {
-      toast.error(formatMessage(m.reorderFailedErrorMessage))
+      toast.error(formatMessage(strings.reorderFailedErrorMessage))
     }
   }
 
   const handleRename = async (
     fileId: string,
-    newName?: string,
-    newDisplayDate?: string,
+    newName: string,
+    newDisplayDate: string,
   ) => {
-    let newDate: Date | null = null
-    const fileInReorderableItems = reorderableItems.findIndex(
-      (item) => item.id === fileId,
+    setReorderableItems((prev) =>
+      prev.map((item) =>
+        item.id === fileId
+          ? {
+              ...item,
+              userGeneratedFilename: newName,
+              displayDate: newDisplayDate,
+            }
+          : item,
+      ),
     )
 
-    if (fileInReorderableItems === -1) {
-      return
-    }
-
-    if (newDisplayDate) {
-      const [day, month, year] = newDisplayDate.split('.')
-      newDate = parseISO(`${year}-${month}-${day}`)
-
-      if (!isValid(newDate)) {
-        toast.error(formatMessage(m.invalidDateErrorMessage))
-        return
-      }
-    }
-
-    setReorderableItems((prev) => {
-      const newReorderableItems = [...prev]
-      newReorderableItems[fileInReorderableItems].userGeneratedFilename =
-        newName
-      newReorderableItems[fileInReorderableItems].displayDate = newDate
-        ? newDate.toISOString()
-        : newReorderableItems[fileInReorderableItems].displayDate
-
-      return newReorderableItems
-    })
-
     const { errors } = await updateFilesMutation({
       variables: {
         input: {
@@ -563,7 +425,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
             {
               id: fileId,
               userGeneratedFilename: newName,
-              ...(newDate && { displayDate: newDate.toISOString() }),
+              displayDate: newDisplayDate,
             },
           ],
         },
@@ -571,12 +433,12 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
     })
 
     if (errors) {
-      toast.error(formatMessage(m.renameFailedErrorMessage))
+      toast.error(formatMessage(strings.renameFailedErrorMessage))
     }
   }
 
-  const handleDelete = (fileId: string) => {
-    handleRemove({ id: fileId } as TUploadFile, (file: TUploadFile) =>
+  const handleDelete = (file: TUploadFile) => {
+    handleRemove({ id: file.id } as TUploadFile, (file) =>
       setReorderableItems((prev) => prev.filter((item) => item.id !== file.id)),
     )
   }
@@ -585,7 +447,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
     <>
       <AccordionItem
         id="IndictmentsCaseFilesAccordionItem"
-        label={formatMessage(m.title, {
+        label={formatMessage(strings.title, {
           policeCaseNumber,
         })}
         labelVariant="h3"
@@ -599,7 +461,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
           />
         </Box>
         <Box marginBottom={3}>
-          <Text>{formatMessage(m.explanation)}</Text>
+          <Text>{formatMessage(strings.explanation)}</Text>
         </Box>
         {/* 
       Render the first chapter here, outside the reorder group because 
@@ -608,7 +470,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
         <Box marginBottom={2}>
           {renderChapter(
             0,
-            formatMessage(m.chapterIndictmentAndAccompanyingDocuments),
+            formatMessage(strings.chapterIndictmentAndAccompanyingDocuments),
           )}
         </Box>
         <Reorder.Group
@@ -626,6 +488,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
                   onOpen={onOpen}
                   onRename={handleRename}
                   onDelete={handleDelete}
+                  setEditCount={setEditCount}
                 />
               </Box>
             )
@@ -641,7 +504,7 @@ const IndictmentsCaseFilesAccordionItem: FC<Props> = (props) => {
               >
                 <AlertMessage
                   type="success"
-                  message={formatMessage(m.noCaseFiles)}
+                  message={formatMessage(strings.noCaseFiles)}
                 />
               </motion.div>
             )}
diff --git a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsLawsBrokenAccordionItem/IndictmentsLawsBrokenAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsLawsBrokenAccordionItem/IndictmentsLawsBrokenAccordionItem.tsx
index c73d7614713e..eeb6171448c9 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/IndictmentsLawsBrokenAccordionItem/IndictmentsLawsBrokenAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/IndictmentsLawsBrokenAccordionItem/IndictmentsLawsBrokenAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Accordion, AccordionItem, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionItems/PoliceRequestAccordionItem/PoliceRequestAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/PoliceRequestAccordionItem/PoliceRequestAccordionItem.tsx
index 0f11e927ea77..a569883fca4f 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/PoliceRequestAccordionItem/PoliceRequestAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/PoliceRequestAccordionItem/PoliceRequestAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AccordionItem, Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionItems/RulingAccordionItem/RulingAccordionItem.tsx b/apps/judicial-system/web/src/components/AccordionItems/RulingAccordionItem/RulingAccordionItem.tsx
index 6aa05705adce..7cb74f8274c6 100644
--- a/apps/judicial-system/web/src/components/AccordionItems/RulingAccordionItem/RulingAccordionItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionItems/RulingAccordionItem/RulingAccordionItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AccordionItem, Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/AccordionListItem/AccordionListItem.tsx b/apps/judicial-system/web/src/components/AccordionListItem/AccordionListItem.tsx
index 4587a8b0c50e..675f50976071 100644
--- a/apps/judicial-system/web/src/components/AccordionListItem/AccordionListItem.tsx
+++ b/apps/judicial-system/web/src/components/AccordionListItem/AccordionListItem.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.spec.tsx b/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.spec.tsx
index 7706abe7bc19..62c15a47e7c7 100644
--- a/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.spec.tsx
+++ b/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.spec.tsx
@@ -1,8 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import React from 'react'
 import { IntlProvider } from 'react-intl'
 import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client'
-import { render, screen, within } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 
 import {
diff --git a/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.tsx b/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.tsx
index 893729b7810c..843a2bfdb20f 100644
--- a/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.tsx
+++ b/apps/judicial-system/web/src/components/AppealCaseFilesOverview/AppealCaseFilesOverview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 import router from 'next/router'
diff --git a/apps/judicial-system/web/src/components/BigTextSmallText/BigTextSmallText.tsx b/apps/judicial-system/web/src/components/BigTextSmallText/BigTextSmallText.tsx
index f45c5a6fa3f1..8011581eb4ec 100644
--- a/apps/judicial-system/web/src/components/BigTextSmallText/BigTextSmallText.tsx
+++ b/apps/judicial-system/web/src/components/BigTextSmallText/BigTextSmallText.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/BlueBox/BlueBox.tsx b/apps/judicial-system/web/src/components/BlueBox/BlueBox.tsx
index 3ecb77a88110..362c1c0f42b5 100644
--- a/apps/judicial-system/web/src/components/BlueBox/BlueBox.tsx
+++ b/apps/judicial-system/web/src/components/BlueBox/BlueBox.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 import cn from 'classnames'
 
 import { TestSupport } from '@island.is/island-ui/utils'
diff --git a/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithIcon.tsx b/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithIcon.tsx
index 14505fe7f333..2bb8ff000e3d 100644
--- a/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithIcon.tsx
+++ b/apps/judicial-system/web/src/components/BlueBoxWithIcon/BlueBoxWithIcon.tsx
@@ -1,15 +1,15 @@
-import { FC } from 'react'
+import { FC, ReactNode } from 'react'
 
 import { Box, Icon, IconMapIcon, Text } from '@island.is/island-ui/core'
 
 import * as styles from './BlueBoxWithIcon.css'
 
 export interface DataSection {
-  data: { title: string; value?: React.ReactNode }[]
+  data: { title: string; value?: ReactNode }[]
 }
 
 interface Props {
-  data: { title: string; value?: React.ReactNode }[]
+  data: { title: string; value?: ReactNode }[]
   icon?: IconMapIcon
 }
 
diff --git a/apps/judicial-system/web/src/components/BlueBoxWithIcon/CaseScheduledCard.tsx b/apps/judicial-system/web/src/components/BlueBoxWithIcon/CaseScheduledCard.tsx
index b785c910be7f..57623d2ba20e 100644
--- a/apps/judicial-system/web/src/components/BlueBoxWithIcon/CaseScheduledCard.tsx
+++ b/apps/judicial-system/web/src/components/BlueBoxWithIcon/CaseScheduledCard.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/BlueBoxWithIcon/IndictmentCaseScheduledCard.tsx b/apps/judicial-system/web/src/components/BlueBoxWithIcon/IndictmentCaseScheduledCard.tsx
index 6d6a665d0d49..3cee41edd24f 100644
--- a/apps/judicial-system/web/src/components/BlueBoxWithIcon/IndictmentCaseScheduledCard.tsx
+++ b/apps/judicial-system/web/src/components/BlueBoxWithIcon/IndictmentCaseScheduledCard.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CaseDates/CaseDates.spec.tsx b/apps/judicial-system/web/src/components/CaseDates/CaseDates.spec.tsx
index bc8e3f583352..caa9d652ce18 100644
--- a/apps/judicial-system/web/src/components/CaseDates/CaseDates.spec.tsx
+++ b/apps/judicial-system/web/src/components/CaseDates/CaseDates.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { IntlProvider } from 'react-intl'
 import { render, screen } from '@testing-library/react'
 
diff --git a/apps/judicial-system/web/src/components/CaseDates/CaseDates.tsx b/apps/judicial-system/web/src/components/CaseDates/CaseDates.tsx
index 7c129c9c2deb..c482607142c6 100644
--- a/apps/judicial-system/web/src/components/CaseDates/CaseDates.tsx
+++ b/apps/judicial-system/web/src/components/CaseDates/CaseDates.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Button, IconMapIcon, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CaseFile/CaseFile.tsx b/apps/judicial-system/web/src/components/CaseFile/CaseFile.tsx
index 8bf43649ce4c..f6447323b82d 100644
--- a/apps/judicial-system/web/src/components/CaseFile/CaseFile.tsx
+++ b/apps/judicial-system/web/src/components/CaseFile/CaseFile.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import cn from 'classnames'
 
 import { IconMapIcon } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.spec.tsx b/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.spec.tsx
index ed642f33188c..a8efaf42faa9 100644
--- a/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.spec.tsx
+++ b/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
 
diff --git a/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.tsx b/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.tsx
index 975d827db16c..62f36e3935c8 100644
--- a/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.tsx
+++ b/apps/judicial-system/web/src/components/CaseFileList/CaseFileList.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/components/CaseInfo/CaseInfo.tsx b/apps/judicial-system/web/src/components/CaseInfo/CaseInfo.tsx
index 2973c84db8f8..d36978236b62 100644
--- a/apps/judicial-system/web/src/components/CaseInfo/CaseInfo.tsx
+++ b/apps/judicial-system/web/src/components/CaseInfo/CaseInfo.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import flatMap from 'lodash/flatMap'
 
diff --git a/apps/judicial-system/web/src/components/CaseResentExplanation/CaseResentExplanation.tsx b/apps/judicial-system/web/src/components/CaseResentExplanation/CaseResentExplanation.tsx
index ecc58f20534e..91d421ed44cd 100644
--- a/apps/judicial-system/web/src/components/CaseResentExplanation/CaseResentExplanation.tsx
+++ b/apps/judicial-system/web/src/components/CaseResentExplanation/CaseResentExplanation.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertMessage } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CaseResubmitModal/CaseResubmitModal.tsx b/apps/judicial-system/web/src/components/CaseResubmitModal/CaseResubmitModal.tsx
index 3098854ea785..4e3e1b74d16f 100644
--- a/apps/judicial-system/web/src/components/CaseResubmitModal/CaseResubmitModal.tsx
+++ b/apps/judicial-system/web/src/components/CaseResubmitModal/CaseResubmitModal.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useState } from 'react'
+import { FC, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 
 import { Box, Input } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CaseTitleInfoAndTags/CaseTitleInfoAndTags.tsx b/apps/judicial-system/web/src/components/CaseTitleInfoAndTags/CaseTitleInfoAndTags.tsx
index 25d4cddba584..1ed0759b7ba3 100644
--- a/apps/judicial-system/web/src/components/CaseTitleInfoAndTags/CaseTitleInfoAndTags.tsx
+++ b/apps/judicial-system/web/src/components/CaseTitleInfoAndTags/CaseTitleInfoAndTags.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CheckboxList/CheckboxList.tsx b/apps/judicial-system/web/src/components/CheckboxList/CheckboxList.tsx
index 6dc61c5a3595..842d9717faaf 100644
--- a/apps/judicial-system/web/src/components/CheckboxList/CheckboxList.tsx
+++ b/apps/judicial-system/web/src/components/CheckboxList/CheckboxList.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { MessageDescriptor, useIntl } from 'react-intl'
 
 import {
diff --git a/apps/judicial-system/web/src/components/CommentsInput/CommentsInput.tsx b/apps/judicial-system/web/src/components/CommentsInput/CommentsInput.tsx
index dd6d0132b59b..9ef10f22aeae 100644
--- a/apps/judicial-system/web/src/components/CommentsInput/CommentsInput.tsx
+++ b/apps/judicial-system/web/src/components/CommentsInput/CommentsInput.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Input, Text, Tooltip } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/Conclusion/Conclusion.tsx b/apps/judicial-system/web/src/components/Conclusion/Conclusion.tsx
index 81e43eafa628..7ae86f9ced02 100644
--- a/apps/judicial-system/web/src/components/Conclusion/Conclusion.tsx
+++ b/apps/judicial-system/web/src/components/Conclusion/Conclusion.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/ConclusionDraft/ConclusionDraft.tsx b/apps/judicial-system/web/src/components/ConclusionDraft/ConclusionDraft.tsx
index 6468484af796..85a9d6610b27 100644
--- a/apps/judicial-system/web/src/components/ConclusionDraft/ConclusionDraft.tsx
+++ b/apps/judicial-system/web/src/components/ConclusionDraft/ConclusionDraft.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
@@ -14,7 +14,7 @@ import { useCase } from '../../utils/hooks'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
 }
 
 const ConclusionDraft: FC<Props> = ({ workingCase, setWorkingCase }) => {
diff --git a/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.spec.tsx b/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.spec.tsx
index 9a356a75dafa..17c3b9c80bf1 100644
--- a/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.spec.tsx
+++ b/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { fireEvent, render, screen } from '@testing-library/react'
 
 import ContextMenu from '../ContextMenu/ContextMenu'
diff --git a/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.tsx b/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.tsx
index b090d518b5c7..93efd303c989 100644
--- a/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.tsx
+++ b/apps/judicial-system/web/src/components/ContextMenu/ContextMenu.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, ReactElement } from 'react'
+import { cloneElement, forwardRef, ReactElement } from 'react'
 import { useIntl } from 'react-intl'
 import cn from 'classnames'
 import { Menu, MenuButton, MenuItem, useMenuState } from 'reakit/Menu'
@@ -98,9 +98,7 @@ const ContextMenu = forwardRef<HTMLElement, ContextMenuProps & TestSupport>(
             {...disclosure.props}
             dataTestId={dataTestId}
           >
-            {(disclosureProps) =>
-              React.cloneElement(disclosure, disclosureProps)
-            }
+            {(disclosureProps) => cloneElement(disclosure, disclosureProps)}
           </MenuButton>
         ) : (
           <MenuButton as={Button} icon="add" {...menu} dataTestId={dataTestId}>
diff --git a/apps/judicial-system/web/src/components/ContextMenu/ContextMenuOptions/WithdrawAppealMenuOption.tsx b/apps/judicial-system/web/src/components/ContextMenu/ContextMenuOptions/WithdrawAppealMenuOption.tsx
index ed44b1d5279f..541d1dddf7a4 100644
--- a/apps/judicial-system/web/src/components/ContextMenu/ContextMenuOptions/WithdrawAppealMenuOption.tsx
+++ b/apps/judicial-system/web/src/components/ContextMenu/ContextMenuOptions/WithdrawAppealMenuOption.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { IconMapIcon } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx b/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx
index 713b7f0f548f..2e02d96fbad2 100644
--- a/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx
+++ b/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx
@@ -1,4 +1,4 @@
-import React, { FC, SetStateAction, useEffect, useState } from 'react'
+import { FC, SetStateAction, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import compareAsc from 'date-fns/compareAsc'
 
diff --git a/apps/judicial-system/web/src/components/CourtDocuments/CourtDocuments.tsx b/apps/judicial-system/web/src/components/CourtDocuments/CourtDocuments.tsx
index 6b3e782e60c6..4fb1f172cb6a 100644
--- a/apps/judicial-system/web/src/components/CourtDocuments/CourtDocuments.tsx
+++ b/apps/judicial-system/web/src/components/CourtDocuments/CourtDocuments.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { useIntl } from 'react-intl'
 import Select, {
   ClearIndicatorProps,
@@ -27,7 +27,7 @@ import * as styles from './CourtDocuments.css'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
 }
 
 const CourtDocuments: FC<Props> = ({ workingCase, setWorkingCase }) => {
diff --git a/apps/judicial-system/web/src/components/DateTime/DateTime.spec.tsx b/apps/judicial-system/web/src/components/DateTime/DateTime.spec.tsx
index 8e7438d3698b..3517db2e6825 100644
--- a/apps/judicial-system/web/src/components/DateTime/DateTime.spec.tsx
+++ b/apps/judicial-system/web/src/components/DateTime/DateTime.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { IntlProvider } from 'react-intl'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
diff --git a/apps/judicial-system/web/src/components/DateTime/DateTime.tsx b/apps/judicial-system/web/src/components/DateTime/DateTime.tsx
index 51fc33193852..3c6fb416ce9f 100644
--- a/apps/judicial-system/web/src/components/DateTime/DateTime.tsx
+++ b/apps/judicial-system/web/src/components/DateTime/DateTime.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useEffect, useState } from 'react'
+import { ChangeEvent, FC, FocusEvent, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { DatePicker, Input } from '@island.is/island-ui/core'
@@ -117,7 +117,7 @@ const DateTime: FC<Props> = ({
     )
   }
 
-  const onTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const onTimeChange = (event: ChangeEvent<HTMLInputElement>) => {
     const newTime = event.target.value
 
     setCurrentTime(newTime)
@@ -133,7 +133,7 @@ const DateTime: FC<Props> = ({
     sendToParent(currentDate, newTime)
   }
 
-  const onTimeBlur = (event: React.FocusEvent<HTMLInputElement>) => {
+  const onTimeBlur = (event: FocusEvent<HTMLInputElement>) => {
     const time = event.target.value
 
     const validations: Validation[] = ['empty', 'time-format']
diff --git a/apps/judicial-system/web/src/components/Decision/Decision.tsx b/apps/judicial-system/web/src/components/Decision/Decision.tsx
index 462cceedc652..52b7c992d278 100644
--- a/apps/judicial-system/web/src/components/Decision/Decision.tsx
+++ b/apps/judicial-system/web/src/components/Decision/Decision.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useState } from 'react'
+import { FC, useState } from 'react'
 
 import { Box, RadioButton } from '@island.is/island-ui/core'
 import {
diff --git a/apps/judicial-system/web/src/components/DefenderInfo/DefenderInfo.tsx b/apps/judicial-system/web/src/components/DefenderInfo/DefenderInfo.tsx
index e7173344dac0..4b66b1f1b215 100644
--- a/apps/judicial-system/web/src/components/DefenderInfo/DefenderInfo.tsx
+++ b/apps/judicial-system/web/src/components/DefenderInfo/DefenderInfo.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, RadioButton, Text, Tooltip } from '@island.is/island-ui/core'
@@ -24,7 +24,7 @@ import { defenderInfo } from './DefenderInfo.strings'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
 }
 
 const DefenderInfo: FC<Props> = ({ workingCase, setWorkingCase }) => {
diff --git a/apps/judicial-system/web/src/components/DefenderInfo/DefenderInput.tsx b/apps/judicial-system/web/src/components/DefenderInfo/DefenderInput.tsx
index a4d29662e43f..bb0b879fc0bc 100644
--- a/apps/judicial-system/web/src/components/DefenderInfo/DefenderInput.tsx
+++ b/apps/judicial-system/web/src/components/DefenderInfo/DefenderInput.tsx
@@ -1,4 +1,5 @@
-import React, {
+import {
+  Dispatch,
   FC,
   SetStateAction,
   useCallback,
@@ -43,7 +44,7 @@ interface PropertyValidation {
   validations: Validation[]
   errorMessageHandler: {
     errorMessage: string
-    setErrorMessage: React.Dispatch<React.SetStateAction<string>>
+    setErrorMessage: Dispatch<SetStateAction<string>>
   }
 }
 
@@ -167,7 +168,7 @@ const DefenderInput: FC<Props> = ({
       defendantId: string,
       property: InputType,
       value: string,
-      setWorkingCase: React.Dispatch<SetStateAction<Case>>,
+      setWorkingCase: Dispatch<SetStateAction<Case>>,
     ) => {
       let newValue = value
       const propertyValidation = propertyValidations(property)
diff --git a/apps/judicial-system/web/src/components/DefenderInfo/DefenderNotFound.tsx b/apps/judicial-system/web/src/components/DefenderInfo/DefenderNotFound.tsx
index fcff56632090..63bd28f2ab6f 100644
--- a/apps/judicial-system/web/src/components/DefenderInfo/DefenderNotFound.tsx
+++ b/apps/judicial-system/web/src/components/DefenderInfo/DefenderNotFound.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertMessage, Box } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.css.ts b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.css.ts
new file mode 100644
index 000000000000..e95d143b936d
--- /dev/null
+++ b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.css.ts
@@ -0,0 +1,78 @@
+import { style, styleVariants } from '@vanilla-extract/css'
+
+import { theme } from '@island.is/island-ui/theme'
+
+export const caseFileWrapper = style({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'stretch',
+  paddingRight: `${theme.spacing[2]}px`,
+  paddingTop: `${theme.spacing[1]}px`,
+  paddingBottom: `${theme.spacing[1]}px`,
+  minHeight: '64px',
+  borderRadius: theme.border.radius.large,
+  border: '1px solid',
+  transition: 'background-color 0.2s ease-in-out',
+})
+
+export const caseFileWrapperStates = styleVariants({
+  error: {
+    background: theme.color.red100,
+    borderColor: 'transparent',
+  },
+  done: {
+    background: theme.color.blue100,
+    borderColor: 'transparent',
+  },
+  uploading: {
+    background: 'transparent',
+    borderColor: theme.color.blue200,
+  },
+})
+
+export const editCaseFileInputContainer = style({
+  display: 'flex',
+  flexDirection: 'row',
+  flexGrow: 1,
+  marginRight: theme.spacing[2],
+})
+
+export const editCaseFileName = style({
+  flex: 2,
+  marginRight: theme.spacing[1],
+})
+
+export const editCaseFileDisplayDate = style({
+  flex: 1,
+})
+
+export const editCaseFileButton = style({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  width: '32px',
+  height: '34px',
+  padding: '4px',
+  borderRadius: theme.border.radius.large,
+  transition: 'background-color 0.2s ease-in-out',
+  cursor: 'default',
+})
+
+export const background = styleVariants({
+  primary: {
+    selectors: {
+      '&:hover': {
+        backgroundColor: theme.color.blue200,
+        cursor: 'pointer',
+      },
+    },
+  },
+  secondary: {
+    selectors: {
+      '&:hover': {
+        backgroundColor: theme.color.red200,
+        cursor: 'pointer',
+      },
+    },
+  },
+})
diff --git a/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.strings.ts b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.strings.ts
new file mode 100644
index 000000000000..19d68eb2b320
--- /dev/null
+++ b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.strings.ts
@@ -0,0 +1,23 @@
+import { defineMessage } from 'react-intl'
+
+export const strings = {
+  simpleInputPlaceholder: defineMessage({
+    id: 'judicial.system.core:editable_case_file.simple_input_placeholder',
+    defaultMessage: 'Skráðu inn heiti á skjali',
+    description:
+      'Notaður sem skýritexti í textasvæði reit til að breyta heiti skjals.',
+  }),
+  invalidFilenameErrorMessage: {
+    id: 'judicial.system.core:editable_case_file.invalid_filename_error_message',
+    defaultMessage: 'Ekki tókst að uppfæra skjal, heiti er tómt',
+    description:
+      'Notaður sem villuboð þegar tekst ekki að uppfæra heiti á skjali.',
+  },
+  invalidDateErrorMessage: {
+    id: 'judicial.system.core:editable_case_file.invalid_date_error_message',
+    defaultMessage:
+      'Ekki tókst að uppfæra skjal, dagsetning er ekki á réttu formi',
+    description:
+      'Notaður sem villuboð þegar tekst ekki að uppfæra dagsetningu á skjali.',
+  },
+}
diff --git a/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.tsx b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.tsx
new file mode 100644
index 000000000000..bc8642ef40a0
--- /dev/null
+++ b/apps/judicial-system/web/src/components/EditableCaseFile/EditableCaseFile.tsx
@@ -0,0 +1,295 @@
+import { FC, useMemo, useState } from 'react'
+import InputMask from 'react-input-mask'
+import { useIntl } from 'react-intl'
+import { useMeasure } from 'react-use'
+import cn from 'classnames'
+import isValid from 'date-fns/isValid'
+import parseISO from 'date-fns/parseISO'
+import { AnimatePresence, motion } from 'framer-motion'
+
+import {
+  Box,
+  Icon,
+  Input,
+  LoadingDots,
+  Text,
+  toast,
+  UploadFile,
+  UploadFileStatus,
+} from '@island.is/island-ui/core'
+import { formatDate } from '@island.is/judicial-system/formatters'
+
+import { CaseFileCategory } from '../../graphql/schema'
+import { TUploadFile } from '../../utils/hooks'
+import { strings } from './EditableCaseFile.strings'
+import * as styles from './EditableCaseFile.css'
+
+export interface TEditableCaseFile {
+  id: string
+  category?: CaseFileCategory | null
+  created?: string | null
+  displayText?: string | null
+  userGeneratedFilename?: string | null
+  displayDate?: string | null
+  canOpen?: boolean
+  canEdit?: boolean
+  status?: UploadFileStatus
+}
+
+interface Props {
+  enableDrag: boolean
+  caseFile: TEditableCaseFile
+  onOpen: (id: string) => void
+  onRename: (id: string, name: string, displayDate: string) => void
+  onDelete: (file: TUploadFile) => void
+  onRetry?: (file: TUploadFile) => void
+  onStartEditing: () => void
+  onStopEditing: () => void
+}
+
+const EditableCaseFile: FC<Props> = (props) => {
+  const {
+    caseFile,
+    enableDrag,
+    onOpen,
+    onRename,
+    onDelete,
+    onRetry,
+    onStartEditing,
+    onStopEditing,
+  } = props
+  const { formatMessage } = useIntl()
+  const [ref, { width }] = useMeasure<HTMLDivElement>()
+  const [isEditing, setIsEditing] = useState<boolean>(false)
+
+  const [editedFilename, setEditedFilename] = useState<
+    string | undefined | null
+  >(caseFile.userGeneratedFilename)
+
+  const [editedDisplayDate, setEditedDisplayDate] = useState<
+    string | undefined
+  >(formatDate(caseFile.displayDate ?? caseFile.created) ?? undefined)
+  const displayName = caseFile.userGeneratedFilename ?? caseFile.displayText
+
+  const handleEditFileButtonClick = () => {
+    const trimmedFilename = editedFilename?.trim()
+    const trimmedDisplayDate = editedDisplayDate?.trim()
+
+    if (trimmedFilename === undefined || trimmedFilename.length === 0) {
+      toast.error(formatMessage(strings.invalidFilenameErrorMessage))
+      return
+    }
+
+    let newDate: Date | undefined
+
+    if (trimmedDisplayDate) {
+      const [day, month, year] = trimmedDisplayDate.split('.')
+      newDate = parseISO(`${year}-${month}-${day}`)
+    }
+
+    if (!newDate || !isValid(newDate)) {
+      toast.error(formatMessage(strings.invalidDateErrorMessage))
+      return
+    }
+
+    onRename(caseFile.id, trimmedFilename, newDate.toISOString())
+
+    setIsEditing(false)
+    onStopEditing()
+  }
+
+  const displayDate = useMemo(() => {
+    return formatDate(caseFile.displayDate ?? caseFile.created)
+  }, [caseFile.displayDate, caseFile.created])
+
+  return (
+    <div
+      className={cn(
+        styles.caseFileWrapper,
+        styles.caseFileWrapperStates[caseFile.status || 'uploading'],
+      )}
+    >
+      {enableDrag && (
+        <Box
+          data-testid="caseFileDragHandle"
+          display="flex"
+          paddingX={3}
+          paddingY={2}
+        >
+          <Icon icon="menu" color="blue400" />
+        </Box>
+      )}
+      <Box width="full" paddingLeft={enableDrag ? 0 : 2}>
+        <AnimatePresence initial={false} mode="wait">
+          {isEditing ? (
+            <motion.div
+              initial={{ y: 10, opacity: 0 }}
+              animate={{ y: 0, opacity: 1 }}
+              exit={{ y: 10, opacity: 0 }}
+              transition={{ duration: 0.2 }}
+              key={`${caseFile.id}-edit`}
+              aria-live="polite"
+            >
+              <Box display="flex">
+                <Box className={styles.editCaseFileInputContainer}>
+                  <Box className={styles.editCaseFileName}>
+                    <Input
+                      name="fileName"
+                      size="xs"
+                      placeholder={formatMessage(
+                        strings.simpleInputPlaceholder,
+                      )}
+                      defaultValue={displayName ?? undefined}
+                      onChange={(evt) => setEditedFilename(evt.target.value)}
+                    />
+                  </Box>
+                  <Box className={styles.editCaseFileDisplayDate}>
+                    <InputMask
+                      mask="99.99.9999"
+                      maskPlaceholder={null}
+                      value={editedDisplayDate || ''}
+                      onChange={(evt) => {
+                        setEditedDisplayDate(evt.target.value)
+                      }}
+                    >
+                      <Input
+                        name="fileDisplayDate"
+                        size="xs"
+                        placeholder={formatDate(new Date())}
+                        autoComplete="off"
+                      />
+                    </InputMask>
+                  </Box>
+                </Box>
+                <Box display="flex" alignItems="center">
+                  <button
+                    onClick={handleEditFileButtonClick}
+                    className={cn(styles.editCaseFileButton, {
+                      [styles.background.primary]: caseFile.status !== 'error',
+                      [styles.background.secondary]:
+                        caseFile.status === 'error',
+                    })}
+                    aria-label="Vista breytingar"
+                  >
+                    <Icon
+                      icon="checkmark"
+                      color={caseFile.status === 'error' ? 'red400' : 'blue400'}
+                    />
+                  </button>
+                  <Box marginLeft={1}>
+                    <button
+                      onClick={() => onDelete(caseFile as TUploadFile)}
+                      className={cn(styles.editCaseFileButton, {
+                        [styles.background.primary]:
+                          caseFile.status !== 'error',
+                        [styles.background.secondary]:
+                          caseFile.status === 'error',
+                      })}
+                      aria-label="Eyða skrá"
+                    >
+                      <Icon
+                        icon="trash"
+                        color={
+                          caseFile.status === 'error' ? 'red400' : 'blue400'
+                        }
+                        type="outline"
+                      />
+                    </button>
+                  </Box>
+                </Box>
+              </Box>
+            </motion.div>
+          ) : (
+            <motion.div
+              initial={{ y: -10, opacity: 0 }}
+              animate={{ y: 0, opacity: 1 }}
+              exit={{ y: -10, opacity: 0 }}
+              transition={{ duration: 0.2 }}
+              key={`${caseFile.id}-view`}
+              ref={ref}
+              style={{
+                display: 'flex',
+                justifyContent: 'space-between',
+              }}
+              aria-live="polite"
+            >
+              <Box
+                display="flex"
+                alignItems="center"
+                component={caseFile.canOpen ? 'button' : undefined}
+                onClick={() => {
+                  if (caseFile.canOpen && caseFile.id) {
+                    onOpen(caseFile.id)
+                  }
+                }}
+              >
+                <Text variant="h5">
+                  <span
+                    style={{
+                      display: 'block',
+                      maxWidth: `${width - 180}px`,
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {displayName}
+                  </span>
+                </Text>
+                {caseFile.canOpen && (
+                  <Box marginLeft={1}>
+                    <Icon icon="open" type="outline" size="small" />
+                  </Box>
+                )}
+              </Box>
+              <Box display="flex" alignItems="center">
+                <Box marginRight={1}>
+                  <Text variant="small">{displayDate}</Text>
+                </Box>
+
+                {caseFile.status === 'uploading' ? (
+                  <Box className={styles.editCaseFileButton}>
+                    <LoadingDots single />
+                  </Box>
+                ) : caseFile.status === 'error' && onRetry ? (
+                  <button
+                    onClick={() => onRetry(caseFile as UploadFile)}
+                    className={cn(
+                      styles.editCaseFileButton,
+                      styles.background.secondary,
+                    )}
+                    aria-label="Reyna aftur að hlaða upp skrá"
+                  >
+                    <Icon icon="reload" color="red400" />
+                  </button>
+                ) : (
+                  <button
+                    onClick={() => {
+                      setIsEditing(true)
+                      onStartEditing()
+                    }}
+                    className={cn(styles.editCaseFileButton, {
+                      [styles.background.primary]:
+                        caseFile.canEdit && caseFile.status !== 'error',
+                      [styles.background.secondary]:
+                        caseFile.status === 'error',
+                    })}
+                    disabled={!caseFile.canEdit}
+                    aria-label="Breyta skrá"
+                  >
+                    <Icon
+                      icon="pencil"
+                      color={caseFile.status === 'error' ? 'red400' : 'blue400'}
+                    />
+                  </button>
+                )}
+              </Box>
+            </motion.div>
+          )}
+        </AnimatePresence>
+      </Box>
+    </div>
+  )
+}
+
+export default EditableCaseFile
diff --git a/apps/judicial-system/web/src/components/FeatureProvider/FeatureProvider.tsx b/apps/judicial-system/web/src/components/FeatureProvider/FeatureProvider.tsx
index eab320d35b0c..1d6bc51a718c 100644
--- a/apps/judicial-system/web/src/components/FeatureProvider/FeatureProvider.tsx
+++ b/apps/judicial-system/web/src/components/FeatureProvider/FeatureProvider.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   createContext,
   FC,
   PropsWithChildren,
diff --git a/apps/judicial-system/web/src/components/FileNotFoundModal/FileNotFoundModal.tsx b/apps/judicial-system/web/src/components/FileNotFoundModal/FileNotFoundModal.tsx
index 9f76a2abbdaf..8a94c61b8cd1 100644
--- a/apps/judicial-system/web/src/components/FileNotFoundModal/FileNotFoundModal.tsx
+++ b/apps/judicial-system/web/src/components/FileNotFoundModal/FileNotFoundModal.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Modal } from '@island.is/judicial-system-web/src/components'
diff --git a/apps/judicial-system/web/src/components/FormContentContainer/FormContentContainer.tsx b/apps/judicial-system/web/src/components/FormContentContainer/FormContentContainer.tsx
index e5a04be58286..4febcea7f59b 100644
--- a/apps/judicial-system/web/src/components/FormContentContainer/FormContentContainer.tsx
+++ b/apps/judicial-system/web/src/components/FormContentContainer/FormContentContainer.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 
 import { Box } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/FormFooter/FormFooter.tsx b/apps/judicial-system/web/src/components/FormFooter/FormFooter.tsx
index 86da4c6a855e..de5c61141208 100644
--- a/apps/judicial-system/web/src/components/FormFooter/FormFooter.tsx
+++ b/apps/judicial-system/web/src/components/FormFooter/FormFooter.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { useWindowSize } from 'react-use'
 import cn from 'classnames'
diff --git a/apps/judicial-system/web/src/components/FormProvider/FormProvider.tsx b/apps/judicial-system/web/src/components/FormProvider/FormProvider.tsx
index d52ce2e8ec6f..dcf155032e9d 100644
--- a/apps/judicial-system/web/src/components/FormProvider/FormProvider.tsx
+++ b/apps/judicial-system/web/src/components/FormProvider/FormProvider.tsx
@@ -1,6 +1,8 @@
-import React, {
+import {
   createContext,
+  Dispatch,
   ReactNode,
+  SetStateAction,
   useCallback,
   useContext,
   useEffect,
@@ -35,7 +37,7 @@ type ProviderState =
 
 interface FormProvider {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   isLoadingWorkingCase: boolean
   caseNotFound: boolean
   isCaseUpToDate: boolean
diff --git a/apps/judicial-system/web/src/components/FormProvider/case.graphql b/apps/judicial-system/web/src/components/FormProvider/case.graphql
index 2aff01484b69..ccededfe5708 100644
--- a/apps/judicial-system/web/src/components/FormProvider/case.graphql
+++ b/apps/judicial-system/web/src/components/FormProvider/case.graphql
@@ -171,6 +171,7 @@ query Case($input: CaseQueryInput!) {
       userGeneratedFilename
       displayDate
       policeFileId
+      submittedBy
     }
     isAppealDeadlineExpired
     isAppealGracePeriodExpired
diff --git a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql
index 39b75cd6e736..bf9cadbb55d0 100644
--- a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql
+++ b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql
@@ -14,6 +14,9 @@ query LimitedAccessCase($input: CaseQueryInput!) {
       category
       key
       policeCaseNumber
+      userGeneratedFilename
+      displayDate
+      submittedBy
     }
     defendants {
       id
diff --git a/apps/judicial-system/web/src/components/Header/Header.tsx b/apps/judicial-system/web/src/components/Header/Header.tsx
index a43d8b6dfc5e..d2289ad8942a 100644
--- a/apps/judicial-system/web/src/components/Header/Header.tsx
+++ b/apps/judicial-system/web/src/components/Header/Header.tsx
@@ -1,10 +1,4 @@
-import React, {
-  FC,
-  PropsWithChildren,
-  useContext,
-  useEffect,
-  useState,
-} from 'react'
+import { FC, PropsWithChildren, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import getConfig from 'next/config'
 import Link from 'next/link'
diff --git a/apps/judicial-system/web/src/components/HideableText/HideableText.tsx b/apps/judicial-system/web/src/components/HideableText/HideableText.tsx
index 14291297c412..9e07f195b551 100644
--- a/apps/judicial-system/web/src/components/HideableText/HideableText.tsx
+++ b/apps/judicial-system/web/src/components/HideableText/HideableText.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { AnimatePresence, motion } from 'framer-motion'
 
 import { Icon, Text, Tooltip } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/IconAndText/IconAndText.tsx b/apps/judicial-system/web/src/components/IconAndText/IconAndText.tsx
index c33ae8a068ef..f617ddbc0700 100644
--- a/apps/judicial-system/web/src/components/IconAndText/IconAndText.tsx
+++ b/apps/judicial-system/web/src/components/IconAndText/IconAndText.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Icon, IconMapIcon, Text } from '@island.is/island-ui/core'
 import { Colors } from '@island.is/island-ui/theme'
diff --git a/apps/judicial-system/web/src/components/IconButton/IconButton.tsx b/apps/judicial-system/web/src/components/IconButton/IconButton.tsx
index fbb6023dfacf..de9344b94464 100644
--- a/apps/judicial-system/web/src/components/IconButton/IconButton.tsx
+++ b/apps/judicial-system/web/src/components/IconButton/IconButton.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef, MouseEvent } from 'react'
 import cn from 'classnames'
 import { Button } from 'reakit'
 
@@ -9,7 +9,7 @@ import * as styles from './IconButton.css'
 interface Props {
   icon: IconMapIcon
   colorScheme: 'blue' | 'red' | 'transparent'
-  onClick?: (evt: React.MouseEvent) => void
+  onClick?: (evt: MouseEvent) => void
   disabled?: boolean
 }
 
diff --git a/apps/judicial-system/web/src/components/Icons/Trash.tsx b/apps/judicial-system/web/src/components/Icons/Trash.tsx
index 80d54d66bd16..aced519b04bd 100644
--- a/apps/judicial-system/web/src/components/Icons/Trash.tsx
+++ b/apps/judicial-system/web/src/components/Icons/Trash.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
+import { SVGProps } from 'react'
 
-const Trash = ({ ...props }: React.SVGProps<SVGSVGElement>) => {
+const Trash = ({ ...props }: SVGProps<SVGSVGElement>) => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.spec.tsx b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.spec.tsx
new file mode 100644
index 000000000000..fdb75baa1555
--- /dev/null
+++ b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.spec.tsx
@@ -0,0 +1,36 @@
+import { render, screen } from '@testing-library/react'
+
+import {
+  CaseDecision,
+  CaseFileCategory,
+  CaseType,
+} from '@island.is/judicial-system-web/src/graphql/schema'
+import {
+  mockCase,
+  mockCaseFile,
+} from '@island.is/judicial-system-web/src/utils/mocks'
+import {
+  ApolloProviderWrapper,
+  IntlProviderWrapper,
+} from '@island.is/judicial-system-web/src/utils/testHelpers'
+
+import IndictmentCaseFilesList from './IndictmentCaseFilesList'
+
+describe('IndictmentCaseFilesList', () => {
+  it('should render court records if there are courtRecord case files', () => {
+    render(
+      <IntlProviderWrapper>
+        <ApolloProviderWrapper>
+          <IndictmentCaseFilesList
+            workingCase={{
+              ...mockCase(CaseType.INDICTMENT),
+              caseFiles: [mockCaseFile(CaseFileCategory.COURT_RECORD)],
+            }}
+          />
+        </ApolloProviderWrapper>
+      </IntlProviderWrapper>,
+    )
+
+    expect(screen.queryByTestId('PDFButton')).not.toBeNull()
+  })
+})
diff --git a/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.strings.ts b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.strings.ts
index 5760aa5c642a..134cae5bdca9 100644
--- a/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.strings.ts
+++ b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.strings.ts
@@ -22,4 +22,10 @@ export const strings = defineMessages({
     defaultMessage: 'Dómar, úrskurðir og þingbók',
     description: 'Notaður sem titill á dómur hluta á dómskjalaskjá í ákærum.',
   },
+  uploadedCaseFiles: {
+    id: 'judicial.system.core:court.indictment_case_files_list.uploaded_case_files',
+    defaultMessage: 'Innsend gögn',
+    description:
+      'Notaður sem titill á innsend gögn hluta á dómskjalaskjá í ákærum.',
+  },
 })
diff --git a/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.tsx b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.tsx
index 2ca7a2076909..aad0eb781b67 100644
--- a/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.tsx
+++ b/apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
@@ -23,6 +23,7 @@ import {
 import { TempCase as Case } from '@island.is/judicial-system-web/src/types'
 import { useFileList } from '@island.is/judicial-system-web/src/utils/hooks'
 
+import { CaseFileTable } from '../Table'
 import { caseFiles } from '../../routes/Prosecutor/Indictments/CaseFiles/CaseFiles.strings'
 import { strings } from './IndictmentCaseFilesList.strings'
 
@@ -93,6 +94,11 @@ const IndictmentCaseFilesList: FC<Props> = ({
   const criminalRecordUpdate = cf?.filter(
     (file) => file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
   )
+  const uploadedCaseFiles = cf?.filter(
+    (file) =>
+      file.category === CaseFileCategory.PROSECUTOR_CASE_FILE ||
+      file.category === CaseFileCategory.DEFENDANT_CASE_FILE,
+  )
 
   return (
     <>
@@ -120,7 +126,7 @@ const IndictmentCaseFilesList: FC<Props> = ({
             <PdfButton
               caseId={workingCase.id}
               title={formatMessage(caseFiles.trafficViolationIndictmentTitle)}
-              pdfType={'indictment'}
+              pdfType="indictment"
               renderAs="row"
             />
           </Box>
@@ -178,7 +184,6 @@ const IndictmentCaseFilesList: FC<Props> = ({
           />
         </Box>
       )}
-
       <Box marginBottom={5}>
         <Text variant="h4" as="h4" marginBottom={1}>
           {formatMessage(strings.caseFileTitle)}
@@ -190,15 +195,14 @@ const IndictmentCaseFilesList: FC<Props> = ({
               title={formatMessage(strings.caseFileButtonText, {
                 policeCaseNumber,
               })}
-              pdfType={'caseFilesRecord'}
+              pdfType="caseFilesRecord"
               elementId={policeCaseNumber}
               renderAs="row"
             />
           </Box>
         ))}
       </Box>
-      {(isDistrictCourtUser(user) || isCompletedCase(workingCase.state)) &&
-      (courtRecords?.length || rulings?.length) ? (
+      {courtRecords?.length || rulings?.length ? (
         <Box marginBottom={5}>
           <Text variant="h4" as="h4" marginBottom={1}>
             {formatMessage(strings.rulingAndCourtRecordsTitle)}
@@ -210,16 +214,25 @@ const IndictmentCaseFilesList: FC<Props> = ({
               workingCase={workingCase}
             />
           )}
-          {rulings && rulings.length > 0 && (
-            <RenderFiles
-              caseFiles={rulings}
-              onOpenFile={onOpen}
-              workingCase={workingCase}
-            />
-          )}
+          {(isDistrictCourtUser(user) || isCompletedCase(workingCase.state)) &&
+            rulings &&
+            rulings.length > 0 && (
+              <RenderFiles
+                caseFiles={rulings}
+                onOpenFile={onOpen}
+                workingCase={workingCase}
+              />
+            )}
         </Box>
       ) : null}
-
+      {uploadedCaseFiles && uploadedCaseFiles.length > 0 && (
+        <Box marginBottom={5}>
+          <Text variant="h4" as="h4" marginBottom={3}>
+            {formatMessage(strings.uploadedCaseFiles)}
+          </Text>
+          <CaseFileTable caseFiles={uploadedCaseFiles} onOpenFile={onOpen} />
+        </Box>
+      )}
       <AnimatePresence>
         {fileNotFound && <FileNotFoundModal dismiss={dismissFileNotFound} />}
       </AnimatePresence>
diff --git a/apps/judicial-system/web/src/components/IndictmentInfo/IndictmentInfo.tsx b/apps/judicial-system/web/src/components/IndictmentInfo/IndictmentInfo.tsx
index b8867ac15a94..191c6727947f 100644
--- a/apps/judicial-system/web/src/components/IndictmentInfo/IndictmentInfo.tsx
+++ b/apps/judicial-system/web/src/components/IndictmentInfo/IndictmentInfo.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/InfoBox/InfoBox.tsx b/apps/judicial-system/web/src/components/InfoBox/InfoBox.tsx
index db4e1a06fff9..cee437933641 100644
--- a/apps/judicial-system/web/src/components/InfoBox/InfoBox.tsx
+++ b/apps/judicial-system/web/src/components/InfoBox/InfoBox.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import cn from 'classnames'
 
 import { Box, Icon, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.spec.ts b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.spec.ts
index 0cc3f55efe69..5333f47cbe61 100644
--- a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.spec.ts
+++ b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.spec.ts
@@ -13,11 +13,28 @@ describe('DefendantInfo', () => {
       jest.useRealTimers()
     })
 
-    test('should return the correct string if viewDate is not provided', () => {
-      const viewDate = undefined
-      const serviceRequirement = ServiceRequirement.NOT_REQUIRED
+    test('should return the correct string if serviceRequirement is REQUIRED and verdictAppealDeadline is not provided', () => {
+      const verdictAppealDeadline = undefined
+      const serviceRequirement = ServiceRequirement.REQUIRED
 
-      const dataSections = getAppealExpirationInfo(viewDate, serviceRequirement)
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
+
+      expect(dataSections.message.id).toStrictEqual(
+        'judicial.system.core:info_card.defendant_info.appeal_date_not_begun',
+      )
+    })
+
+    test('should return the correct string if serviceRequirement is NOT_APPLICABLE and verdictAppealDeadline is not provided', () => {
+      const verdictAppealDeadline = undefined
+      const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
+
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
 
       expect(dataSections.message.id).toStrictEqual(
         'judicial.system.core:info_card.defendant_info.appeal_date_not_begun',
@@ -25,49 +42,77 @@ describe('DefendantInfo', () => {
     })
 
     test('should return the correct string if serviceRequirement is NOT_REQUIRED', () => {
-      const viewDate = '2024-07-08'
+      const verdictAppealDeadline = undefined
       const serviceRequirement = ServiceRequirement.NOT_REQUIRED
 
-      const dataSections = getAppealExpirationInfo(viewDate, serviceRequirement)
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
 
       expect(dataSections.message.id).toStrictEqual(
-        'judicial.system.core:info_card.defendant_info.service_requirement_not_required',
+        'judicial.system.core:info_card.defendant_info.service_requirement_not_required_v1',
       )
     })
 
-    test('should return the correct string if serviceRequirement is NOT_APPLICABLE', () => {
-      const viewDate = '2024-07-08'
-      const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
+    test('should return the correct string if serviceRequirement is REQUIRED and appeal expiration date is in the future', () => {
+      const verdictAppealDeadline = '2024-08-05'
+      const serviceRequirement = ServiceRequirement.REQUIRED
 
-      const dataSections = getAppealExpirationInfo(viewDate, serviceRequirement)
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
 
       expect(dataSections.message.id).toStrictEqual(
-        'judicial.system.core:info_card.defendant_info.service_requirement_not_applicable',
+        'judicial.system.core:info_card.defendant_info.appeal_expiration_date',
       )
+      expect(dataSections.date).toStrictEqual('05.08.2024')
     })
 
-    test('should return the correct string if appeal expiration date is in the future', () => {
-      const viewDate = '2024-07-08'
-      const serviceRequirement = ServiceRequirement.REQUIRED
+    test('should return the correct string if serviceRequirement is NOT_APPLICABLE and appeal expiration date is in the future', () => {
+      const verdictAppealDeadline = '2024-08-05'
+      const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
 
-      const dataSections = getAppealExpirationInfo(viewDate, serviceRequirement)
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
 
       expect(dataSections.message.id).toStrictEqual(
         'judicial.system.core:info_card.defendant_info.appeal_expiration_date',
       )
-      expect(dataSections.data).toStrictEqual('05.08.2024')
+      expect(dataSections.date).toStrictEqual('05.08.2024')
     })
 
-    test('should return the correct string if appeal expiration date is in the past', () => {
-      const viewDate = '2024-06-09'
+    test('should return the correct string if serviceRequirement is REQUIRED and appeal expiration date is in the past', () => {
+      const verdictAppealDeadline = '2024-07-07'
       const serviceRequirement = ServiceRequirement.REQUIRED
 
-      const dataSections = getAppealExpirationInfo(viewDate, serviceRequirement)
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
+
+      expect(dataSections.message.id).toStrictEqual(
+        'judicial.system.core:info_card.defendant_info.appeal_date_expired',
+      )
+      expect(dataSections.date).toStrictEqual('07.07.2024')
+    })
+
+    test('should return the correct string if serviceRequirement is NOT_APPLICABLE and appeal expiration date is in the past', () => {
+      const verdictAppealDeadline = '2024-07-07'
+      const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
+
+      const dataSections = getAppealExpirationInfo(
+        verdictAppealDeadline,
+        serviceRequirement,
+      )
 
       expect(dataSections.message.id).toStrictEqual(
         'judicial.system.core:info_card.defendant_info.appeal_date_expired',
       )
-      expect(dataSections.data).toStrictEqual('07.07.2024')
+      expect(dataSections.date).toStrictEqual('07.07.2024')
     })
   })
 })
diff --git a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts
index d2ba1afbfc85..3bd4c5af473a 100644
--- a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts
+++ b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts
@@ -19,12 +19,7 @@ export const strings = defineMessages({
       'Notaður til að láta vita að áfrýjunarfrestur dómfellda er ekki hafinn.',
   },
   serviceRequirementNotRequired: {
-    id: 'judicial.system.core:info_card.defendant_info.service_requirement_not_required',
-    defaultMessage: 'Dómfelldi var viðstaddur dómþing',
-    description: 'Notað til að láta vita birting dóms er ekki nauðsynleg.',
-  },
-  serviceRequirementNotApplicable: {
-    id: 'judicial.system.core:info_card.defendant_info.service_requirement_not_applicable',
+    id: 'judicial.system.core:info_card.defendant_info.service_requirement_not_required_v1',
     defaultMessage: 'Birting dóms ekki þörf',
     description: 'Notað til að láta vita birting dóms er ekki nauðsynleg.',
   },
diff --git a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx
index a21584d0ec62..1666858b4342 100644
--- a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx
+++ b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx
@@ -37,31 +37,27 @@ interface DefendantInfoProps {
 }
 
 export const getAppealExpirationInfo = (
-  viewDate?: string | null,
+  verdictAppealDeadline?: string | null,
   serviceRequirement?: ServiceRequirement | null,
 ) => {
-  if (!viewDate) {
-    return { message: strings.appealDateNotBegun, data: null }
-  }
-
   if (serviceRequirement === ServiceRequirement.NOT_REQUIRED) {
     return { message: strings.serviceRequirementNotRequired, data: null }
   }
 
-  if (serviceRequirement === ServiceRequirement.NOT_APPLICABLE) {
-    return { message: strings.serviceRequirementNotApplicable, data: null }
+  if (!verdictAppealDeadline) {
+    return { message: strings.appealDateNotBegun, date: null }
   }
 
+  // TODO: Move to the server as today may not be accurate in the client
   const today = new Date()
-  const expiryDate = new Date(viewDate)
-  expiryDate.setDate(expiryDate.getDate() + 28)
+  const expiryDate = new Date(verdictAppealDeadline)
 
   const message =
     today < expiryDate
       ? strings.appealExpirationDate
       : strings.appealDateExpired
 
-  return { message, data: formatDate(expiryDate) }
+  return { message, date: formatDate(expiryDate) }
 }
 
 export const DefendantInfo: FC<DefendantInfoProps> = (props) => {
@@ -75,7 +71,7 @@ export const DefendantInfo: FC<DefendantInfoProps> = (props) => {
   const { formatMessage } = useIntl()
 
   const appealExpirationInfo = getAppealExpirationInfo(
-    defendant.verdictViewDate,
+    defendant.verdictAppealDeadline,
     defendant.serviceRequirement,
   )
 
@@ -123,7 +119,7 @@ export const DefendantInfo: FC<DefendantInfoProps> = (props) => {
           <Box>
             <Text as="span">
               {formatMessage(appealExpirationInfo.message, {
-                appealExpirationDate: appealExpirationInfo.data,
+                appealExpirationDate: appealExpirationInfo.date,
               })}
             </Text>
           </Box>
diff --git a/apps/judicial-system/web/src/components/InfoCard/InfoCard.spec.tsx b/apps/judicial-system/web/src/components/InfoCard/InfoCard.spec.tsx
index c0553cf85115..4555f3428f19 100644
--- a/apps/judicial-system/web/src/components/InfoCard/InfoCard.spec.tsx
+++ b/apps/judicial-system/web/src/components/InfoCard/InfoCard.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
 
diff --git a/apps/judicial-system/web/src/components/InfoCard/InfoCardActiveIndictment.tsx b/apps/judicial-system/web/src/components/InfoCard/InfoCardActiveIndictment.tsx
index a46241348090..f24fec7cc266 100644
--- a/apps/judicial-system/web/src/components/InfoCard/InfoCardActiveIndictment.tsx
+++ b/apps/judicial-system/web/src/components/InfoCard/InfoCardActiveIndictment.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 
 import { FormContext } from '../FormProvider/FormProvider'
 import InfoCard from './InfoCard'
diff --git a/apps/judicial-system/web/src/components/InfoCard/useInfoCardItems.tsx b/apps/judicial-system/web/src/components/InfoCard/useInfoCardItems.tsx
index 9289a3d1ac62..a03a766414c7 100644
--- a/apps/judicial-system/web/src/components/InfoCard/useInfoCardItems.tsx
+++ b/apps/judicial-system/web/src/components/InfoCard/useInfoCardItems.tsx
@@ -184,19 +184,6 @@ const useInfoCardItems = () => {
     ],
   }
 
-  const confirmedCourtDate: Item = {
-    id: 'confirmed-court-date-item',
-    title: formatMessage(core.confirmedCourtDate),
-    values: [
-      `${capitalize(
-        formatDate(workingCase.arraignmentDate?.date, 'PPPP', true) ?? '',
-      )} kl. ${formatDate(
-        workingCase.arraignmentDate?.date,
-        constants.TIME_FORMAT,
-      )}`,
-    ],
-  }
-
   const mergeCase: Item = {
     id: 'merge-case-item',
     title: formatMessage(strings.indictmentMergedTitle),
@@ -324,7 +311,6 @@ const useInfoCardItems = () => {
     registrar,
     offence,
     requestedCourtDate,
-    confirmedCourtDate,
     mergeCase,
     mergedCasePoliceCaseNumbers,
     mergedCaseCourtCaseNumber,
diff --git a/apps/judicial-system/web/src/components/Loading/Loading.tsx b/apps/judicial-system/web/src/components/Loading/Loading.tsx
index fadda8dcad5b..bb8e13e0ae8a 100644
--- a/apps/judicial-system/web/src/components/Loading/Loading.tsx
+++ b/apps/judicial-system/web/src/components/Loading/Loading.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Box, Text } from '@island.is/island-ui/core'
 
 import * as styles from './Loading.css'
diff --git a/apps/judicial-system/web/src/components/Logo/LandWightsLogo.tsx b/apps/judicial-system/web/src/components/Logo/LandWightsLogo.tsx
index afc222ad1bf4..ee05b76137e8 100644
--- a/apps/judicial-system/web/src/components/Logo/LandWightsLogo.tsx
+++ b/apps/judicial-system/web/src/components/Logo/LandWightsLogo.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const LandWightsLogo = () => (
   <svg
     width="54"
diff --git a/apps/judicial-system/web/src/components/Logo/Logo.spec.tsx b/apps/judicial-system/web/src/components/Logo/Logo.spec.tsx
index e502c4a5c47e..dec9f5af6e83 100644
--- a/apps/judicial-system/web/src/components/Logo/Logo.spec.tsx
+++ b/apps/judicial-system/web/src/components/Logo/Logo.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
 
diff --git a/apps/judicial-system/web/src/components/Logo/Logo.tsx b/apps/judicial-system/web/src/components/Logo/Logo.tsx
index 3fb8c3cde96b..dd73cf340b69 100644
--- a/apps/judicial-system/web/src/components/Logo/Logo.tsx
+++ b/apps/judicial-system/web/src/components/Logo/Logo.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 
 import { Box } from '@island.is/island-ui/core'
 import { InstitutionType } from '@island.is/judicial-system-web/src/graphql/schema'
diff --git a/apps/judicial-system/web/src/components/Logo/PoliceStar.tsx b/apps/judicial-system/web/src/components/Logo/PoliceStar.tsx
index 097d566d204a..f39718a0db4c 100644
--- a/apps/judicial-system/web/src/components/Logo/PoliceStar.tsx
+++ b/apps/judicial-system/web/src/components/Logo/PoliceStar.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const PoliceStar = () => (
   <svg
     width="54"
diff --git a/apps/judicial-system/web/src/components/MarkdownWrapper/MarkdownWrapper.tsx b/apps/judicial-system/web/src/components/MarkdownWrapper/MarkdownWrapper.tsx
index c11f69cf1ea8..32e0b9735543 100644
--- a/apps/judicial-system/web/src/components/MarkdownWrapper/MarkdownWrapper.tsx
+++ b/apps/judicial-system/web/src/components/MarkdownWrapper/MarkdownWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 import Markdown from 'markdown-to-jsx'
 
 import {
diff --git a/apps/judicial-system/web/src/components/Modal/Modal.tsx b/apps/judicial-system/web/src/components/Modal/Modal.tsx
index 405a604b4ea2..f5778bbf4c5a 100644
--- a/apps/judicial-system/web/src/components/Modal/Modal.tsx
+++ b/apps/judicial-system/web/src/components/Modal/Modal.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, ReactNode } from 'react'
+import { FC, isValidElement, PropsWithChildren, ReactNode } from 'react'
 import ReactDOM from 'react-dom'
 import FocusLock from 'react-focus-lock'
 import { motion } from 'framer-motion'
@@ -87,7 +87,7 @@ const Modal: FC<PropsWithChildren<ModalProps>> = ({
             <Box marginBottom={6} className={styles.breakSpaces}>
               {
                 // Check if text is a string or Element
-                React.isValidElement(text) ? text : <Text>{text}</Text>
+                isValidElement(text) ? text : <Text>{text}</Text>
               }
             </Box>
           )}
diff --git a/apps/judicial-system/web/src/components/MultipleValueList/MultipleValueList.tsx b/apps/judicial-system/web/src/components/MultipleValueList/MultipleValueList.tsx
index f171b06cbc83..b8e505c97346 100644
--- a/apps/judicial-system/web/src/components/MultipleValueList/MultipleValueList.tsx
+++ b/apps/judicial-system/web/src/components/MultipleValueList/MultipleValueList.tsx
@@ -1,4 +1,11 @@
-import React, { FC, PropsWithChildren, useRef, useState } from 'react'
+import {
+  FC,
+  FocusEvent,
+  KeyboardEvent,
+  PropsWithChildren,
+  useRef,
+  useState,
+} from 'react'
 import InputMask from 'react-input-mask'
 
 import { Button, Input } from '@island.is/island-ui/core'
@@ -16,9 +23,7 @@ interface MultipleValueListProps {
   isDisabled: (value?: string) => boolean
   hasError?: boolean
   errorMessage?: string
-  onBlur?: (
-    event: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>,
-  ) => void
+  onBlur?: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void
 }
 
 const MultipleValueList: FC<PropsWithChildren<MultipleValueListProps>> = ({
@@ -47,7 +52,7 @@ const MultipleValueList: FC<PropsWithChildren<MultipleValueListProps>> = ({
   }
 
   const handleEnter = (
-    event: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>,
+    event: KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
     if (event.key === 'Enter' && !isDisabled(value)) {
       onAddValue(value)
diff --git a/apps/judicial-system/web/src/components/OverviewHeader/OverviewHeader.tsx b/apps/judicial-system/web/src/components/OverviewHeader/OverviewHeader.tsx
index 2b0a9486d554..4944c9f000cd 100644
--- a/apps/judicial-system/web/src/components/OverviewHeader/OverviewHeader.tsx
+++ b/apps/judicial-system/web/src/components/OverviewHeader/OverviewHeader.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/PageHeader/PageHeader.tsx b/apps/judicial-system/web/src/components/PageHeader/PageHeader.tsx
index ab24dcf1d74b..023f10edce83 100644
--- a/apps/judicial-system/web/src/components/PageHeader/PageHeader.tsx
+++ b/apps/judicial-system/web/src/components/PageHeader/PageHeader.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import Head from 'next/head'
 
 interface Props {
diff --git a/apps/judicial-system/web/src/components/PageLayout/PageLayout.tsx b/apps/judicial-system/web/src/components/PageLayout/PageLayout.tsx
index f73e25d8bbd5..3b535b0a5b69 100644
--- a/apps/judicial-system/web/src/components/PageLayout/PageLayout.tsx
+++ b/apps/judicial-system/web/src/components/PageLayout/PageLayout.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, ReactNode, useContext } from 'react'
+import { FC, PropsWithChildren, ReactNode, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import cn from 'classnames'
 
diff --git a/apps/judicial-system/web/src/components/PageLayout/utils/index.spec.tsx b/apps/judicial-system/web/src/components/PageLayout/utils/index.spec.tsx
index 273e17f56f29..6a8ec89ce6a1 100644
--- a/apps/judicial-system/web/src/components/PageLayout/utils/index.spec.tsx
+++ b/apps/judicial-system/web/src/components/PageLayout/utils/index.spec.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { IntlFormatters, useIntl } from 'react-intl'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
diff --git a/apps/judicial-system/web/src/components/PageTitle/PageTitle.tsx b/apps/judicial-system/web/src/components/PageTitle/PageTitle.tsx
index 703b4353151d..d9882f66e792 100644
--- a/apps/judicial-system/web/src/components/PageTitle/PageTitle.tsx
+++ b/apps/judicial-system/web/src/components/PageTitle/PageTitle.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/ParentCaseFiles/ParentCaseFiles.tsx b/apps/judicial-system/web/src/components/ParentCaseFiles/ParentCaseFiles.tsx
index 1afdc1a39536..6e46cea8cb13 100644
--- a/apps/judicial-system/web/src/components/ParentCaseFiles/ParentCaseFiles.tsx
+++ b/apps/judicial-system/web/src/components/ParentCaseFiles/ParentCaseFiles.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import {
diff --git a/apps/judicial-system/web/src/components/PdfButton/PdfButton.tsx b/apps/judicial-system/web/src/components/PdfButton/PdfButton.tsx
index a1ddcff825c1..93f455330ffa 100644
--- a/apps/judicial-system/web/src/components/PdfButton/PdfButton.tsx
+++ b/apps/judicial-system/web/src/components/PdfButton/PdfButton.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, useContext } from 'react'
+import { FC, PropsWithChildren, useContext } from 'react'
 
 import { Box, Button, Text } from '@island.is/island-ui/core'
 import { api } from '@island.is/judicial-system-web/src/services'
diff --git a/apps/judicial-system/web/src/components/ProsecutorSelection/ProsecutorSelection.tsx b/apps/judicial-system/web/src/components/ProsecutorSelection/ProsecutorSelection.tsx
index 3a3347dbee24..5c409e68e803 100644
--- a/apps/judicial-system/web/src/components/ProsecutorSelection/ProsecutorSelection.tsx
+++ b/apps/judicial-system/web/src/components/ProsecutorSelection/ProsecutorSelection.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useMemo } from 'react'
+import { FC, useContext, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Option, Select } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/RequestAppealRulingNotToBePublishedCheckbox/RequestAppealRulingNotToBePublishedCheckbox.tsx b/apps/judicial-system/web/src/components/RequestAppealRulingNotToBePublishedCheckbox/RequestAppealRulingNotToBePublishedCheckbox.tsx
index 9f47e955be5b..f020ff7d2377 100644
--- a/apps/judicial-system/web/src/components/RequestAppealRulingNotToBePublishedCheckbox/RequestAppealRulingNotToBePublishedCheckbox.tsx
+++ b/apps/judicial-system/web/src/components/RequestAppealRulingNotToBePublishedCheckbox/RequestAppealRulingNotToBePublishedCheckbox.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Checkbox } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/RequiredStar/RequiredStar.tsx b/apps/judicial-system/web/src/components/RequiredStar/RequiredStar.tsx
index 44d7d49a81ba..b727ac7b3c5a 100644
--- a/apps/judicial-system/web/src/components/RequiredStar/RequiredStar.tsx
+++ b/apps/judicial-system/web/src/components/RequiredStar/RequiredStar.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import * as styles from './RequiredStar.css'
 
 const RequiredStar = () => {
diff --git a/apps/judicial-system/web/src/components/RestrictionLength/RestrictionLength.tsx b/apps/judicial-system/web/src/components/RestrictionLength/RestrictionLength.tsx
index cfc67edc69ff..e2813a38a390 100644
--- a/apps/judicial-system/web/src/components/RestrictionLength/RestrictionLength.tsx
+++ b/apps/judicial-system/web/src/components/RestrictionLength/RestrictionLength.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { ChangeEvent, FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Checkbox, Text } from '@island.is/island-ui/core'
@@ -20,7 +20,7 @@ import { restrictionLength as strings } from './RestrictionLength.strings'
 
 interface Props {
   workingCase: Case
-  handleIsolationChange: (event: React.ChangeEvent<HTMLInputElement>) => void
+  handleIsolationChange: (event: ChangeEvent<HTMLInputElement>) => void
   handleIsolationDateChange: (date: Date | undefined, valid: boolean) => void
   handleValidToDateChange: (date: Date | undefined, valid: boolean) => void
 }
diff --git a/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.spec.tsx b/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.spec.tsx
index bc2e22bc7a91..46bb543df5a3 100644
--- a/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.spec.tsx
+++ b/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { render, screen } from '@testing-library/react'
 
 import {
diff --git a/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.tsx b/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.tsx
index 5d3fcdd8017f..244e40b50256 100644
--- a/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.tsx
+++ b/apps/judicial-system/web/src/components/RestrictionTags/RestrictionTags.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Tag } from '@island.is/island-ui/core'
 import { getShortRestrictionByValue } from '@island.is/judicial-system/formatters'
diff --git a/apps/judicial-system/web/src/components/RulingDateLabel/RulingDateLabel.tsx b/apps/judicial-system/web/src/components/RulingDateLabel/RulingDateLabel.tsx
index 9fd159474178..18f71783856c 100644
--- a/apps/judicial-system/web/src/components/RulingDateLabel/RulingDateLabel.tsx
+++ b/apps/judicial-system/web/src/components/RulingDateLabel/RulingDateLabel.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/RulingInput/RulingInput.tsx b/apps/judicial-system/web/src/components/RulingInput/RulingInput.tsx
index 4432a4abe06e..d2690abd421b 100644
--- a/apps/judicial-system/web/src/components/RulingInput/RulingInput.tsx
+++ b/apps/judicial-system/web/src/components/RulingInput/RulingInput.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Input } from '@island.is/island-ui/core'
@@ -12,7 +12,7 @@ import { useCase, useDeb } from '@island.is/judicial-system-web/src/utils/hooks'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   rows?: number
 }
 
diff --git a/apps/judicial-system/web/src/components/SectionHeading/SectionHeading.tsx b/apps/judicial-system/web/src/components/SectionHeading/SectionHeading.tsx
index e4da9defa84a..cde8643dd52b 100644
--- a/apps/judicial-system/web/src/components/SectionHeading/SectionHeading.tsx
+++ b/apps/judicial-system/web/src/components/SectionHeading/SectionHeading.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC, ReactNode } from 'react'
 
 import { Box, ResponsiveProp, Space, Text } from '@island.is/island-ui/core'
 
@@ -7,8 +7,8 @@ import RequiredStar from '../RequiredStar/RequiredStar'
 interface Props {
   title: string
   required?: boolean
-  tooltip?: React.ReactNode
-  description?: React.ReactNode
+  tooltip?: ReactNode
+  description?: ReactNode
   marginBottom?: ResponsiveProp<Space | 'auto'>
   heading?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5'
 }
diff --git a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx
index 59352fb3e760..fa28286c41a1 100644
--- a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx
+++ b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, useEffect, useState } from 'react'
+import { FC, PropsWithChildren, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence, motion } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/components/ServiceInterruptionBanner/ServiceInterruptionBanner.tsx b/apps/judicial-system/web/src/components/ServiceInterruptionBanner/ServiceInterruptionBanner.tsx
index 106221185062..9208696682b5 100644
--- a/apps/judicial-system/web/src/components/ServiceInterruptionBanner/ServiceInterruptionBanner.tsx
+++ b/apps/judicial-system/web/src/components/ServiceInterruptionBanner/ServiceInterruptionBanner.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertBanner } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/SharedPageLayout/SharedPageLayout.tsx b/apps/judicial-system/web/src/components/SharedPageLayout/SharedPageLayout.tsx
index 726f774f3976..c564e0f3a3b5 100644
--- a/apps/judicial-system/web/src/components/SharedPageLayout/SharedPageLayout.tsx
+++ b/apps/judicial-system/web/src/components/SharedPageLayout/SharedPageLayout.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 
 import { Box } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/SignedDocument/SignedDocument.tsx b/apps/judicial-system/web/src/components/SignedDocument/SignedDocument.tsx
index 57f8f38b5e5f..84beb4ab7039 100644
--- a/apps/judicial-system/web/src/components/SignedDocument/SignedDocument.tsx
+++ b/apps/judicial-system/web/src/components/SignedDocument/SignedDocument.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 
 import { Icon, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/SigningModal/SigningModal.tsx b/apps/judicial-system/web/src/components/SigningModal/SigningModal.tsx
index c049ca497c99..441d7b450b20 100644
--- a/apps/judicial-system/web/src/components/SigningModal/SigningModal.tsx
+++ b/apps/judicial-system/web/src/components/SigningModal/SigningModal.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 import {
diff --git a/apps/judicial-system/web/src/components/Skeleton/Skeleton.tsx b/apps/judicial-system/web/src/components/Skeleton/Skeleton.tsx
index 33abca12eb80..6677aec4e6e4 100644
--- a/apps/judicial-system/web/src/components/Skeleton/Skeleton.tsx
+++ b/apps/judicial-system/web/src/components/Skeleton/Skeleton.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Box, SkeletonLoader } from '@island.is/island-ui/core'
 
 import * as styles from './Skeleton.css'
diff --git a/apps/judicial-system/web/src/components/Table/AppealCasesTable/AppealCasesTable.tsx b/apps/judicial-system/web/src/components/Table/AppealCasesTable/AppealCasesTable.tsx
index e76e201af0e7..1b652d13814e 100644
--- a/apps/judicial-system/web/src/components/Table/AppealCasesTable/AppealCasesTable.tsx
+++ b/apps/judicial-system/web/src/components/Table/AppealCasesTable/AppealCasesTable.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo } from 'react'
+import { FC, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
@@ -17,7 +17,6 @@ import {
 import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema'
 import {
   useCaseList,
-  useSortAppealCases,
   useViewport,
 } from '@island.is/judicial-system-web/src/utils/hooks'
 
@@ -35,8 +34,8 @@ const AppealCasesTable: FC<Props> = (props) => {
   const { cases, loading, showingCompletedCases } = props
   const { formatMessage } = useIntl()
   const { isOpeningCaseId, handleOpenCase, showLoading } = useCaseList()
-  const { sortedData } = useSortAppealCases('appealedDate', 'descending', cases)
   const { openCaseInNewTabMenuItem } = useContextMenu()
+
   const activeCasesData = useMemo(
     () =>
       cases.sort((a: CaseListEntry, b: CaseListEntry) =>
@@ -92,7 +91,7 @@ const AppealCasesTable: FC<Props> = (props) => {
               : { isSortable: true, key: 'appealedDate' },
           },
         ]}
-        data={sortedData}
+        data={activeCasesData}
         generateContextMenuItems={(row) => {
           return [openCaseInNewTabMenuItem(row.id)]
         }}
diff --git a/apps/judicial-system/web/src/components/Table/AppealCasesTable/MobileAppealCase.tsx b/apps/judicial-system/web/src/components/Table/AppealCasesTable/MobileAppealCase.tsx
index ba0c2ff5f17d..16322b9078dc 100644
--- a/apps/judicial-system/web/src/components/Table/AppealCasesTable/MobileAppealCase.tsx
+++ b/apps/judicial-system/web/src/components/Table/AppealCasesTable/MobileAppealCase.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC, ReactNode } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
@@ -12,7 +12,7 @@ import { CategoryCard } from '@island.is/judicial-system-web/src/routes/Shared/C
 import { displayCaseType } from '@island.is/judicial-system-web/src/routes/Shared/Cases/utils'
 
 interface Props {
-  children: React.ReactNode
+  children: ReactNode
   theCase: CaseListEntry
   onClick: () => void
   isLoading?: boolean
diff --git a/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.css.ts b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.css.ts
new file mode 100644
index 000000000000..0dc6502b5e2e
--- /dev/null
+++ b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.css.ts
@@ -0,0 +1,13 @@
+import { style } from '@vanilla-extract/css'
+
+import { theme } from '@island.is/island-ui/theme'
+
+export const linkButton = style({ cursor: 'pointer' })
+
+export const noWrapColumn = style({
+  '@media': {
+    [`screen and (min-width: ${theme.breakpoints.lg}px)`]: {
+      whiteSpace: 'nowrap',
+    },
+  },
+})
diff --git a/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.strings.ts b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.strings.ts
new file mode 100644
index 000000000000..a2e4e209292c
--- /dev/null
+++ b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.strings.ts
@@ -0,0 +1,10 @@
+import { defineMessages } from 'react-intl'
+
+export const strings = defineMessages({
+  submittedBy: {
+    id: 'judicial.system.core:table.case_file_table.submitted_by',
+    defaultMessage:
+      '{category, select, PROSECUTOR_CASE_FILE {Sækjandi} other {Verjandi}} {initials, select, undefined {} other {({initials})}} lagði fram',
+    description: 'Notaður sem titill fyrir dagsetningu í töflum.',
+  },
+})
diff --git a/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.tsx b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.tsx
new file mode 100644
index 000000000000..50912848c34a
--- /dev/null
+++ b/apps/judicial-system/web/src/components/Table/CaseFileTable/CaseFileTable.tsx
@@ -0,0 +1,107 @@
+import { FC } from 'react'
+import { useIntl } from 'react-intl'
+
+import { Box, Text } from '@island.is/island-ui/core'
+import {
+  capitalize,
+  formatDate,
+  getInitials,
+} from '@island.is/judicial-system/formatters'
+import { tables } from '@island.is/judicial-system-web/messages'
+import {
+  CreatedDate,
+  SortButton,
+  TableContainer,
+  TableHeaderText,
+} from '@island.is/judicial-system-web/src/components/Table'
+import { CaseFile } from '@island.is/judicial-system-web/src/graphql/schema'
+import { useSort } from '@island.is/judicial-system-web/src/utils/hooks'
+
+import { strings } from './CaseFileTable.strings'
+import * as tableStyles from '../Table.css'
+import * as styles from './CaseFileTable.css'
+
+interface Props {
+  caseFiles: CaseFile[]
+  loading?: boolean
+  onOpenFile?: (fileId: string) => void
+}
+
+const CaseFileTable: FC<Props> = ({
+  caseFiles,
+  loading = false,
+  onOpenFile,
+}) => {
+  const { formatMessage } = useIntl()
+
+  const { sortedData, requestSort, getClassNamesFor, isActiveColumn } = useSort(
+    'name',
+    'ascending',
+    caseFiles,
+    (entry, column) => entry[column] as string | null | undefined,
+  )
+
+  const createSortProps = (columnTitle: string, column: keyof CaseFile) => ({
+    title: capitalize(columnTitle),
+    onClick: () => requestSort(column),
+    sortAsc: getClassNamesFor(column) === 'ascending',
+    sortDes: getClassNamesFor(column) === 'descending',
+    isActive: isActiveColumn(column),
+  })
+
+  return (
+    <TableContainer
+      loading={loading}
+      tableHeader={
+        <>
+          <th className={tableStyles.th}>
+            <SortButton
+              {...createSortProps(formatMessage(tables.caseFileName), 'name')}
+            />
+          </th>
+          <TableHeaderText title={formatMessage(tables.caseFileDate)} />
+          <th className={tableStyles.th}>
+            <SortButton
+              {...createSortProps(formatMessage(tables.sent), 'created')}
+            />
+          </th>
+        </>
+      }
+    >
+      {sortedData.map((file) => {
+        return (
+          <tr key={file.id}>
+            <td>
+              <Box
+                onClick={() => onOpenFile?.(file.id)}
+                className={styles.linkButton}
+              >
+                <Text color="blue400" variant="h5">
+                  {file.userGeneratedFilename}
+                </Text>
+              </Box>
+            </td>
+            <td>
+              <CreatedDate created={file.displayDate ?? file.created} />
+            </td>
+            <td>
+              <Box className={styles.noWrapColumn}>
+                <Text textAlign="right">
+                  {formatDate(file.created, "dd.MM.yyyy 'kl.' HH:mm")}
+                </Text>
+                <Text variant="small" textAlign="right">
+                  {formatMessage(strings.submittedBy, {
+                    category: file.category,
+                    initials: getInitials(file.submittedBy),
+                  })}
+                </Text>
+              </Box>
+            </td>
+          </tr>
+        )
+      })}
+    </TableContainer>
+  )
+}
+
+export default CaseFileTable
diff --git a/apps/judicial-system/web/src/components/Table/ColumnCaseType/ColumnCaseType.tsx b/apps/judicial-system/web/src/components/Table/ColumnCaseType/ColumnCaseType.tsx
index 75bc9ceabd4e..84dd283329f3 100644
--- a/apps/judicial-system/web/src/components/Table/ColumnCaseType/ColumnCaseType.tsx
+++ b/apps/judicial-system/web/src/components/Table/ColumnCaseType/ColumnCaseType.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/Table/CourtCaseNumber/CourtCaseNumber.tsx b/apps/judicial-system/web/src/components/Table/CourtCaseNumber/CourtCaseNumber.tsx
index e53dfa467c47..3c9572470bf6 100644
--- a/apps/judicial-system/web/src/components/Table/CourtCaseNumber/CourtCaseNumber.tsx
+++ b/apps/judicial-system/web/src/components/Table/CourtCaseNumber/CourtCaseNumber.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 import { displayFirstPlusRemaining } from '@island.is/judicial-system/formatters'
diff --git a/apps/judicial-system/web/src/components/Table/DefendantInfo/DefendantInfo.tsx b/apps/judicial-system/web/src/components/Table/DefendantInfo/DefendantInfo.tsx
index 845b54f75f25..330251cf961e 100644
--- a/apps/judicial-system/web/src/components/Table/DefendantInfo/DefendantInfo.tsx
+++ b/apps/judicial-system/web/src/components/Table/DefendantInfo/DefendantInfo.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 import { formatDOB } from '@island.is/judicial-system/formatters'
diff --git a/apps/judicial-system/web/src/components/Table/PastCasesTable/MobilePastCase.tsx b/apps/judicial-system/web/src/components/Table/PastCasesTable/MobilePastCase.tsx
index 5e3bdd10ae60..c7170fd5f139 100644
--- a/apps/judicial-system/web/src/components/Table/PastCasesTable/MobilePastCase.tsx
+++ b/apps/judicial-system/web/src/components/Table/PastCasesTable/MobilePastCase.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC, ReactNode } from 'react'
 import { useIntl } from 'react-intl'
 import format from 'date-fns/format'
 import parseISO from 'date-fns/parseISO'
@@ -18,7 +18,7 @@ interface Props {
   theCase: CaseListEntry
   onClick: () => void
   isCourtRole: boolean
-  children: React.ReactNode
+  children: ReactNode
   isLoading?: boolean
 }
 
diff --git a/apps/judicial-system/web/src/components/Table/PastCasesTable/PastCasesTable.tsx b/apps/judicial-system/web/src/components/Table/PastCasesTable/PastCasesTable.tsx
index c0fb189f5ba9..b171d9d90953 100644
--- a/apps/judicial-system/web/src/components/Table/PastCasesTable/PastCasesTable.tsx
+++ b/apps/judicial-system/web/src/components/Table/PastCasesTable/PastCasesTable.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useMemo } from 'react'
+import { FC, useContext, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 import cn from 'classnames'
 import { AnimatePresence } from 'framer-motion'
@@ -36,7 +36,7 @@ import {
 } from '@island.is/judicial-system-web/src/graphql/schema'
 import {
   useCaseList,
-  useSortCases,
+  useSort,
   useViewport,
 } from '@island.is/judicial-system-web/src/utils/hooks'
 
@@ -59,8 +59,27 @@ const PastCasesTable: FC<Props> = ({ cases, loading = false, testid }) => {
   const { user } = useContext(UserContext)
   const { isOpeningCaseId, handleOpenCase, LoadingIndicator, showLoading } =
     useCaseList()
-  const { sortedData, requestSort, getClassNamesFor, isActiveColumn } =
-    useSortCases('created', 'descending', cases)
+
+  const getColumnValue = (
+    entry: CaseListEntry,
+    column: keyof CaseListEntry,
+  ) => {
+    if (
+      column === 'defendants' &&
+      entry.defendants &&
+      entry.defendants.length > 0
+    ) {
+      return entry.defendants[0].name ?? ''
+    }
+    return entry.created
+  }
+
+  const { sortedData, requestSort, getClassNamesFor, isActiveColumn } = useSort(
+    'created',
+    'descending',
+    cases,
+    getColumnValue,
+  )
 
   const {
     withdrawAppealMenuOption,
diff --git a/apps/judicial-system/web/src/components/Table/SortButton/SortButton.tsx b/apps/judicial-system/web/src/components/Table/SortButton/SortButton.tsx
index a3b054e12449..06c33bbc0545 100644
--- a/apps/judicial-system/web/src/components/Table/SortButton/SortButton.tsx
+++ b/apps/judicial-system/web/src/components/Table/SortButton/SortButton.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import cn from 'classnames'
 
 import { Box, Icon, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/Table/Table.tsx b/apps/judicial-system/web/src/components/Table/Table.tsx
index eefb4522490c..cb9450da3f3e 100644
--- a/apps/judicial-system/web/src/components/Table/Table.tsx
+++ b/apps/judicial-system/web/src/components/Table/Table.tsx
@@ -1,10 +1,4 @@
-import React, {
-  FC,
-  PropsWithChildren,
-  ReactNode,
-  useContext,
-  useMemo,
-} from 'react'
+import { FC, PropsWithChildren, ReactNode, useContext, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 import { useLocalStorage } from 'react-use'
 import parseISO from 'date-fns/parseISO'
diff --git a/apps/judicial-system/web/src/components/Table/TableContainer/TableContainer.tsx b/apps/judicial-system/web/src/components/Table/TableContainer/TableContainer.tsx
index 0a3e79d94066..aea24f2ad3be 100644
--- a/apps/judicial-system/web/src/components/Table/TableContainer/TableContainer.tsx
+++ b/apps/judicial-system/web/src/components/Table/TableContainer/TableContainer.tsx
@@ -1,12 +1,12 @@
-import React, { FC } from 'react'
+import { FC, ReactNode } from 'react'
 
 import { TableSkeleton } from '@island.is/judicial-system-web/src/components/Table'
 
 import * as styles from '../Table.css'
 
 interface Props {
-  tableHeader: React.ReactNode
-  children: React.ReactNode
+  tableHeader: ReactNode
+  children: ReactNode
   loading: boolean
   testid?: string
 }
diff --git a/apps/judicial-system/web/src/components/Table/TableHeaderText/TableHeaderText.tsx b/apps/judicial-system/web/src/components/Table/TableHeaderText/TableHeaderText.tsx
index 8e0353d102b9..4666a5700639 100644
--- a/apps/judicial-system/web/src/components/Table/TableHeaderText/TableHeaderText.tsx
+++ b/apps/judicial-system/web/src/components/Table/TableHeaderText/TableHeaderText.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Text } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/Table/TableSkeleton/TableSkeleton.tsx b/apps/judicial-system/web/src/components/Table/TableSkeleton/TableSkeleton.tsx
index 4c850a5c28da..c9d940bc8979 100644
--- a/apps/judicial-system/web/src/components/Table/TableSkeleton/TableSkeleton.tsx
+++ b/apps/judicial-system/web/src/components/Table/TableSkeleton/TableSkeleton.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Box, SkeletonLoader } from '@island.is/island-ui/core'
 import { theme } from '@island.is/island-ui/theme'
 import { useViewport } from '@island.is/judicial-system-web/src/utils/hooks'
diff --git a/apps/judicial-system/web/src/components/Table/index.ts b/apps/judicial-system/web/src/components/Table/index.ts
index 72f23966d38c..c2845d109c1a 100644
--- a/apps/judicial-system/web/src/components/Table/index.ts
+++ b/apps/judicial-system/web/src/components/Table/index.ts
@@ -13,3 +13,4 @@ export { default as CreatedDate } from './CreatedDate/CreatedDate'
 export { default as AppealCasesTable } from './AppealCasesTable/AppealCasesTable'
 export { default as PastCasesTable } from './PastCasesTable/PastCasesTable'
 export { default as CourtDate } from './CourtDate/CourtDate'
+export { default as CaseFileTable } from './CaseFileTable/CaseFileTable'
diff --git a/apps/judicial-system/web/src/components/TagAppealState/TagAppealState.tsx b/apps/judicial-system/web/src/components/TagAppealState/TagAppealState.tsx
index b16228d35c78..94cd21dc13d4 100644
--- a/apps/judicial-system/web/src/components/TagAppealState/TagAppealState.tsx
+++ b/apps/judicial-system/web/src/components/TagAppealState/TagAppealState.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Tag, TagVariant } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx
index 03c01d1b4c9f..3e5445189f72 100644
--- a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx
+++ b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 
 import { Tag, TagVariant } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/components/Tags/CaseTag.tsx b/apps/judicial-system/web/src/components/Tags/CaseTag.tsx
index 6e7f56577979..73fc906c9c41 100644
--- a/apps/judicial-system/web/src/components/Tags/CaseTag.tsx
+++ b/apps/judicial-system/web/src/components/Tags/CaseTag.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 import { Tag, TagVariant } from '@island.is/island-ui/core'
 
diff --git a/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.spec.tsx b/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.spec.tsx
index 3c0fb9941aa8..ed33fa515dde 100644
--- a/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.spec.tsx
+++ b/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 
diff --git a/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.tsx b/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.tsx
index 0f3d3a715425..7afa34379d9e 100644
--- a/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.tsx
+++ b/apps/judicial-system/web/src/components/TimeInputField/TimeInputField.tsx
@@ -1,12 +1,12 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { ChangeEvent, FC, FocusEvent, PropsWithChildren } from 'react'
 import InputMask from 'react-input-mask'
 
 interface Props {
   disabled?: boolean
   value?: string
-  onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void
-  onFocus?: (event: React.FocusEvent<HTMLInputElement>) => void
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void
+  onBlur?: (event: FocusEvent<HTMLInputElement>) => void
+  onFocus?: (event: FocusEvent<HTMLInputElement>) => void
+  onChange?: (event: ChangeEvent<HTMLInputElement>) => void
 }
 
 const TimeInputField: FC<PropsWithChildren<Props>> = ({
diff --git a/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.css.ts b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.css.ts
new file mode 100644
index 000000000000..28ac965ebff0
--- /dev/null
+++ b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.css.ts
@@ -0,0 +1,22 @@
+import { style } from '@vanilla-extract/css'
+
+import { theme } from '@island.is/island-ui/theme'
+
+export const container = style({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+
+  border: `1px dashed ${theme.color.blue200}`,
+  borderRadius: theme.border.radius.large,
+
+  padding: `${theme.spacing[10]}px`,
+  marginBottom: `${theme.spacing[10]}px`,
+  transition: 'border-color 0.2s ease-in-out',
+
+  selectors: {
+    '&:hover': {
+      borderColor: theme.color.blue400,
+    },
+  },
+})
diff --git a/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.strings.ts b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.strings.ts
new file mode 100644
index 000000000000..16b815fa7d44
--- /dev/null
+++ b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.strings.ts
@@ -0,0 +1,21 @@
+import { defineMessages } from 'react-intl'
+
+export const strings = defineMessages({
+  heading: {
+    id: 'judicial.system.core:upload_files.heading',
+    defaultMessage: 'Dragðu skjöl hingað til að hlaða upp',
+    description:
+      'Notaður sem titill í hlaða upp skjölum hluta á Gögn síðu í ákærum.',
+  },
+  acceptFiles: {
+    id: 'judicial.system.core:upload_files.accept_files',
+    defaultMessage: 'Tekið er við skjölum með endingu: .pdf',
+    description:
+      'Notaður sem texti til að tilkynna að aðeins .pdf skjöl eru leyfð.',
+  },
+  buttonText: {
+    id: 'judicial.system.core:upload_files.button_text',
+    defaultMessage: 'Velja skjöl til að hlaða upp',
+    description: 'Notaður sem texti á takka til að velja skjölum.',
+  },
+})
diff --git a/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.tsx b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.tsx
new file mode 100644
index 000000000000..35a2ff34368d
--- /dev/null
+++ b/apps/judicial-system/web/src/components/UploadFiles/UploadFiles.tsx
@@ -0,0 +1,84 @@
+import { Dispatch, FC, SetStateAction, useCallback, useContext } from 'react'
+import { useDropzone } from 'react-dropzone'
+import { useIntl } from 'react-intl'
+
+import { Box, Button, Text } from '@island.is/island-ui/core'
+
+import { TUploadFile, useFileList } from '../../utils/hooks'
+import EditableCaseFile from '../EditableCaseFile/EditableCaseFile'
+import { FormContext } from '../FormProvider/FormProvider'
+import { strings } from './UploadFiles.strings'
+import * as styles from './UploadFiles.css'
+
+interface Props {
+  files: TUploadFile[]
+  onChange: (files: File[]) => void
+  onRetry?: (file: TUploadFile) => void
+  onDelete: (file: TUploadFile) => void
+  onRename: (fileId: string, newName: string, newDisplayDate: string) => void
+  setEditCount: Dispatch<SetStateAction<number>>
+}
+
+const UploadFiles: FC<Props> = (props) => {
+  const { files, onChange, onRetry, onDelete, onRename, setEditCount } = props
+  const { workingCase } = useContext(FormContext)
+  const { formatMessage } = useIntl()
+
+  const { onOpen } = useFileList({ caseId: workingCase.id })
+
+  const onDrop = useCallback(
+    (acceptedFiles: File[]) => {
+      onChange(acceptedFiles)
+    },
+    [onChange],
+  )
+
+  const { getRootProps, getInputProps } = useDropzone({
+    accept: 'application/pdf',
+    onDrop,
+  })
+
+  return (
+    <div className={styles.container} {...getRootProps()}>
+      <Box marginBottom={1}>
+        <Text variant="h4" as="h4">
+          {formatMessage(strings.heading)}
+        </Text>
+      </Box>
+      <Box marginBottom={2}>
+        <Text>{formatMessage(strings.acceptFiles)}</Text>
+      </Box>
+      <Box marginBottom={3}>
+        <Button variant="ghost" size="small" icon="attach">
+          {formatMessage(strings.buttonText)}
+        </Button>
+      </Box>
+      {files.map((file) => (
+        <Box
+          marginBottom={1}
+          width="full"
+          key={file.id}
+          onClick={(event) => event.stopPropagation()}
+        >
+          <EditableCaseFile
+            enableDrag={false}
+            caseFile={{
+              ...file,
+              id: file.id ?? '',
+              canEdit: file.percent === 0,
+            }}
+            onOpen={onOpen}
+            onRename={onRename}
+            onDelete={onDelete}
+            onRetry={onRetry}
+            onStartEditing={() => setEditCount((count) => count + 1)}
+            onStopEditing={() => setEditCount((count) => count - 1)}
+          />
+        </Box>
+      ))}
+      <input {...getInputProps()} />
+    </div>
+  )
+}
+
+export default UploadFiles
diff --git a/apps/judicial-system/web/src/components/UserProvider/UserProvider.spec.tsx b/apps/judicial-system/web/src/components/UserProvider/UserProvider.spec.tsx
index 473487bdf741..6d5bd595752a 100644
--- a/apps/judicial-system/web/src/components/UserProvider/UserProvider.spec.tsx
+++ b/apps/judicial-system/web/src/components/UserProvider/UserProvider.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
 
diff --git a/apps/judicial-system/web/src/components/UserProvider/UserProvider.tsx b/apps/judicial-system/web/src/components/UserProvider/UserProvider.tsx
index 2613a6c936a9..147dc8848d89 100644
--- a/apps/judicial-system/web/src/components/UserProvider/UserProvider.tsx
+++ b/apps/judicial-system/web/src/components/UserProvider/UserProvider.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   createContext,
   FC,
   PropsWithChildren,
diff --git a/apps/judicial-system/web/src/components/ViewportProvider/ViewportProvider.tsx b/apps/judicial-system/web/src/components/ViewportProvider/ViewportProvider.tsx
index 4defad6eb97a..af15a1c270b6 100644
--- a/apps/judicial-system/web/src/components/ViewportProvider/ViewportProvider.tsx
+++ b/apps/judicial-system/web/src/components/ViewportProvider/ViewportProvider.tsx
@@ -1,4 +1,10 @@
-import React, { FC, PropsWithChildren } from 'react'
+import {
+  createContext,
+  FC,
+  PropsWithChildren,
+  useEffect,
+  useState,
+} from 'react'
 
 export type Rect = { width: number; height: number }
 
@@ -19,21 +25,21 @@ const getCurrentViewport = () => {
   }
 }
 
-export const ViewportContext = React.createContext<Rect>(getCurrentViewport())
+export const ViewportContext = createContext<Rect>(getCurrentViewport())
 
 export const ViewportProvider: FC<PropsWithChildren> = ({ children }) => {
-  const [state, setState] = React.useState<Rect>(getCurrentViewport())
+  const [state, setState] = useState<Rect>(getCurrentViewport())
 
   const handleWindowResize = () => {
     const rect = getCurrentViewport()
     setState(rect)
   }
 
-  React.useEffect(() => {
+  useEffect(() => {
     handleWindowResize()
   }, [])
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('resize', handleWindowResize)
     return () => window.removeEventListener('resize', handleWindowResize)
   }, [])
diff --git a/apps/judicial-system/web/src/routes/Admin/ChangeUser/ChangeUser.tsx b/apps/judicial-system/web/src/routes/Admin/ChangeUser/ChangeUser.tsx
index fbb2a385246f..90fef63d46e9 100644
--- a/apps/judicial-system/web/src/routes/Admin/ChangeUser/ChangeUser.tsx
+++ b/apps/judicial-system/web/src/routes/Admin/ChangeUser/ChangeUser.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Admin/NewUser/NewUser.tsx b/apps/judicial-system/web/src/routes/Admin/NewUser/NewUser.tsx
index 986965410cf4..09b4d419c07f 100644
--- a/apps/judicial-system/web/src/routes/Admin/NewUser/NewUser.tsx
+++ b/apps/judicial-system/web/src/routes/Admin/NewUser/NewUser.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Admin/UserForm/UserForm.tsx b/apps/judicial-system/web/src/routes/Admin/UserForm/UserForm.tsx
index a7f3eb920d41..6675bfc4fa7e 100644
--- a/apps/judicial-system/web/src/routes/Admin/UserForm/UserForm.tsx
+++ b/apps/judicial-system/web/src/routes/Admin/UserForm/UserForm.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useState } from 'react'
+import { FC, SetStateAction, useCallback, useEffect, useState } from 'react'
 import InputMask from 'react-input-mask'
 
 import {
@@ -100,7 +100,7 @@ export const UserForm: FC<Props> = ({
     field: string,
     value: string,
     validations: Validation[],
-    setErrorMessage: (value: React.SetStateAction<string | undefined>) => void,
+    setErrorMessage: (value: SetStateAction<string | undefined>) => void,
   ) => {
     setUser({
       ...user,
@@ -115,7 +115,7 @@ export const UserForm: FC<Props> = ({
   const validateAndSetError = (
     value: string,
     validations: Validation[],
-    setErrorMessage: (value: React.SetStateAction<string | undefined>) => void,
+    setErrorMessage: (value: SetStateAction<string | undefined>) => void,
   ) => {
     const validation = validate([[value, validations]])
 
diff --git a/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx b/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx
index 65c9bcc883b9..d89f1e6cd27c 100644
--- a/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx
+++ b/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import { useIntl } from 'react-intl'
 import cn from 'classnames'
 import { useRouter } from 'next/router'
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
index fbf3b1177c60..4c407547d670 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
@@ -57,7 +57,7 @@ const Completed: FC = () => {
 
   const handleNextButtonClick = useCallback(async () => {
     const allSucceeded = await handleUpload(
-      uploadFiles.filter((file) => !file.key),
+      uploadFiles.filter((file) => file.percent === 0),
       updateUploadFile,
     )
     if (!allSucceeded) {
@@ -93,8 +93,11 @@ const Completed: FC = () => {
   )
 
   const handleCriminalRecordUpdateUpload = useCallback(
-    (files: File[], type: CaseFileCategory) => {
-      addUploadFiles(files, type, 'done')
+    (files: File[]) => {
+      addUploadFiles(files, {
+        category: CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+        status: 'done',
+      })
     },
     [addUploadFiles],
   )
@@ -111,6 +114,9 @@ const Completed: FC = () => {
       CaseIndictmentRulingDecision.FINE,
     ].includes(workingCase.indictmentRulingDecision)
 
+  const isRuling =
+    workingCase.indictmentRulingDecision === CaseIndictmentRulingDecision.RULING
+
   const stepIsValid = () =>
     workingCase.indictmentRulingDecision === CaseIndictmentRulingDecision.RULING
       ? workingCase.defendants?.every(
@@ -147,139 +153,127 @@ const Completed: FC = () => {
         <Box marginBottom={5} component="section">
           <IndictmentCaseFilesList workingCase={workingCase} />
         </Box>
-        {!sentToPublicProsecutor && (
-          <>
-            {isRulingOrFine && (
-              <Box marginBottom={5} component="section">
-                <SectionHeading
-                  title={formatMessage(strings.criminalRecordUpdateTitle)}
-                />
-                <InputFileUpload
-                  fileList={uploadFiles.filter(
-                    (file) =>
-                      file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
-                  )}
-                  accept="application/pdf"
-                  header={formatMessage(core.uploadBoxTitle)}
-                  buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
-                  description={formatMessage(core.uploadBoxDescription, {
-                    fileEndings: '.pdf',
-                  })}
-                  onChange={(files) =>
-                    handleCriminalRecordUpdateUpload(
-                      files,
-                      CaseFileCategory.CRIMINAL_RECORD_UPDATE,
-                    )
-                  }
-                  onRemove={(file) => handleRemoveFile(file)}
-                />
-              </Box>
-            )}
-            {workingCase.indictmentRulingDecision ===
-              CaseIndictmentRulingDecision.RULING && (
-              <Box marginBottom={10}>
-                <SectionHeading
-                  title={formatMessage(strings.serviceRequirementTitle)}
-                />
-                {workingCase.defendants?.map((defendant, index) => (
-                  <Box
-                    key={defendant.id}
-                    component="section"
-                    marginBottom={
-                      workingCase.defendants &&
-                      workingCase.defendants.length - 1 === index
-                        ? 10
-                        : 3
-                    }
-                  >
-                    <BlueBox>
-                      <SectionHeading
-                        title={defendant.name || ''}
-                        marginBottom={2}
-                        heading="h4"
-                        required
-                      />
-                      <Box marginBottom={2}>
-                        <RadioButton
-                          id={`defendant-${defendant.id}-service-requirement-not-applicable`}
-                          name={`defendant-${defendant.id}-service-requirement`}
-                          checked={
-                            defendant.serviceRequirement ===
-                            ServiceRequirement.NOT_APPLICABLE
-                          }
-                          onChange={() => {
-                            setAndSendDefendantToServer(
-                              {
-                                defendantId: defendant.id,
-                                caseId: workingCase.id,
-                                serviceRequirement:
-                                  ServiceRequirement.NOT_APPLICABLE,
-                              },
-                              setWorkingCase,
-                            )
-                          }}
-                          large
-                          backgroundColor="white"
-                          label={formatMessage(
-                            strings.serviceRequirementNotApplicable,
-                          )}
-                        />
-                      </Box>
-                      <Box marginBottom={2}>
-                        <RadioButton
-                          id={`defendant-${defendant.id}-service-requirement-required`}
-                          name={`defendant-${defendant.id}-service-requirement`}
-                          checked={
-                            defendant.serviceRequirement ===
-                            ServiceRequirement.REQUIRED
-                          }
-                          onChange={() => {
-                            setAndSendDefendantToServer(
-                              {
-                                defendantId: defendant.id,
-                                caseId: workingCase.id,
-                                serviceRequirement: ServiceRequirement.REQUIRED,
-                              },
-                              setWorkingCase,
-                            )
-                          }}
-                          large
-                          backgroundColor="white"
-                          label={formatMessage(
-                            strings.serviceRequirementRequired,
-                          )}
-                        />
-                      </Box>
-                      <RadioButton
-                        id={`defendant-${defendant.id}-service-requirement-not-required`}
-                        name={`defendant-${defendant.id}-service-requirement`}
-                        checked={
-                          defendant.serviceRequirement ===
-                          ServiceRequirement.NOT_REQUIRED
-                        }
-                        onChange={() => {
-                          setAndSendDefendantToServer(
-                            {
-                              defendantId: defendant.id,
-                              caseId: workingCase.id,
-                              serviceRequirement:
-                                ServiceRequirement.NOT_REQUIRED,
-                            },
-                            setWorkingCase,
-                          )
-                        }}
-                        large
-                        backgroundColor="white"
-                        label={formatMessage(
-                          strings.serviceRequirementNotRequired,
-                        )}
-                      />
-                    </BlueBox>
+        {!sentToPublicProsecutor && isRulingOrFine && (
+          <Box marginBottom={isRuling ? 5 : 10} component="section">
+            <SectionHeading
+              title={formatMessage(strings.criminalRecordUpdateTitle)}
+            />
+            <InputFileUpload
+              fileList={uploadFiles.filter(
+                (file) =>
+                  file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+              )}
+              accept="application/pdf"
+              header={formatMessage(core.uploadBoxTitle)}
+              buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
+              description={formatMessage(core.uploadBoxDescription, {
+                fileEndings: '.pdf',
+              })}
+              onChange={handleCriminalRecordUpdateUpload}
+              onRemove={handleRemoveFile}
+            />
+          </Box>
+        )}
+        {isRuling && (
+          <Box marginBottom={10} component="section">
+            <SectionHeading
+              title={formatMessage(strings.serviceRequirementTitle)}
+            />
+            {workingCase.defendants?.map((defendant, index) => (
+              <Box
+                key={defendant.id}
+                component="section"
+                marginBottom={
+                  workingCase.defendants &&
+                  workingCase.defendants.length - 1 === index
+                    ? 10
+                    : 3
+                }
+              >
+                <BlueBox>
+                  <SectionHeading
+                    title={defendant.name || ''}
+                    marginBottom={2}
+                    heading="h4"
+                    required
+                  />
+                  <Box marginBottom={2}>
+                    <RadioButton
+                      id={`defendant-${defendant.id}-service-requirement-not-applicable`}
+                      name={`defendant-${defendant.id}-service-requirement`}
+                      checked={
+                        defendant.serviceRequirement ===
+                        ServiceRequirement.NOT_APPLICABLE
+                      }
+                      disabled={sentToPublicProsecutor}
+                      onChange={() => {
+                        setAndSendDefendantToServer(
+                          {
+                            defendantId: defendant.id,
+                            caseId: workingCase.id,
+                            serviceRequirement:
+                              ServiceRequirement.NOT_APPLICABLE,
+                          },
+                          setWorkingCase,
+                        )
+                      }}
+                      large
+                      backgroundColor="white"
+                      label={formatMessage(
+                        strings.serviceRequirementNotApplicable,
+                      )}
+                    />
+                  </Box>
+                  <Box marginBottom={2}>
+                    <RadioButton
+                      id={`defendant-${defendant.id}-service-requirement-required`}
+                      name={`defendant-${defendant.id}-service-requirement`}
+                      checked={
+                        defendant.serviceRequirement ===
+                        ServiceRequirement.REQUIRED
+                      }
+                      disabled={sentToPublicProsecutor}
+                      onChange={() => {
+                        setAndSendDefendantToServer(
+                          {
+                            defendantId: defendant.id,
+                            caseId: workingCase.id,
+                            serviceRequirement: ServiceRequirement.REQUIRED,
+                          },
+                          setWorkingCase,
+                        )
+                      }}
+                      large
+                      backgroundColor="white"
+                      label={formatMessage(strings.serviceRequirementRequired)}
+                    />
                   </Box>
-                ))}
+                  <RadioButton
+                    id={`defendant-${defendant.id}-service-requirement-not-required`}
+                    name={`defendant-${defendant.id}-service-requirement`}
+                    checked={
+                      defendant.serviceRequirement ===
+                      ServiceRequirement.NOT_REQUIRED
+                    }
+                    disabled={sentToPublicProsecutor}
+                    onChange={() => {
+                      setAndSendDefendantToServer(
+                        {
+                          defendantId: defendant.id,
+                          caseId: workingCase.id,
+                          serviceRequirement: ServiceRequirement.NOT_REQUIRED,
+                        },
+                        setWorkingCase,
+                      )
+                    }}
+                    large
+                    backgroundColor="white"
+                    label={formatMessage(strings.serviceRequirementNotRequired)}
+                  />
+                </BlueBox>
               </Box>
-            )}
-          </>
+            ))}
+          </Box>
         )}
       </FormContentContainer>
       <FormContentContainer isFooter>
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx
index 5df2c6e08162..b33c38ded1c6 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useEffect, useState } from 'react'
+import { FC, useCallback, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
@@ -516,7 +516,9 @@ const Conclusion: FC = () => {
               buttonLabel={formatMessage(strings.uploadButtonText)}
               onChange={(files) => {
                 handleUpload(
-                  addUploadFiles(files, CaseFileCategory.COURT_RECORD),
+                  addUploadFiles(files, {
+                    category: CaseFileCategory.COURT_RECORD,
+                  }),
                   updateUploadFile,
                 )
               }}
@@ -549,7 +551,9 @@ const Conclusion: FC = () => {
                 buttonLabel={formatMessage(strings.uploadButtonText)}
                 onChange={(files) => {
                   handleUpload(
-                    addUploadFiles(files, CaseFileCategory.RULING),
+                    addUploadFiles(files, {
+                      category: CaseFileCategory.RULING,
+                    }),
                     updateUploadFile,
                   )
                 }}
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx
index 6dd92b2c73f0..40f108d5d000 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 
 import {
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Defender/Defender.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Defender/Defender.tsx
index ad7e9f8ca00a..a629abf8760a 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Defender/Defender.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Defender/Defender.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from 'react'
+import { useCallback, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Defender/SelectDefender.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Defender/SelectDefender.tsx
index 0b8e8d319006..411d8654c9c6 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Defender/SelectDefender.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Defender/SelectDefender.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { ChangeEvent, FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Checkbox, Text } from '@island.is/island-ui/core'
@@ -85,7 +85,7 @@ const SelectDefender: FC<Props> = ({ defendant }) => {
               }),
             )}
             checked={Boolean(defendant.defenderChoice === DefenderChoice.WAIVE)}
-            onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+            onChange={(event: ChangeEvent<HTMLInputElement>) => {
               toggleDefendantWaivesRightToCounsel(
                 workingCase.id,
                 defendant,
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx
index d6167467b8fc..62ba4388fa9d 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/ReturnIndictmentCaseModal/ReturnIndictmentCaseModal.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/ReturnIndictmentCaseModal/ReturnIndictmentCaseModal.tsx
index 736d236bec2d..a8bb0bde8a2a 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/ReturnIndictmentCaseModal/ReturnIndictmentCaseModal.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/ReturnIndictmentCaseModal/ReturnIndictmentCaseModal.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Input } from '@island.is/island-ui/core'
@@ -18,7 +18,7 @@ import { strings } from './ReturnIndictmentCaseModal.strings'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   onClose: () => void
   onComplete: () => void
 }
@@ -54,6 +54,8 @@ const ReturnIndictmentModal: FC<Props> = ({
       return
     }
 
+    // TODO: Generally, we cannot trust the client date so we should let the server handle this instead.
+    //       There is already precedent for adding eplanatory strings on the server side when transitioning cases.
     const now = new Date()
     const prependedReturnedExplanation = `${formatMessage(
       strings.prependedReturnedExplanation,
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx
index 088cd7d1bc14..d90022cc8596 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx
index b377efc7851a..f6128bdd3cfe 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Confirmation/Confirmation.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Confirmation/Confirmation.tsx
index 63ecfaf6e0f8..b7b764cec99f 100644
--- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Confirmation/Confirmation.tsx
+++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Confirmation/Confirmation.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/CourtRecord/CourtRecord.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/CourtRecord/CourtRecord.tsx
index 4689506fdbe9..fb14b1171179 100644
--- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/CourtRecord/CourtRecord.tsx
+++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/CourtRecord/CourtRecord.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx
index 913df319cd19..3d5e89fa1bf8 100644
--- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx
+++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Overview/Overview.tsx
index 60c7a012ecbf..42e69b18d72e 100644
--- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
@@ -129,10 +129,10 @@ const Overview = () => {
                 id: 'case-info-section',
                 items: [
                   policeCaseNumbers,
-                  prosecutorsOffice,
                   requestedCourtDate,
-                  prosecutor(workingCase.type),
+                  prosecutorsOffice,
                   caseType,
+                  prosecutor(workingCase.type),
                 ],
                 columns: 2,
               },
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx
index 515d2b03cc74..51e80fa56c8c 100644
--- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx
+++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Confirmation/Confirmation.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Confirmation/Confirmation.tsx
index 0858eb93ab52..7c3016906d9f 100644
--- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Confirmation/Confirmation.tsx
+++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Confirmation/Confirmation.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx
index c1d0240d67a3..d8a531715f3c 100644
--- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx
+++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx
index f76f4d5002e6..2951a87b42c2 100644
--- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx
+++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Overview/Overview.tsx
index c4d5062da767..9ab9d322935a 100644
--- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -60,6 +60,7 @@ export const JudgeOverview = () => {
   const { uploadState } = useCourtUpload(workingCase, setWorkingCase)
   const {
     defendants,
+    policeCaseNumbers,
     prosecutor,
     prosecutorsOffice,
     requestedCourtDate,
@@ -136,10 +137,11 @@ export const JudgeOverview = () => {
               {
                 id: 'case-info-section',
                 items: [
-                  prosecutorsOffice,
+                  policeCaseNumbers,
                   requestedCourtDate,
-                  prosecutor(workingCase.type),
+                  prosecutorsOffice,
                   parentCaseValidToDate,
+                  prosecutor(workingCase.type),
                 ],
                 columns: 2,
               },
diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Ruling/Ruling.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Ruling/Ruling.tsx
index 2803fc648e8b..53274729dcd5 100644
--- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/Ruling/Ruling.tsx
+++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/Ruling/Ruling.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import formatISO from 'date-fns/formatISO'
 import { useRouter } from 'next/router'
diff --git a/apps/judicial-system/web/src/routes/Court/components/AppealSections/AppealSections.tsx b/apps/judicial-system/web/src/routes/Court/components/AppealSections/AppealSections.tsx
index 8610faf44983..88714f13a5e1 100644
--- a/apps/judicial-system/web/src/routes/Court/components/AppealSections/AppealSections.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/AppealSections/AppealSections.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Input, RadioButton, Text } from '@island.is/island-ui/core'
@@ -24,7 +24,7 @@ import * as styles from './AppealSections.css'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
 }
 
 const AppealSections: FC<Props> = ({ workingCase, setWorkingCase }) => {
diff --git a/apps/judicial-system/web/src/routes/Court/components/CasesAwaitingAssignmentTable/CasesAwaitingAssignmentTable.tsx b/apps/judicial-system/web/src/routes/Court/components/CasesAwaitingAssignmentTable/CasesAwaitingAssignmentTable.tsx
index 9eee4c8a7e28..2ed9996d4dd0 100644
--- a/apps/judicial-system/web/src/routes/Court/components/CasesAwaitingAssignmentTable/CasesAwaitingAssignmentTable.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/CasesAwaitingAssignmentTable/CasesAwaitingAssignmentTable.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/routes/Court/components/CasesInProgressTable/CasesInProgressTable.tsx b/apps/judicial-system/web/src/routes/Court/components/CasesInProgressTable/CasesInProgressTable.tsx
index 974fde5bc010..d80fb2d81362 100644
--- a/apps/judicial-system/web/src/routes/Court/components/CasesInProgressTable/CasesInProgressTable.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/CasesInProgressTable/CasesInProgressTable.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   Dispatch,
   FC,
   SetStateAction,
diff --git a/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumber.tsx b/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumber.tsx
index 7589489225b4..0b356143b085 100644
--- a/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumber.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumber.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumberInput.tsx b/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumberInput.tsx
index 61360b0b75eb..e3fc886e9933 100644
--- a/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumberInput.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/CourtCaseNumber/CourtCaseNumberInput.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Button, Input } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Court/components/DraftConclusionModal/DraftConclusionModal.tsx b/apps/judicial-system/web/src/routes/Court/components/DraftConclusionModal/DraftConclusionModal.tsx
index 43b04dd162ac..7f4b9567b848 100644
--- a/apps/judicial-system/web/src/routes/Court/components/DraftConclusionModal/DraftConclusionModal.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/DraftConclusionModal/DraftConclusionModal.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
@@ -11,11 +11,9 @@ import { TempCase as Case } from '@island.is/judicial-system-web/src/types'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   isDraftingConclusion: boolean | undefined
-  setIsDraftingConclusion: React.Dispatch<
-    React.SetStateAction<boolean | undefined>
-  >
+  setIsDraftingConclusion: Dispatch<SetStateAction<boolean | undefined>>
 }
 
 const DraftConclusionModal: FC<Props> = ({
diff --git a/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/ReceptionAndAssignment.tsx b/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/ReceptionAndAssignment.tsx
index bb53202904a7..a43b6c24c4cb 100644
--- a/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/ReceptionAndAssignment.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/ReceptionAndAssignment.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from 'react'
+import { useCallback, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/SelectCourtOfficials/SelectCourtOfficials.tsx b/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/SelectCourtOfficials/SelectCourtOfficials.tsx
index 10ab8411b8b9..05c1f7227e2b 100644
--- a/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/SelectCourtOfficials/SelectCourtOfficials.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/ReceptionAndAssignment/SelectCourtOfficials/SelectCourtOfficials.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Select, Tooltip } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Court/components/SubpoenaType/SubpoenaType.tsx b/apps/judicial-system/web/src/routes/Court/components/SubpoenaType/SubpoenaType.tsx
index c112327403ba..e30edd9bd129 100644
--- a/apps/judicial-system/web/src/routes/Court/components/SubpoenaType/SubpoenaType.tsx
+++ b/apps/judicial-system/web/src/routes/Court/components/SubpoenaType/SubpoenaType.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, RadioButton, Text } from '@island.is/island-ui/core'
@@ -22,7 +22,7 @@ interface SubpoenaTypeProps {
   setWorkingCase: Dispatch<SetStateAction<Case>>
   updateDefendantState: (
     update: UpdateDefendantInput,
-    setWorkingCase: React.Dispatch<React.SetStateAction<Case>>,
+    setWorkingCase: Dispatch<SetStateAction<Case>>,
   ) => void
   required?: boolean
 }
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/AppealCase/AppealCase.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/AppealCase/AppealCase.tsx
index 2f535a119e64..034a368283de 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/AppealCase/AppealCase.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/AppealCase/AppealCase.tsx
@@ -1,4 +1,4 @@
-import { useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 import { useRouter } from 'next/router'
@@ -38,7 +38,7 @@ import { appealCase as strings } from './AppealCase.strings'
 type JudgeSelectOption = ReactSelectOption & { judge: User }
 type AssistantSelectOption = ReactSelectOption & { assistant: User }
 
-const AppealCase = () => {
+const AppealCase: FC = () => {
   const { workingCase, setWorkingCase } = useContext(FormContext)
   const {
     updateCase,
@@ -185,40 +185,37 @@ const AppealCase = () => {
           <Box component="section" marginBottom={8}>
             <SectionHeading title={formatMessage(core.appealJudgesHeading)} />
             <BlueBox>
-              {defaultJudges.map((judge, index) => {
-                return (
-                  <Box marginBottom={2} key={`judgeBox${index + 1}`}>
-                    <Select
-                      name="judge"
-                      label={formatMessage(
-                        index === 0
-                          ? strings.judgeForepersonLabel
-                          : strings.judgeLabel,
-                      )}
-                      placeholder={formatMessage(
-                        index === 0
-                          ? strings.judgeForepersonPlaceholder
-                          : strings.judgePlaceholder,
-                      )}
-                      value={
-                        judge?.id
-                          ? { label: judge.name ?? '', value: judge.id }
-                          : undefined
-                      }
-                      options={judges}
-                      onChange={(selectedOption) => {
-                        const judgeUpdate = (
-                          selectedOption as JudgeSelectOption
-                        ).judge.id
-                        const judgeProperty = `appealJudge${index + 1}Id`
+              {defaultJudges.map((judge, index) => (
+                <Box marginBottom={2} key={`${index}`}>
+                  <Select
+                    name="judge"
+                    label={formatMessage(
+                      index === 0
+                        ? strings.judgeForepersonLabel
+                        : strings.judgeLabel,
+                    )}
+                    placeholder={formatMessage(
+                      index === 0
+                        ? strings.judgeForepersonPlaceholder
+                        : strings.judgePlaceholder,
+                    )}
+                    value={
+                      judge?.id
+                        ? { label: judge.name ?? '', value: judge.id }
+                        : undefined
+                    }
+                    options={judges}
+                    onChange={(selectedOption) => {
+                      const judgeUpdate = (selectedOption as JudgeSelectOption)
+                        .judge.id
+                      const judgeProperty = `appealJudge${index + 1}Id`
 
-                        handleChange(judgeUpdate, judgeProperty)
-                      }}
-                      required
-                    />
-                  </Box>
-                )
-              })}
+                      handleChange(judgeUpdate, judgeProperty)
+                    }}
+                    required
+                  />
+                </Box>
+              ))}
             </BlueBox>
           </Box>
         </FormContentContainer>
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Cases/Cases.tsx
index 70327d4f9e05..6a15ae704209 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Cases/Cases.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Cases/Cases.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.spec.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.spec.tsx
index 119896ed4e33..10f320a30d02 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.spec.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import faker from 'faker'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen } from '@testing-library/react'
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.tsx
index 30e4096951e3..ee4b2b49bd93 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Overview/Overview.tsx
@@ -1,9 +1,10 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
 import { Box } from '@island.is/island-ui/core'
 import * as constants from '@island.is/judicial-system/consts'
+import { isInvestigationCase } from '@island.is/judicial-system/types'
 import {
   AlertBanner,
   CaseFilesAccordionItem,
@@ -44,6 +45,7 @@ const CourtOfAppealOverview = () => {
     court,
     judge,
     registrar,
+    caseType,
   } = useInfoCardItems()
 
   const handleNavigationTo = (destination: string) =>
@@ -95,7 +97,10 @@ const CourtOfAppealOverview = () => {
                     court,
                     prosecutor(workingCase.type),
                     judge,
-                    registrar,
+                    ...(isInvestigationCase(workingCase.type)
+                      ? [caseType]
+                      : []),
+                    ...(workingCase.registrar ? [registrar] : []),
                   ],
                   columns: 2,
                 },
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Result/Result.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Result/Result.tsx
index 352346984da5..0ccb45708b96 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Result/Result.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Result/Result.tsx
@@ -1,8 +1,9 @@
-import React, { useContext } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertBanner, AlertMessage, Box } from '@island.is/island-ui/core'
 import * as constants from '@island.is/judicial-system/consts'
+import { isInvestigationCase } from '@island.is/judicial-system/types'
 import {
   CaseFilesAccordionItem,
   Conclusion,
@@ -30,7 +31,7 @@ type modalTypes = 'reopenCase' | 'none'
 const CourtOfAppealResult = () => {
   const { workingCase, setWorkingCase, isLoadingWorkingCase, caseNotFound } =
     useContext(FormContext)
-  const [modalVisible, setModalVisible] = React.useState<modalTypes>('none')
+  const [modalVisible, setModalVisible] = useState<modalTypes>('none')
 
   const { formatMessage } = useIntl()
   const { user } = useContext(UserContext)
@@ -46,6 +47,7 @@ const CourtOfAppealResult = () => {
     court,
     judge,
     registrar,
+    caseType,
     appealCaseNumber,
     appealAssistant,
     appealJudges,
@@ -111,13 +113,18 @@ const CourtOfAppealResult = () => {
                     court,
                     prosecutor(workingCase.type),
                     judge,
-                    ...(registrar ? [registrar] : []),
-                    appealCaseNumber,
-                    appealAssistant,
-                    appealJudges,
+                    ...(isInvestigationCase(workingCase.type)
+                      ? [caseType]
+                      : []),
+                    ...(workingCase.registrar ? [registrar] : []),
                   ],
                   columns: 2,
                 },
+                {
+                  id: 'court-of-appeal-section',
+                  items: [appealCaseNumber, appealAssistant, appealJudges],
+                  columns: 2,
+                },
               ]}
             />
           </Box>
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Ruling/Ruling.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Ruling/Ruling.tsx
index 534335762f9f..09a716cf2685 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Ruling/Ruling.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Ruling/Ruling.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { ChangeEvent, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -229,7 +229,9 @@ const CourtOfAppealRuling = () => {
               buttonLabel={formatMessage(strings.uploadButtonText)}
               onChange={(files) => {
                 handleUpload(
-                  addUploadFiles(files, CaseFileCategory.APPEAL_COURT_RECORD),
+                  addUploadFiles(files, {
+                    category: CaseFileCategory.APPEAL_COURT_RECORD,
+                  }),
                   updateUploadFile,
                 )
               }}
@@ -250,7 +252,7 @@ const CourtOfAppealRuling = () => {
                 <RestrictionLength
                   workingCase={workingCase}
                   handleIsolationChange={(
-                    event: React.ChangeEvent<HTMLInputElement>,
+                    event: ChangeEvent<HTMLInputElement>,
                   ): void => {
                     setAndSendCaseToServer(
                       [
@@ -353,7 +355,9 @@ const CourtOfAppealRuling = () => {
                 buttonLabel={formatMessage(strings.uploadButtonText)}
                 onChange={(files) => {
                   handleUpload(
-                    addUploadFiles(files, CaseFileCategory.APPEAL_RULING),
+                    addUploadFiles(files, {
+                      category: CaseFileCategory.APPEAL_RULING,
+                    }),
                     updateUploadFile,
                   )
                 }}
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.spec.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.spec.tsx
index 8df2b424f0fb..75066f7860ae 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.spec.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import faker from 'faker'
 import { MockedProvider } from '@apollo/client/testing'
 import { act, render, screen, within } from '@testing-library/react'
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.tsx
index 143e59a97377..4d77a326cd87 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/Summary/Summary.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/WithdrawnAppealCase/WithdrawnAppealCase.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/WithdrawnAppealCase/WithdrawnAppealCase.tsx
index 07e793dde3a2..34682238544c 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/WithdrawnAppealCase/WithdrawnAppealCase.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/WithdrawnAppealCase/WithdrawnAppealCase.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -73,7 +73,9 @@ const WithdrawnAppealCase = () => {
             buttonLabel={formatMessage(strings.uploadBoxButtonLabel)}
             onChange={(files) =>
               handleUpload(
-                addUploadFiles(files, CaseFileCategory.APPEAL_COURT_RECORD),
+                addUploadFiles(files, {
+                  category: CaseFileCategory.APPEAL_COURT_RECORD,
+                }),
                 updateUploadFile,
               )
             }
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseFilesOverview/CaseFilesOverview.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseFilesOverview/CaseFilesOverview.tsx
index 28f42e681c43..1464ce928c02 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseFilesOverview/CaseFilesOverview.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseFilesOverview/CaseFilesOverview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumberInput/CaseNumberInput.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumberInput/CaseNumberInput.tsx
index deeb1ea9fa3a..523ee9cd5bc9 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumberInput/CaseNumberInput.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumberInput/CaseNumberInput.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Input } from '@island.is/island-ui/core'
@@ -11,7 +11,7 @@ import { useCase } from '@island.is/judicial-system-web/src/utils/hooks'
 
 import { strings } from './CaseNumberInput.strings'
 
-const CaseNumberInput = () => {
+const CaseNumberInput: FC = () => {
   const { formatMessage } = useIntl()
   const { workingCase, setWorkingCase } = useContext(FormContext)
   const [appealCaseNumberErrorMessage, setAppealCaseNumberErrorMessage] =
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumbers/CaseNumbers.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumbers/CaseNumbers.tsx
index 49bbda0b3385..2e149745b8ea 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumbers/CaseNumbers.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseNumbers/CaseNumbers.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseOverviewHeader/CaseOverviewHeader.tsx b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseOverviewHeader/CaseOverviewHeader.tsx
index 4938dcb7f734..0a740e8b5d18 100644
--- a/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseOverviewHeader/CaseOverviewHeader.tsx
+++ b/apps/judicial-system/web/src/routes/CourtOfAppeal/components/CaseOverviewHeader/CaseOverviewHeader.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Defender/CaseOverview.tsx b/apps/judicial-system/web/src/routes/Defender/CaseOverview.tsx
index 0f321015eaeb..bba664ebdb7f 100644
--- a/apps/judicial-system/web/src/routes/Defender/CaseOverview.tsx
+++ b/apps/judicial-system/web/src/routes/Defender/CaseOverview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Defender/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/Defender/Cases/Cases.tsx
index 91b69fe242ae..ec6cdd737dd3 100644
--- a/apps/judicial-system/web/src/routes/Defender/Cases/Cases.tsx
+++ b/apps/judicial-system/web/src/routes/Defender/Cases/Cases.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useEffect, useMemo, useState } from 'react'
+import { FC, useEffect, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 import partition from 'lodash/partition'
 
diff --git a/apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx b/apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx
index 73784ed888b0..169584028e9b 100644
--- a/apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx
+++ b/apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import cn from 'classnames'
 import { AnimatePresence } from 'framer-motion'
@@ -28,7 +28,7 @@ import {
 import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema'
 import {
   useCaseList,
-  useSortCases,
+  useSort,
 } from '@island.is/judicial-system-web/src/utils/hooks'
 
 import * as styles from './DefenderCasesTable.css'
@@ -45,8 +45,26 @@ export const DefenderCasesTable: FC<Props> = ({
   loading,
 }) => {
   const { formatMessage } = useIntl()
-  const { sortedData, requestSort, getClassNamesFor, isActiveColumn } =
-    useSortCases('created', 'descending', cases)
+
+  const getColumnValue = (
+    entry: CaseListEntry,
+    column: keyof CaseListEntry,
+  ) => {
+    if (
+      column === 'defendants' &&
+      entry.defendants &&
+      entry.defendants.length > 0
+    ) {
+      return entry.defendants[0].name ?? ''
+    }
+    return entry.created
+  }
+  const { sortedData, requestSort, getClassNamesFor, isActiveColumn } = useSort(
+    'created',
+    'descending',
+    cases,
+    getColumnValue,
+  )
   const { isOpeningCaseId, LoadingIndicator, showLoading, handleOpenCase } =
     useCaseList()
 
diff --git a/apps/judicial-system/web/src/routes/Defender/Cases/components/FilterCheckboxes.tsx b/apps/judicial-system/web/src/routes/Defender/Cases/components/FilterCheckboxes.tsx
index f2e1a0516e57..042c66cb5dcd 100644
--- a/apps/judicial-system/web/src/routes/Defender/Cases/components/FilterCheckboxes.tsx
+++ b/apps/judicial-system/web/src/routes/Defender/Cases/components/FilterCheckboxes.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Checkbox } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Defender/Cases/hooks/useSortCases.tsx b/apps/judicial-system/web/src/routes/Defender/Cases/hooks/useSortCases.tsx
deleted file mode 100644
index 11b687f55e71..000000000000
--- a/apps/judicial-system/web/src/routes/Defender/Cases/hooks/useSortCases.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useMemo, useState } from 'react'
-
-import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema'
-
-const useSortCases = (
-  defaultColumn: string,
-  defaultDirection: 'ascending' | 'descending',
-  data: CaseListEntry[],
-) => {
-  const [sortConfig, setSortConfig] = useState({
-    column: defaultColumn,
-    direction: defaultDirection,
-  })
-
-  const requestSort = (column: string) => {
-    let direction: 'ascending' | 'descending' = 'ascending'
-
-    if (sortConfig.column === column && sortConfig.direction === 'ascending') {
-      direction = 'descending'
-    }
-
-    setSortConfig({ column, direction })
-  }
-
-  const getClassNamesFor = (column: string) => {
-    if (!sortConfig) {
-      return
-    }
-    return sortConfig.column === column ? sortConfig.direction : undefined
-  }
-
-  const sortedData = useMemo(() => {
-    if (sortConfig && data) {
-      return [...data].sort((a, b) => {
-        const getColumnValue = (entry: CaseListEntry) => {
-          if (
-            sortConfig.column === 'defendant' &&
-            entry.defendants &&
-            entry.defendants.length > 0
-          ) {
-            return entry.defendants[0].name ?? ''
-          }
-          return entry.created ?? ''
-        }
-
-        const compareResult = getColumnValue(a).localeCompare(getColumnValue(b))
-
-        return sortConfig.direction === 'ascending'
-          ? compareResult
-          : -compareResult
-      })
-    }
-    return data
-  }, [data, sortConfig])
-
-  return { sortedData, requestSort, getClassNamesFor }
-}
-
-export default useSortCases
diff --git a/apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx
index 227fa70896a4..a0f765f07198 100644
--- a/apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx
+++ b/apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
index c4e91afec79f..63cb249bd6d4 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { LayoutGroup } from 'framer-motion'
 import router from 'next/router'
@@ -24,6 +24,8 @@ const CaseFile = () => {
   const { workingCase, isLoadingWorkingCase, caseNotFound } =
     useContext(FormContext)
   const { formatMessage } = useIntl()
+  const [editCount, setEditCount] = useState<number>(0)
+
   const handleNavigationTo = useCallback(
     (destination: string) => router.push(`${destination}/${workingCase.id}`),
     [workingCase.id],
@@ -70,6 +72,7 @@ const CaseFile = () => {
                   }
                   subtypes={workingCase.indictmentSubtypes}
                   crimeScenes={workingCase.crimeScenes}
+                  setEditCount={setEditCount}
                 />
               ))}
             </Accordion>
@@ -98,6 +101,7 @@ const CaseFile = () => {
             handleNavigationTo(constants.INDICTMENTS_PROCESSING_ROUTE)
           }
           nextIsLoading={isLoadingWorkingCase}
+          nextIsDisabled={editCount > 0}
         />
       </FormContentContainer>
     </PageLayout>
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx
index 55b2f82c0791..91f8ef99a563 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from 'react'
+import { useCallback, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
@@ -93,7 +93,9 @@ const CaseFiles = () => {
               buttonLabel={formatMessage(strings.caseFiles.buttonLabel)}
               onChange={(files) =>
                 handleUpload(
-                  addUploadFiles(files, CaseFileCategory.INDICTMENT),
+                  addUploadFiles(files, {
+                    category: CaseFileCategory.INDICTMENT,
+                  }),
                   updateUploadFile,
                 )
               }
@@ -116,7 +118,9 @@ const CaseFiles = () => {
             buttonLabel={formatMessage(strings.caseFiles.buttonLabel)}
             onChange={(files) =>
               handleUpload(
-                addUploadFiles(files, CaseFileCategory.CRIMINAL_RECORD),
+                addUploadFiles(files, {
+                  category: CaseFileCategory.CRIMINAL_RECORD,
+                }),
                 updateUploadFile,
               )
             }
@@ -137,7 +141,9 @@ const CaseFiles = () => {
             buttonLabel={formatMessage(strings.caseFiles.buttonLabel)}
             onChange={(files) =>
               handleUpload(
-                addUploadFiles(files, CaseFileCategory.COST_BREAKDOWN),
+                addUploadFiles(files, {
+                  category: CaseFileCategory.COST_BREAKDOWN,
+                }),
                 updateUploadFile,
               )
             }
@@ -158,7 +164,7 @@ const CaseFiles = () => {
             buttonLabel={formatMessage(strings.caseFiles.buttonLabel)}
             onChange={(files) =>
               handleUpload(
-                addUploadFiles(files, CaseFileCategory.CASE_FILE),
+                addUploadFiles(files, { category: CaseFileCategory.CASE_FILE }),
                 updateUploadFile,
               )
             }
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx
index 0975682e136c..fc2b4b10cbd2 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence, motion } from 'framer-motion'
 import { useRouter } from 'next/router'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/LokeNumberList/LokeNumberList.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/LokeNumberList/LokeNumberList.tsx
index 3323c267da08..eb3f14430062 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/LokeNumberList/LokeNumberList.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/LokeNumberList/LokeNumberList.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useEffect, useState } from 'react'
+import { FC, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/PoliceCaseInfo/PoliceCaseInfo.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/PoliceCaseInfo/PoliceCaseInfo.tsx
index 54df47411c39..8ebfb8969f63 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/PoliceCaseInfo/PoliceCaseInfo.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/PoliceCaseInfo/PoliceCaseInfo.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useEffect, useMemo, useState } from 'react'
+import { FC, useContext, useEffect, useMemo, useState } from 'react'
 import InputMask from 'react-input-mask'
 import { useIntl } from 'react-intl'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Indictment.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Indictment.tsx
index f2759ac6e222..a2cc60c4ff1c 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Indictment.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Indictment.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import { applyCase } from 'beygla/strict'
 import { AnimatePresence, motion } from 'framer-motion'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCount.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCount.tsx
index b1dfce8ca910..995eb38f5d4c 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCount.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCount.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useMemo, useState } from 'react'
 import InputMask from 'react-input-mask'
 import { IntlShape, useIntl } from 'react-intl'
 
@@ -43,7 +43,7 @@ import { indictmentCountSubstanceEnum as substanceStrings } from './IndictmentCo
 interface Props {
   indictmentCount: TIndictmentCount
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   onChange: (
     indictmentCountId: string,
     updatedIndictmentCount: UpdateIndictmentCount,
@@ -52,7 +52,7 @@ interface Props {
   updateIndictmentCountState: (
     indictmentCountId: string,
     update: UpdateIndictmentCount,
-    setWorkingCase: React.Dispatch<React.SetStateAction<Case>>,
+    setWorkingCase: Dispatch<SetStateAction<Case>>,
   ) => void
 }
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substance/Substance.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substance/Substance.tsx
index 830788c9fada..54f2f0d6749b 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substance/Substance.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substance/Substance.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useState } from 'react'
+import { FC, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Input } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/Substances.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/Substances.tsx
index 3cec80f97d44..8a148721c67d 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/Substances.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/Substances.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo } from 'react'
+import { FC, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Select } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/DenyIndictmentCaseModal/DenyIndictmentCaseModal.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/DenyIndictmentCaseModal/DenyIndictmentCaseModal.tsx
index 8873dcf03388..026f365bf31a 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/DenyIndictmentCaseModal/DenyIndictmentCaseModal.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/DenyIndictmentCaseModal/DenyIndictmentCaseModal.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Input } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.strings.ts b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.strings.ts
index 24e17b69be86..4bc55575e0a9 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.strings.ts
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.strings.ts
@@ -129,4 +129,10 @@ export const overview = {
     description:
       'Texti í hætta við takka í afturkalla modal glugga á Yfirlit ákæru skefi í ákærum.',
   }),
+  addDocumentsButtonText: defineMessage({
+    id: 'judicial.system.indictments:overview.add_documents_button_text',
+    defaultMessage: 'Bæta við gögnum',
+    description:
+      'Texti á takka til að bæta við skjölum á Yfirlit ákæru skefi í ákærum.',
+  }),
 }
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx
index aa8172918088..20ae6fa85667 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useState } from 'react'
+import { FC, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 import { useRouter } from 'next/router'
@@ -6,6 +6,7 @@ import { useRouter } from 'next/router'
 import {
   AlertMessage,
   Box,
+  Button,
   RadioButton,
   Text,
   toast,
@@ -40,7 +41,7 @@ import DenyIndictmentCaseModal from './DenyIndictmentCaseModal/DenyIndictmentCas
 import { overview as strings } from './Overview.strings'
 import * as styles from './Overview.css'
 
-const Overview: FC<unknown> = () => {
+const Overview: FC = () => {
   const { workingCase, setWorkingCase, isLoadingWorkingCase, caseNotFound } =
     useContext(FormContext)
   const { user } = useContext(UserContext)
@@ -61,18 +62,24 @@ const Overview: FC<unknown> = () => {
   const latestDate = workingCase.courtDate ?? workingCase.arraignmentDate
 
   const isIndictmentNew = workingCase.state === CaseState.DRAFT
+  const isIndictmentWaitingForConfirmation =
+    workingCase.state === CaseState.WAITING_FOR_CONFIRMATION
   const isIndictmentSubmitted = workingCase.state === CaseState.SUBMITTED
   const isIndictmentWaitingForCancellation =
     workingCase.state === CaseState.WAITING_FOR_CANCELLATION
   const isIndictmentReceived = workingCase.state === CaseState.RECEIVED
 
   const userCanSendIndictmentToCourt =
-    Boolean(user?.canConfirmIndictment) &&
-    workingCase.state === CaseState.WAITING_FOR_CONFIRMATION
+    Boolean(user?.canConfirmIndictment) && isIndictmentWaitingForConfirmation
   const userCanCancelIndictment =
-    (workingCase.state === CaseState.SUBMITTED ||
-      workingCase.state === CaseState.RECEIVED) &&
+    (isIndictmentSubmitted || isIndictmentReceived) &&
     !workingCase.indictmentDecision
+  const userCanAddDocuments =
+    isIndictmentSubmitted ||
+    (isIndictmentReceived &&
+      workingCase.indictmentDecision !==
+        IndictmentDecision.POSTPONING_UNTIL_VERDICT &&
+      workingCase.indictmentDecision !== IndictmentDecision.COMPLETING)
 
   const handleTransition = async (transitionType: CaseTransition) => {
     const caseTransitioned = await transitionCase(
@@ -203,9 +210,36 @@ const Overview: FC<unknown> = () => {
             <IndictmentsLawsBrokenAccordionItem workingCase={workingCase} />
           </Box>
         )}
-        <Box marginBottom={userCanSendIndictmentToCourt ? 5 : 10}>
+        <Box
+          marginBottom={
+            workingCase.indictmentDecision !==
+              IndictmentDecision.POSTPONING_UNTIL_VERDICT ||
+            userCanSendIndictmentToCourt
+              ? 5
+              : 10
+          }
+        >
           <IndictmentCaseFilesList workingCase={workingCase} />
         </Box>
+        {userCanAddDocuments && (
+          <Box
+            display="flex"
+            justifyContent="flexEnd"
+            marginBottom={userCanSendIndictmentToCourt ? 5 : 10}
+          >
+            <Button
+              size="small"
+              icon="add"
+              onClick={() =>
+                router.push(
+                  `${constants.INDICTMENTS_ADD_FILES_ROUTE}/${workingCase.id}`,
+                )
+              }
+            >
+              {formatMessage(strings.addDocumentsButtonText)}
+            </Button>
+          </Box>
+        )}
         {userCanSendIndictmentToCourt && (
           <Box marginBottom={10}>
             <SectionHeading
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/PoliceCaseFiles/PoliceCaseFilesRoute.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/PoliceCaseFiles/PoliceCaseFilesRoute.tsx
index 5510238f8d91..649260385e07 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/PoliceCaseFiles/PoliceCaseFilesRoute.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/PoliceCaseFiles/PoliceCaseFilesRoute.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   FC,
   memo,
   useCallback,
@@ -268,12 +268,10 @@ const UploadFilesToPoliceCase: FC<UploadFilesToPoliceCaseProps> = ({
         buttonLabel={formatMessage(strings.inputFileUpload.buttonLabel)}
         onChange={(files) =>
           handleUpload(
-            addUploadFiles(
-              files,
-              CaseFileCategory.CASE_FILE_RECORD,
-              undefined,
+            addUploadFiles(files, {
+              category: CaseFileCategory.CASE_FILE_RECORD,
               policeCaseNumber,
-            ),
+            }),
             updateUploadFile,
           )
         }
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx
index d28259f0399a..82396a8cf72e 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useContext } from 'react'
+import { FC, useCallback, useContext } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx
index c1613b3e2ad0..985ca04df5a9 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence, motion } from 'framer-motion'
 import { useRouter } from 'next/router'
@@ -64,7 +64,7 @@ const Defendant = () => {
   // This state is needed because type is initially set to OHTER on the
   // workingCase and we need to validate that the user selects an option
   // from the case type list to allow the user to continue.
-  const [caseType, setCaseType] = React.useState<CaseType | null>()
+  const [caseType, setCaseType] = useState<CaseType | null>()
 
   useEffect(() => {
     if (workingCase.id) {
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/HearingArrangements/HearingArrangements.tsx
index c15793998ad3..3ed05c4db58d 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/HearingArrangements/HearingArrangements.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/HearingArrangements/HearingArrangements.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Overview/Overview.tsx
index 434625e66d3a..a1ca0086e267 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 import { useRouter } from 'next/router'
@@ -72,7 +72,6 @@ export const Overview = () => {
     registrar,
     prosecutor,
     caseType,
-    confirmedCourtDate,
   } = useInfoCardItems()
 
   const [modal, setModal] = useState<
@@ -191,9 +190,6 @@ export const Overview = () => {
                   ...(workingCase.registrar ? [registrar] : []),
                   prosecutor(workingCase.type),
                   caseType,
-                  ...(workingCase.arraignmentDate?.date
-                    ? [confirmedCourtDate]
-                    : []),
                 ],
                 columns: 2,
               },
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceDemands/PoliceDemands.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceDemands/PoliceDemands.tsx
index 35809ece029e..1da6026ff2d2 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceDemands/PoliceDemands.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceDemands/PoliceDemands.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { MessageDescriptor, useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceReport/PoliceReport.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceReport/PoliceReport.tsx
index 4b6325b1d25a..1873a2a82f29 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceReport/PoliceReport.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/PoliceReport/PoliceReport.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import router from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Defendant/Defendant.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Defendant/Defendant.tsx
index ec3a84e5788b..685cf8a440e4 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Defendant/Defendant.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Defendant/Defendant.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/ArrestDate.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/ArrestDate.tsx
index 1c0e4e64d6d2..e7e5df65c306 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/ArrestDate.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/ArrestDate.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useMemo } from 'react'
+import { Dispatch, FC, SetStateAction, useCallback, useMemo } from 'react'
 
 import { Box, Text } from '@island.is/island-ui/core'
 import { DateTime } from '@island.is/judicial-system-web/src/components'
@@ -11,7 +11,7 @@ import {
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   title: string
 }
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx
index 5d3a02462f02..d574cb3d8868 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Overview/Overview.tsx
index 33ea376b5af9..685a888a32fa 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 import { useRouter } from 'next/router'
@@ -81,7 +81,6 @@ export const Overview = () => {
     prosecutorsOffice,
     requestedCourtDate,
     parentCaseValidToDate,
-    confirmedCourtDate,
   } = useInfoCardItems()
 
   const handleNextButtonClick = async (caseResentExplanation?: string) => {
@@ -198,9 +197,6 @@ export const Overview = () => {
                   ...(workingCase.registrar ? [registrar] : []),
                   prosecutor(workingCase.type),
                   parentCaseValidToDate,
-                  ...(workingCase.arraignmentDate?.date
-                    ? [confirmedCourtDate]
-                    : []),
                 ],
                 columns: 2,
               },
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceDemands/PoliceDemands.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceDemands/PoliceDemands.tsx
index 8a19cce44bb3..2b2367ad5b95 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceDemands/PoliceDemands.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceDemands/PoliceDemands.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -138,7 +138,7 @@ export const PoliceDemands = () => {
 
   useOnceOn(isCaseUpToDate, initialize)
 
-  const onDemandsChange = React.useCallback(
+  const onDemandsChange = useCallback(
     (
       entry: UpdateCase,
       caseType?: CaseType | null,
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceReport/PoliceReport.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceReport/PoliceReport.tsx
index 25fa1fca8f44..574684a07844 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceReport/PoliceReport.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/PoliceReport/PoliceReport.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/CaseFiles/CaseFiles.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/CaseFiles/CaseFiles.tsx
index 92abe331098c..396051818735 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/CaseFiles/CaseFiles.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/CaseFiles/CaseFiles.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useMemo, useState } from 'react'
+import { useContext, useEffect, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx
index fee2eeb769ed..d75c63a9f223 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/DefendantInfo/DefendantInfo.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/DefendantInfo/DefendantInfo.tsx
index 76ef60a35a44..f807d897ead7 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/DefendantInfo/DefendantInfo.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/DefendantInfo/DefendantInfo.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, FC, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, FC, SetStateAction, useEffect, useState } from 'react'
 import InputMask from 'react-input-mask'
 import { useIntl } from 'react-intl'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseFiles/PoliceCaseFiles.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseFiles/PoliceCaseFiles.tsx
index 7e5829a57a53..ec14f884739d 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseFiles/PoliceCaseFiles.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseFiles/PoliceCaseFiles.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertMessage, Box } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.spec.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.spec.tsx
index 62dcafc3c3a0..76c118b8dfde 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.spec.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { IntlProvider } from 'react-intl'
 import faker from 'faker'
 import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.tsx
index aa394bdf932a..15a8ae0b9057 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.tsx
@@ -1,4 +1,12 @@
-import React, { FC, useCallback, useContext, useEffect, useState } from 'react'
+import {
+  Dispatch,
+  FC,
+  SetStateAction,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Icon, Tag, Text } from '@island.is/island-ui/core'
@@ -16,11 +24,9 @@ import { policeCaseNumber as m } from './PoliceCaseNumbers.strings'
 
 interface Props {
   workingCase: Case
-  setWorkingCase: React.Dispatch<React.SetStateAction<Case>>
+  setWorkingCase: Dispatch<SetStateAction<Case>>
   clientPoliceNumbers?: string[] | null
-  setClientPoliceNumbers: React.Dispatch<
-    React.SetStateAction<string[] | undefined | null>
-  >
+  setClientPoliceNumbers: Dispatch<SetStateAction<string[] | undefined | null>>
 }
 
 // Needed so that users can remove all loke numbers in client without syncing to server
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSection.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSection.tsx
index a06a9b631da1..5d2252004be8 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSection.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSection.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 
 import { Box } from '@island.is/island-ui/core'
 import { isIndictmentCase } from '@island.is/judicial-system/types'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeading.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeading.tsx
index fb9c82aadf90..da3a517a61a7 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeading.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeading.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Tooltip } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeightenedSecurity.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeightenedSecurity.tsx
index 399d5c64da8a..fd51e1796d9b 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeightenedSecurity.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/ProsecutorSection/ProsecutorSectionHeightenedSecurity.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react'
+import { useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/RequestCourtDate/RequestCourtDate.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/RequestCourtDate/RequestCourtDate.tsx
index fc025fc031c6..418c234d6fc5 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/RequestCourtDate/RequestCourtDate.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/RequestCourtDate/RequestCourtDate.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Text, Tooltip } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Prosecutor/components/SelectCourt/SelectCourt.tsx b/apps/judicial-system/web/src/routes/Prosecutor/components/SelectCourt/SelectCourt.tsx
index 19aa3c654033..b3bef49fa38f 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/components/SelectCourt/SelectCourt.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/components/SelectCourt/SelectCourt.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 import { useIntl } from 'react-intl'
 
 import { Box, Select, Text } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Cases/PublicProsecutorCases.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Cases/PublicProsecutorCases.tsx
index dfb56a6cb3d2..acf0f2bd264b 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Cases/PublicProsecutorCases.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Cases/PublicProsecutorCases.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo } from 'react'
+import { FC, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertMessage } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.spec.ts b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.spec.ts
index d6346590b97a..327f3cfdd024 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.spec.ts
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.spec.ts
@@ -4,7 +4,7 @@ import { isDefendantInfoActionButtonDisabled } from './Overview'
 
 describe('Overview', () => {
   describe('isDefendantInfoActionButtonDisabled', () => {
-    test('should return true if defendant vervidictViewDate is not null', () => {
+    test('should return true if defendant service requirement is REQUIRED and defendant vervidictViewDate is not null', () => {
       const verdictViewDate = '2024-07-08'
       const serviceRequirement = ServiceRequirement.REQUIRED
 
@@ -17,8 +17,21 @@ describe('Overview', () => {
       expect(res).toEqual(true)
     })
 
-    test('should return true if defendant service requirement is NOT_APPLICABLE', () => {
+    test('should return true if defendant service requirement is REQUIRED and defendant vervidictViewDate is null', () => {
       const verdictViewDate = null
+      const serviceRequirement = ServiceRequirement.REQUIRED
+
+      const res = isDefendantInfoActionButtonDisabled({
+        id: 'id',
+        verdictViewDate,
+        serviceRequirement,
+      })
+
+      expect(res).toEqual(false)
+    })
+
+    test('should return true if defendant service requirement is NOT_APPLICABLE and defendant vervidictViewDate is not null', () => {
+      const verdictViewDate = '2024-07-09'
       const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
 
       const res = isDefendantInfoActionButtonDisabled({
@@ -30,6 +43,19 @@ describe('Overview', () => {
       expect(res).toEqual(true)
     })
 
+    test('should return true if defendant service requirement is NOT_APPLICABLE and defendant vervidictViewDate is null', () => {
+      const verdictViewDate = null
+      const serviceRequirement = ServiceRequirement.NOT_APPLICABLE
+
+      const res = isDefendantInfoActionButtonDisabled({
+        id: 'id',
+        verdictViewDate,
+        serviceRequirement,
+      })
+
+      expect(res).toEqual(false)
+    })
+
     test('should return true if defendant service requirement is NOT_REQUIRED', () => {
       const verdictViewDate = null
       const serviceRequirement = ServiceRequirement.NOT_REQUIRED
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
index 5b0fb9aa170c..9908cf73787a 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useMemo, useState } from 'react'
+import { useCallback, useContext, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -39,15 +39,10 @@ import { strings } from './Overview.strings'
 type VisibleModal = 'REVIEWER_ASSIGNED' | 'DEFENDANT_VIEWS_VERDICT'
 
 export const isDefendantInfoActionButtonDisabled = (defendant: Defendant) => {
-  switch (defendant.serviceRequirement) {
-    case ServiceRequirement.NOT_APPLICABLE:
-    case ServiceRequirement.NOT_REQUIRED:
-      return true
-    case ServiceRequirement.REQUIRED:
-      return defendant.verdictViewDate !== null
-    default:
-      return false
-  }
+  return (
+    defendant.serviceRequirement === ServiceRequirement.NOT_REQUIRED ||
+    Boolean(defendant.verdictViewDate)
+  )
 }
 
 export const Overview = () => {
@@ -89,7 +84,7 @@ export const Overview = () => {
     const updatedDefendant = {
       caseId: workingCase.id,
       defendantId: selectedDefendant.id,
-      verdictViewDate: formatDateForServer(new Date()),
+      verdictViewDate: formatDateForServer(new Date()), // TODO: Let the server override this date as we cannot trust the client date
     }
 
     setAndSendDefendantToServer(updatedDefendant, setWorkingCase)
@@ -143,20 +138,15 @@ export const Overview = () => {
         <CourtCaseInfo workingCase={workingCase} />
         <Box component="section" marginBottom={5}>
           <InfoCardClosedIndictment
-            defendantInfoActionButton={
-              isCompletedCase(workingCase.state) &&
-              workingCase.indictmentReviewer !== null
-                ? {
-                    text: fm(strings.displayVerdict),
-                    onClick: (defendant) => {
-                      setSelectedDefendant(defendant)
-                      setModalVisible('DEFENDANT_VIEWS_VERDICT')
-                    },
-                    icon: 'mailOpen',
-                    isDisabled: isDefendantInfoActionButtonDisabled,
-                  }
-                : undefined
-            }
+            defendantInfoActionButton={{
+              text: fm(strings.displayVerdict),
+              onClick: (defendant) => {
+                setSelectedDefendant(defendant)
+                setModalVisible('DEFENDANT_VIEWS_VERDICT')
+              },
+              icon: 'mailOpen',
+              isDisabled: isDefendantInfoActionButtonDisabled,
+            }}
             displayAppealExpirationInfo={true}
           />
         </Box>
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesAwaitingReview.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesAwaitingReview.tsx
index a846da6d15a3..5f1cc2d3dac2 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesAwaitingReview.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesAwaitingReview.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx
index aa5e0ca69cf0..cc698bca4dc5 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesReviewed.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesReviewed.tsx
index f8f9ed5831d8..9110cf900731 100644
--- a/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesReviewed.tsx
+++ b/apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesReviewed.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 import { AnimatePresence } from 'framer-motion'
 
@@ -41,7 +41,7 @@ const CasesReviewed: FC<Props> = ({ loading, cases }) => {
   }
 
   const getVerdictViewTag = (row: CaseListEntry) => {
-    const today = new Date()
+    const today = new Date() // TODO: Let the server determine if the deadline has passed
     const deadline = new Date(row.indictmentVerdictAppealDeadline ?? '')
     const variant = !row.indictmentVerdictViewedByAll
       ? 'red'
diff --git a/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.strings.ts b/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.strings.ts
new file mode 100644
index 000000000000..12df76225e3a
--- /dev/null
+++ b/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.strings.ts
@@ -0,0 +1,49 @@
+import { defineMessage } from 'react-intl'
+
+export const strings = {
+  heading: defineMessage({
+    id: 'judicial.system.core:add_files.heading',
+    defaultMessage: 'Gögn',
+    description: 'Notaður sem titill á Bæta við gögnum síðu í ákærum.',
+  }),
+  uploadFilesHeading: {
+    id: 'judicial.system.core:add_files.upload_files_heading',
+    defaultMessage: 'Innsending gagna til dómsins',
+    description:
+      'Notaður sem titill í Innsending gagna til dómsins hluta á Gögn síðu í ákærum.',
+  },
+  uploadFilesDescription: {
+    id: 'judicial.system.core:add_files.upload_files_description',
+    defaultMessage: 'Gögnin verða að hafa lýsandi skráarheiti.',
+    description:
+      'Notaður sem texti í Innsending gagna til dómsins hluta á Gögn síðu í ákærum.',
+  },
+  nextButtonText: {
+    id: 'judicial.system.core:add_files.next_button_text',
+    defaultMessage: 'Senda gögn',
+    description: 'Notaður sem texti í Senda gögn takka á Gögn síðu í ákærum',
+  },
+  tryUploadAgain: {
+    id: 'judicial.system.core:add_files.try_upload_again',
+    defaultMessage: 'Reyna aftur',
+    description: 'Notaður sem texti í Reyna aftur takka á Gögn síðu í ákærum',
+  },
+  filesSentModalTitle: {
+    id: 'judicial.system.core:add_files.files_sent_modal_title',
+    defaultMessage: 'Gögn send til héraðsdóms',
+    description:
+      'Notaður sem titill í modal glugga þegar gögn eru send á Gögn síðu í ákærum',
+  },
+  filesSentModalText: {
+    id: 'judicial.system.core:add_files.files_sent_modal_text',
+    defaultMessage: 'Gögnin eru sýnileg dómstólnum og aðilum máls.',
+    description:
+      'Notaður sem texti í modal glugga þegar gögn eru send á Gögn síðu í ákærum',
+  },
+  filesSentModalPrimaryButtonText: {
+    id: 'judicial.system.core:add_files.files_sent_modal_primary_button_text',
+    defaultMessage: 'Halda áfram',
+    description:
+      'Notaður sem texti í takka í modal glugga þegar gögn eru send á Gögn síðu í ákærum',
+  },
+}
diff --git a/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.tsx b/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.tsx
new file mode 100644
index 000000000000..a40748e36aa8
--- /dev/null
+++ b/apps/judicial-system/web/src/routes/Shared/AddFiles/AddFiles.tsx
@@ -0,0 +1,152 @@
+import { FC, useCallback, useContext, useState } from 'react'
+import { useIntl } from 'react-intl'
+import { useRouter } from 'next/router'
+
+import { Box, Text } from '@island.is/island-ui/core'
+import * as constants from '@island.is/judicial-system/consts'
+import { isDefenceUser } from '@island.is/judicial-system/types'
+import { titles } from '@island.is/judicial-system-web/messages'
+import {
+  FormContentContainer,
+  FormContext,
+  FormFooter,
+  Modal,
+  PageHeader,
+  PageLayout,
+  ProsecutorCaseInfo,
+  SectionHeading,
+  UserContext,
+} from '@island.is/judicial-system-web/src/components'
+import UploadFiles from '@island.is/judicial-system-web/src/components/UploadFiles/UploadFiles'
+import { CaseFileCategory } from '@island.is/judicial-system-web/src/graphql/schema'
+import {
+  useS3Upload,
+  useUploadFiles,
+} from '@island.is/judicial-system-web/src/utils/hooks'
+
+import { strings } from './AddFiles.strings'
+
+const AddFiles: FC = () => {
+  const { workingCase, isLoadingWorkingCase, caseNotFound } =
+    useContext(FormContext)
+  const { formatMessage } = useIntl()
+  const [editCount, setEditCount] = useState(0)
+  const [visibleModal, setVisibleModal] = useState<'sendFiles'>()
+  const router = useRouter()
+  const { user } = useContext(UserContext)
+  const previousRoute = isDefenceUser(user)
+    ? `${constants.DEFENDER_INDICTMENT_ROUTE}/${workingCase.id}`
+    : `${constants.INDICTMENTS_OVERVIEW_ROUTE}/${workingCase.id}`
+
+  const {
+    uploadFiles,
+    allFilesDoneOrError,
+    someFilesError,
+    addUploadFiles,
+    removeUploadFile,
+    updateUploadFile,
+  } = useUploadFiles()
+  const { handleUpload } = useS3Upload(workingCase.id)
+
+  const caseFileCategory = isDefenceUser(user)
+    ? CaseFileCategory.DEFENDANT_CASE_FILE
+    : CaseFileCategory.PROSECUTOR_CASE_FILE
+
+  const handleChange = (files: File[]) => {
+    addUploadFiles(
+      files,
+      {
+        category: caseFileCategory,
+        status: 'done',
+        displayDate: new Date().toISOString(),
+      },
+      true,
+    )
+  }
+
+  const handleRename = useCallback(
+    async (fileId: string, newName: string, newDisplayDate: string) => {
+      const fileToUpdate = uploadFiles.find((file) => file.id === fileId)
+
+      if (!fileToUpdate) {
+        return
+      }
+
+      updateUploadFile({
+        ...fileToUpdate,
+        userGeneratedFilename: newName,
+        displayDate: newDisplayDate,
+      })
+    },
+    [updateUploadFile, uploadFiles],
+  )
+
+  const handleNextButtonClick = useCallback(async () => {
+    const allSucceeded = await handleUpload(
+      uploadFiles.filter((file) => file.percent === 0),
+      updateUploadFile,
+    )
+
+    if (allSucceeded) {
+      setVisibleModal('sendFiles')
+    }
+  }, [handleUpload, updateUploadFile, uploadFiles])
+
+  return (
+    <PageLayout
+      workingCase={workingCase}
+      isLoading={isLoadingWorkingCase}
+      notFound={caseNotFound}
+    >
+      <PageHeader
+        title={formatMessage(titles.prosecutor.indictments.overview)}
+      />
+      <FormContentContainer>
+        <Box marginBottom={7}>
+          <Text as="h1" variant="h1">
+            {formatMessage(strings.heading)}
+          </Text>
+        </Box>
+        <ProsecutorCaseInfo workingCase={workingCase} />
+        <SectionHeading
+          title={formatMessage(strings.uploadFilesHeading)}
+          description={formatMessage(strings.uploadFilesDescription)}
+        />
+        <UploadFiles
+          files={uploadFiles}
+          onChange={handleChange}
+          onDelete={removeUploadFile}
+          onRename={handleRename}
+          setEditCount={setEditCount}
+        />
+      </FormContentContainer>
+      <FormContentContainer isFooter>
+        <FormFooter
+          previousUrl={previousRoute}
+          nextButtonText={
+            someFilesError
+              ? formatMessage(strings.tryUploadAgain)
+              : formatMessage(strings.nextButtonText)
+          }
+          nextButtonColorScheme={someFilesError ? 'destructive' : 'default'}
+          nextIsDisabled={
+            uploadFiles.length === 0 || !allFilesDoneOrError || editCount > 0
+          }
+          onNextButtonClick={handleNextButtonClick}
+        />
+      </FormContentContainer>
+      {visibleModal === 'sendFiles' && (
+        <Modal
+          title={formatMessage(strings.filesSentModalTitle)}
+          text={formatMessage(strings.filesSentModalText)}
+          primaryButtonText={formatMessage(
+            strings.filesSentModalPrimaryButtonText,
+          )}
+          onPrimaryButtonClick={() => router.push(previousRoute)}
+        />
+      )}
+    </PageLayout>
+  )
+}
+
+export default AddFiles
diff --git a/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealCaseFiles.tsx b/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealCaseFiles.tsx
index e6417026475d..b872c4f4e79d 100644
--- a/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealCaseFiles.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealCaseFiles.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -84,7 +84,7 @@ const AppealFiles = () => {
 
   const handleNextButtonClick = useCallback(async () => {
     const allSucceeded = await handleUpload(
-      uploadFiles.filter((file) => !file.key),
+      uploadFiles.filter((file) => file.percent === 0),
       updateUploadFile,
     )
 
@@ -111,8 +111,8 @@ const AppealFiles = () => {
     }
   }
 
-  const handleChange = (files: File[], type: CaseFileCategory) => {
-    addUploadFiles(files, type, 'done')
+  const handleChange = (files: File[]) => {
+    addUploadFiles(files, { category: appealCaseFilesType, status: 'done' })
   }
 
   return (
@@ -181,10 +181,8 @@ const AppealFiles = () => {
               fileEndings: '.pdf',
             })}
             buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
-            onChange={(files) => {
-              handleChange(files, appealCaseFilesType)
-            }}
-            onRemove={(file) => handleRemoveFile(file)}
+            onChange={handleChange}
+            onRemove={handleRemoveFile}
             hideIcons={!allFilesDoneOrError}
             disabled={!allFilesDoneOrError}
           />
@@ -204,9 +202,8 @@ const AppealFiles = () => {
               ? strings.uploadFailedNextButtonText
               : strings.nextButtonText,
           )}
-          nextButtonIcon={undefined}
           nextIsLoading={!allFilesDoneOrError}
-          nextIsDisabled={uploadFiles.length === 0}
+          nextIsDisabled={uploadFiles.length === 0 || !allFilesDoneOrError}
           nextButtonColorScheme={someFilesError ? 'destructive' : 'default'}
         />
       </FormContentContainer>
diff --git a/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealToCourtOfAppeals.tsx b/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealToCourtOfAppeals.tsx
index aa7d56383229..72cec8d0db9b 100644
--- a/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealToCourtOfAppeals.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/AppealToCourtOfAppeals/AppealToCourtOfAppeals.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -103,8 +103,8 @@ const AppealToCourtOfAppeals = () => {
     }
   }
 
-  const handleChange = (files: File[], type: CaseFileCategory) => {
-    addUploadFiles(files, type, 'done')
+  const handleChange = (files: File[], category: CaseFileCategory) => {
+    addUploadFiles(files, { category, status: 'done' })
   }
 
   return (
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx
index 4e9046e60dc9..ac0bcd019845 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { useIntl } from 'react-intl'
 
 import { capitalize } from '@island.is/judicial-system/formatters'
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/AllCases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/AllCases.tsx
index fc94c44896cd..54c7d73d79bd 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/AllCases.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/AllCases.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext } from 'react'
+import { FC, useContext } from 'react'
 
 import { isPublicProsecutorUser } from '@island.is/judicial-system/types'
 import { UserContext } from '@island.is/judicial-system-web/src/components'
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.spec.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.spec.tsx
index 7da99096c234..5a95618ec575 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.spec.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MockedProvider } from '@apollo/client/testing'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
index d84fc1a7a347..ddc3c79a69f8 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useEffect, useMemo, useState } from 'react'
+import { FC, useContext, useEffect, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { AlertMessage, Box, Select } from '@island.is/island-ui/core'
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/MobileCase.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/MobileCase.tsx
index d6abac9e9175..391d004d76d4 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/MobileCase.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/MobileCase.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren, ReactNode } from 'react'
 import { useIntl } from 'react-intl'
 import format from 'date-fns/format'
 import parseISO from 'date-fns/parseISO'
@@ -18,8 +18,8 @@ import { displayCaseType } from './utils'
 import * as styles from './MobileCase.css'
 
 interface CategoryCardProps {
-  heading: string | React.ReactNode
-  tags?: React.ReactNode
+  heading: string | ReactNode
+  tags?: ReactNode
   onClick: () => void
   isLoading?: boolean
 }
diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/PrisonCases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/PrisonCases.tsx
index f5fffe16f172..ca2bd29cd98c 100644
--- a/apps/judicial-system/web/src/routes/Shared/Cases/PrisonCases.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Cases/PrisonCases.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useContext, useMemo } from 'react'
+import { FC, useContext, useMemo } from 'react'
 import { useIntl } from 'react-intl'
 import partition from 'lodash/partition'
 
diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.strings.ts b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.strings.ts
index 1d124d853611..62da4e446ca7 100644
--- a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.strings.ts
+++ b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.strings.ts
@@ -17,4 +17,10 @@ export const strings = defineMessages({
     defaultMessage: 'Ljúka yfirlestri',
     description: 'Notaður sem texti á takka til að loka yfirliti ákæru.',
   },
+  addDocumentsButtonText: {
+    id: 'judicial.system.indictments:overview.add_documents_button_text',
+    defaultMessage: 'Bæta við gögnum',
+    description:
+      'Texti á takka til að bæta við skjölum á Yfirlit ákæru skefi í ákærum.',
+  },
 })
diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
index cdfb30f7e17b..7151e95d1b3a 100644
--- a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
@@ -1,10 +1,13 @@
-import React, { FC, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
-import { Box } from '@island.is/island-ui/core'
+import { Box, Button } from '@island.is/island-ui/core'
 import * as constants from '@island.is/judicial-system/consts'
-import { isCompletedCase } from '@island.is/judicial-system/types'
+import {
+  isCompletedCase,
+  isDefenceUser,
+} from '@island.is/judicial-system/types'
 import { titles } from '@island.is/judicial-system-web/messages'
 import {
   CourtCaseInfo,
@@ -50,6 +53,10 @@ const IndictmentOverview: FC = () => {
     isCompletedCase(workingCase.state) &&
     workingCase.indictmentReviewer?.id === user?.id &&
     Boolean(!workingCase.indictmentReviewDecision)
+  const canAddFiles =
+    isDefenceUser(user) &&
+    workingCase.indictmentDecision !==
+      IndictmentDecision.POSTPONING_UNTIL_VERDICT
 
   const handleNavigationTo = useCallback(
     (destination: string) => router.push(`${destination}/${workingCase.id}`),
@@ -119,11 +126,26 @@ const IndictmentOverview: FC = () => {
         {workingCase.caseFiles && (
           <Box
             component="section"
-            marginBottom={shouldDisplayReviewDecision ? 5 : 10}
+            marginBottom={shouldDisplayReviewDecision || canAddFiles ? 5 : 10}
           >
             <IndictmentCaseFilesList workingCase={workingCase} />
           </Box>
         )}
+        {canAddFiles && (
+          <Box display="flex" justifyContent="flexEnd" marginBottom={10}>
+            <Button
+              size="small"
+              icon="add"
+              onClick={() =>
+                router.push(
+                  `${constants.DEFENDER_ADD_FILES_ROUTE}/${workingCase.id}`,
+                )
+              }
+            >
+              {formatMessage(strings.addDocumentsButtonText)}
+            </Button>
+          </Box>
+        )}
         {shouldDisplayReviewDecision && (
           <ReviewDecision
             caseId={workingCase.id}
diff --git a/apps/judicial-system/web/src/routes/Shared/Login/Login.tsx b/apps/judicial-system/web/src/routes/Shared/Login/Login.tsx
index d3e187f106cf..a6d630f8f62b 100644
--- a/apps/judicial-system/web/src/routes/Shared/Login/Login.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Login/Login.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
diff --git a/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/Components/ModifyDatesModal/ModifyDatesModal.tsx b/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/Components/ModifyDatesModal/ModifyDatesModal.tsx
index 5b1451b5823e..dda8122f6980 100644
--- a/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/Components/ModifyDatesModal/ModifyDatesModal.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/Components/ModifyDatesModal/ModifyDatesModal.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   Dispatch,
   FC,
   SetStateAction,
diff --git a/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/SignedVerdictOverview.tsx b/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/SignedVerdictOverview.tsx
index 632eb710b1c3..764a5fca56d1 100644
--- a/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/SignedVerdictOverview.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/SignedVerdictOverview/SignedVerdictOverview.tsx
@@ -1,4 +1,4 @@
-import React, { FC, ReactNode, useCallback, useContext, useState } from 'react'
+import { FC, ReactNode, useCallback, useContext, useState } from 'react'
 import { IntlShape, useIntl } from 'react-intl'
 import { SingleValue } from 'react-select'
 import { AnimatePresence } from 'framer-motion'
@@ -388,6 +388,7 @@ export const SignedVerdictOverview: FC = () => {
           ),
         })
 
+        // TODO: Pass the real insitution into shareCaseWithAnotherInstitution, no nned for faking values here.
         setWorkingCase((prevWorkingCase) => ({
           ...prevWorkingCase,
           sharedWithProsecutorsOffice: {
diff --git a/apps/judicial-system/web/src/routes/Shared/Statement/Statement.tsx b/apps/judicial-system/web/src/routes/Shared/Statement/Statement.tsx
index daa6a3d51127..5924ad4e57ed 100644
--- a/apps/judicial-system/web/src/routes/Shared/Statement/Statement.tsx
+++ b/apps/judicial-system/web/src/routes/Shared/Statement/Statement.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 
@@ -86,7 +86,7 @@ const Statement = () => {
     const updated = await updateCase(
       workingCase.id,
       isDefenceUser(user)
-        ? { defendantStatementDate: new Date().toISOString() }
+        ? { defendantStatementDate: new Date().toISOString() } // TODO: Let the server override this date. It is already overriding prosecutorStatementDate.
         : { prosecutorStatementDate: new Date().toISOString() },
     )
 
@@ -109,8 +109,9 @@ const Statement = () => {
       removeUploadFile(file)
     }
   }
-  const handleChange = (files: File[], type: CaseFileCategory) => {
-    addUploadFiles(files, type, 'done')
+
+  const handleChange = (files: File[], category: CaseFileCategory) => {
+    addUploadFiles(files, { category, status: 'done' })
   }
 
   return (
diff --git a/apps/judicial-system/web/src/utils/formHelper.ts b/apps/judicial-system/web/src/utils/formHelper.ts
index a8f96b84066d..18ad816407aa 100644
--- a/apps/judicial-system/web/src/utils/formHelper.ts
+++ b/apps/judicial-system/web/src/utils/formHelper.ts
@@ -50,10 +50,11 @@ export const validateAndSetErrorMessage = (
 ) => {
   const validation = validations.validate([[value, validationsToRun]])
 
-  if (!validation.isValid && errorMessageSetter) {
+  if (errorMessageSetter) {
     errorMessageSetter(validation.errorMessage)
-    return
   }
+
+  return validation.isValid
 }
 
 export const validateAndSet = (
@@ -80,9 +81,13 @@ export const validateAndSendToServer = (
   updateCase: (id: string, updateCase: UpdateCase) => void,
   setErrorMessage?: (value: SetStateAction<string>) => void,
 ) => {
-  validateAndSetErrorMessage(validations, value, setErrorMessage)
+  const isValid = validateAndSetErrorMessage(
+    validations,
+    value,
+    setErrorMessage,
+  )
 
-  if (theCase.id !== '') {
+  if (theCase.id !== '' && isValid) {
     updateCase(theCase.id, { [field]: value })
   }
 }
diff --git a/apps/judicial-system/web/src/utils/hooks/index.ts b/apps/judicial-system/web/src/utils/hooks/index.ts
index 14e33b8328bf..5b45d181ec23 100644
--- a/apps/judicial-system/web/src/utils/hooks/index.ts
+++ b/apps/judicial-system/web/src/utils/hooks/index.ts
@@ -17,8 +17,8 @@ export {
   getAppealDecision,
   default as useAppealAlertBanner,
 } from './useAppealAlertBanner'
-export { default as useSortCases } from './useSort/useSortCases'
-export { default as useSortAppealCases } from './useSort/useSortAppealCases'
+export { default as useSort } from './useSort/useSort'
+
 export { useGeoLocation } from './useGeoLocation/useGeoLocation'
 export { default as useDefendants } from './useDefendants'
 export {
diff --git a/apps/judicial-system/web/src/utils/hooks/useCaseList/index.tsx b/apps/judicial-system/web/src/utils/hooks/useCaseList/index.tsx
index a4f6b465fc71..d184a5703fb9 100644
--- a/apps/judicial-system/web/src/utils/hooks/useCaseList/index.tsx
+++ b/apps/judicial-system/web/src/utils/hooks/useCaseList/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useMemo, useState } from 'react'
+import { useCallback, useContext, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { motion } from 'framer-motion'
 import { useRouter } from 'next/router'
diff --git a/apps/judicial-system/web/src/utils/hooks/useFileList/index.ts b/apps/judicial-system/web/src/utils/hooks/useFileList/index.ts
index 2712f5a9bf25..475d9bd11bca 100644
--- a/apps/judicial-system/web/src/utils/hooks/useFileList/index.ts
+++ b/apps/judicial-system/web/src/utils/hooks/useFileList/index.ts
@@ -1,5 +1,8 @@
 import { useContext, useEffect, useMemo, useState } from 'react'
+import { useIntl } from 'react-intl'
 
+import { toast } from '@island.is/island-ui/core'
+import { errors } from '@island.is/judicial-system-web/messages'
 import {
   FormContext,
   UserContext,
@@ -16,6 +19,7 @@ interface Parameters {
 const useFileList = ({ caseId }: Parameters) => {
   const { limitedAccess } = useContext(UserContext)
   const { setWorkingCase } = useContext(FormContext)
+  const { formatMessage } = useIntl()
   const [fileNotFound, setFileNotFound] = useState<boolean>()
 
   const [
@@ -29,6 +33,9 @@ const useFileList = ({ caseId }: Parameters) => {
         window.open(data.getSignedUrl.url, '_blank')
       }
     },
+    onError: () => {
+      toast.error(formatMessage(errors.openDocument))
+    },
   })
 
   const [
@@ -42,6 +49,9 @@ const useFileList = ({ caseId }: Parameters) => {
         window.open(data.limitedAccessGetSignedUrl.url, '_blank')
       }
     },
+    onError: () => {
+      toast.error(formatMessage(errors.openDocument))
+    },
   })
 
   useEffect(() => {
diff --git a/apps/judicial-system/web/src/utils/hooks/useS3Upload/useS3Upload.ts b/apps/judicial-system/web/src/utils/hooks/useS3Upload/useS3Upload.ts
index 9580d95bfe8a..a65e1437d5d3 100644
--- a/apps/judicial-system/web/src/utils/hooks/useS3Upload/useS3Upload.ts
+++ b/apps/judicial-system/web/src/utils/hooks/useS3Upload/useS3Upload.ts
@@ -2,7 +2,7 @@ import { useCallback, useContext, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { uuid } from 'uuidv4'
 
-import { toast, UploadFile, UploadFileStatus } from '@island.is/island-ui/core'
+import { toast, UploadFile } from '@island.is/island-ui/core'
 import { UserContext } from '@island.is/judicial-system-web/src/components'
 import {
   CaseFile,
@@ -46,6 +46,7 @@ export interface TUploadFile extends UploadFile {
   orderWithinChapter?: number | null
   displayDate?: string | null
   policeFileId?: string | null
+  userGeneratedFilename?: string | null
 }
 
 export interface UploadFileState {
@@ -67,6 +68,7 @@ const mapCaseFileToUploadFile = (file: CaseFile): TUploadFile => ({
   orderWithinChapter: file.orderWithinChapter,
   displayDate: file.displayDate,
   policeFileId: file.policeFileId,
+  userGeneratedFilename: file.userGeneratedFilename,
 })
 
 export const useUploadFiles = (files?: CaseFile[] | null) => {
@@ -89,9 +91,8 @@ export const useUploadFiles = (files?: CaseFile[] | null) => {
 
   const addUploadFiles = (
     files: File[],
-    category?: CaseFileCategory,
-    status?: UploadFileStatus,
-    policeCaseNumber?: string,
+    overRides?: Partial<TUploadFile>,
+    setUserGeneratedFilename = false,
   ) => {
     // We generate an id for each file so that we find the file again when
     // updating the file's progress and onRetry.
@@ -102,10 +103,9 @@ export const useUploadFiles = (files?: CaseFile[] | null) => {
       type: file.type,
       size: file.size,
       percent: 0,
-      status,
-      category,
-      policeCaseNumber,
       originalFileObj: file,
+      userGeneratedFilename: setUserGeneratedFilename ? file.name : undefined,
+      ...overRides,
     }))
 
     setUploadFiles((previous) => [...uploadFiles, ...previous])
@@ -113,12 +113,13 @@ export const useUploadFiles = (files?: CaseFile[] | null) => {
     return uploadFiles
   }
 
-  const updateUploadFile = (file: TUploadFile, newId?: string) =>
+  const updateUploadFile = (file: TUploadFile, newId?: string) => {
     setUploadFiles((previous) =>
       previous.map((f) =>
         f.id === file.id ? { ...f, ...file, id: newId ?? file.id } : f,
       ),
     )
+  }
 
   const removeUploadFile = (file: TUploadFile) =>
     setUploadFiles((previous) =>
@@ -201,6 +202,41 @@ const useS3Upload = (caseId: string) => {
   const [limitedAccessDeleteFile] = useLimitedAccessDeleteFileMutation()
   const [uploadPoliceCaseFile] = useUploadPoliceCaseFileMutation()
 
+  const getPresignedPost = useCallback(
+    async (file: TUploadFile) => {
+      const mutation = limitedAccess
+        ? limitedAccessCreatePresignedPost
+        : createPresignedPost
+
+      const { data } = await mutation({
+        variables: {
+          input: {
+            caseId,
+            fileName: file.name.normalize(),
+            type: file.type ?? '',
+          },
+        },
+      })
+
+      const presignedPost = limitedAccess
+        ? (data as LimitedAccessCreatePresignedPostMutation)
+            ?.limitedAccessCreatePresignedPost
+        : (data as CreatePresignedPostMutation)?.createPresignedPost
+
+      if (!presignedPost?.fields?.key) {
+        throw Error('Failed to get presigned post')
+      }
+
+      return presignedPost
+    },
+    [
+      limitedAccess,
+      limitedAccessCreatePresignedPost,
+      createPresignedPost,
+      caseId,
+    ],
+  )
+
   const addFileToCaseState = useCallback(
     async (file: TUploadFile) => {
       const mutation = limitedAccess ? limitedAccessCreateFile : createFile
@@ -218,6 +254,7 @@ const useS3Upload = (caseId: string) => {
             orderWithinChapter: file.orderWithinChapter,
             displayDate: file.displayDate,
             policeFileId: file.policeFileId,
+            userGeneratedFilename: file.userGeneratedFilename,
           },
         },
       })
@@ -240,33 +277,6 @@ const useS3Upload = (caseId: string) => {
       files: TUploadFile[],
       updateFile: (file: TUploadFile, newId?: string) => void,
     ) => {
-      const mutation = limitedAccess
-        ? limitedAccessCreatePresignedPost
-        : createPresignedPost
-
-      const getPresignedPost = async (file: TUploadFile) => {
-        const { data } = await mutation({
-          variables: {
-            input: {
-              caseId,
-              fileName: file.name.normalize(),
-              type: file.type ?? '',
-            },
-          },
-        })
-
-        const presignedPost = limitedAccess
-          ? (data as LimitedAccessCreatePresignedPostMutation)
-              ?.limitedAccessCreatePresignedPost
-          : (data as CreatePresignedPostMutation)?.createPresignedPost
-
-        if (!presignedPost?.fields?.key) {
-          throw Error('Failed to get presigned post')
-        }
-
-        return presignedPost
-      }
-
       const promises = files.map(async (file) => {
         try {
           updateFile({ ...file, status: 'uploading' })
@@ -306,18 +316,11 @@ const useS3Upload = (caseId: string) => {
         results.every((result) => result),
       )
     },
-    [
-      limitedAccess,
-      limitedAccessCreatePresignedPost,
-      createPresignedPost,
-      caseId,
-      addFileToCaseState,
-      formatMessage,
-    ],
+    [getPresignedPost, addFileToCaseState, formatMessage],
   )
 
   const handleUploadFromPolice = useCallback(
-    async (
+    (
       files: TUploadFile[],
       callback: (file: TUploadFile, newId?: string) => void,
     ) => {
@@ -372,7 +375,7 @@ const useS3Upload = (caseId: string) => {
     ) => {
       callback({ ...file, percent: 1, status: 'uploading' })
 
-      handleUpload([file], callback)
+      return handleUpload([file], callback)
     },
     [handleUpload],
   )
@@ -385,7 +388,7 @@ const useS3Upload = (caseId: string) => {
           id: fileId,
         },
       }
-      const resopnse: { success: boolean; __typename: 'DeleteFileResponse' } = {
+      const response: { success: boolean; __typename: 'DeleteFileResponse' } = {
         success: true,
         __typename: 'DeleteFileResponse',
       }
@@ -393,11 +396,11 @@ const useS3Upload = (caseId: string) => {
       return limitedAccess
         ? limitedAccessDeleteFile({
             variables,
-            optimisticResponse: { limitedAccessDeleteFile: resopnse },
+            optimisticResponse: { limitedAccessDeleteFile: response },
           })
         : deleteFile({
             variables,
-            optimisticResponse: { deleteFile: resopnse },
+            optimisticResponse: { deleteFile: response },
           })
     },
     [caseId, limitedAccess, limitedAccessDeleteFile, deleteFile],
diff --git a/apps/judicial-system/web/src/utils/hooks/useSections/index.ts b/apps/judicial-system/web/src/utils/hooks/useSections/index.ts
index babd157c2531..5608d706ab7e 100644
--- a/apps/judicial-system/web/src/utils/hooks/useSections/index.ts
+++ b/apps/judicial-system/web/src/utils/hooks/useSections/index.ts
@@ -400,7 +400,8 @@ const useSections = (
     const { id, type, state } = workingCase
     const substepsShouldBeHidden =
       state === CaseState.RECEIVED ||
-      state === CaseState.WAITING_FOR_CANCELLATION
+      state === CaseState.WAITING_FOR_CANCELLATION ||
+      router.pathname === `${constants.INDICTMENTS_ADD_FILES_ROUTE}/[id]`
     const isTrafficViolation = isTrafficViolationCase(workingCase)
 
     return {
diff --git a/apps/judicial-system/web/src/utils/hooks/useSections/useSections.spec.tsx b/apps/judicial-system/web/src/utils/hooks/useSections/useSections.spec.tsx
index 1d09bf1918dc..e0f0ce3a4638 100644
--- a/apps/judicial-system/web/src/utils/hooks/useSections/useSections.spec.tsx
+++ b/apps/judicial-system/web/src/utils/hooks/useSections/useSections.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { IntlProvider } from 'react-intl'
 import faker from 'faker'
 import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client'
diff --git a/apps/judicial-system/web/src/utils/hooks/useSort/useSort.ts b/apps/judicial-system/web/src/utils/hooks/useSort/useSort.ts
new file mode 100644
index 000000000000..a1fed64fdfcb
--- /dev/null
+++ b/apps/judicial-system/web/src/utils/hooks/useSort/useSort.ts
@@ -0,0 +1,59 @@
+import { useCallback, useMemo, useState } from 'react'
+
+import { compareLocaleIS } from '../../sortHelper'
+
+type SortDirection = 'ascending' | 'descending'
+
+interface SortConfig<T> {
+  column: keyof T
+  direction: SortDirection
+}
+
+const useSort = <T>(
+  defaultColumn: keyof T,
+  defaultDirection: SortDirection,
+  data: T[],
+  getColumnValue: (entry: T, column: keyof T) => string | null | undefined,
+) => {
+  const [sortConfig, setSortConfig] = useState<SortConfig<T>>({
+    column: defaultColumn,
+    direction: defaultDirection,
+  })
+
+  const requestSort = useCallback((column: keyof T) => {
+    setSortConfig((prevConfig) => ({
+      column,
+      direction:
+        prevConfig.column === column && prevConfig.direction === 'ascending'
+          ? 'descending'
+          : 'ascending',
+    }))
+  }, [])
+
+  const sortedData = useMemo(() => {
+    return [...data].sort((a, b) => {
+      const compareResult = compareLocaleIS(
+        getColumnValue(a, sortConfig.column),
+        getColumnValue(b, sortConfig.column),
+      )
+      return sortConfig.direction === 'ascending'
+        ? compareResult
+        : -compareResult
+    })
+  }, [data, sortConfig, getColumnValue])
+
+  const getClassNamesFor = useCallback(
+    (column: keyof T) =>
+      sortConfig.column === column ? sortConfig.direction : undefined,
+    [sortConfig],
+  )
+
+  const isActiveColumn = useCallback(
+    (column: keyof T) => sortConfig.column === column,
+    [sortConfig],
+  )
+
+  return { sortedData, requestSort, getClassNamesFor, isActiveColumn }
+}
+
+export default useSort
diff --git a/apps/judicial-system/web/src/utils/hooks/useSort/useSortAppealCases.ts b/apps/judicial-system/web/src/utils/hooks/useSort/useSortAppealCases.ts
deleted file mode 100644
index 65204872f27b..000000000000
--- a/apps/judicial-system/web/src/utils/hooks/useSort/useSortAppealCases.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useMemo, useState } from 'react'
-
-import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema'
-import { compareLocaleIS } from '@island.is/judicial-system-web/src/utils/sortHelper'
-
-const useSortAppealCases = (
-  defaultColumn: string,
-  defaultDirection: 'ascending' | 'descending',
-  data: CaseListEntry[],
-) => {
-  const [sortConfig, setSortConfig] = useState({
-    column: defaultColumn,
-    direction: defaultDirection,
-  })
-
-  const requestSort = (column: string) => {
-    let direction: 'ascending' | 'descending' = 'ascending'
-
-    if (sortConfig.column === column && sortConfig.direction === 'ascending') {
-      direction = 'descending'
-    }
-
-    setSortConfig({ column, direction })
-  }
-
-  const isActiveColumn = (column: string) => {
-    if (!sortConfig) {
-      return false
-    }
-    return sortConfig.column === column
-  }
-
-  const getClassNamesFor = (column: string) => {
-    if (!sortConfig) {
-      return
-    }
-    return sortConfig.column === column ? sortConfig.direction : undefined
-  }
-
-  const sortedData = useMemo(() => {
-    if (sortConfig && data) {
-      return [...data].sort((a, b) => {
-        const getColumnValue = (entry: CaseListEntry): string => {
-          if (
-            sortConfig.column === 'defendant' &&
-            entry.defendants &&
-            entry.defendants.length > 0
-          ) {
-            return entry.defendants[0].name ?? ''
-          }
-          return entry.appealedDate ?? ''
-        }
-        const compareResult = compareLocaleIS(
-          getColumnValue(a),
-          getColumnValue(b),
-        )
-        return sortConfig.direction === 'ascending'
-          ? compareResult
-          : -compareResult
-      })
-    }
-    return data
-  }, [data, sortConfig])
-
-  return { sortedData, requestSort, getClassNamesFor, isActiveColumn }
-}
-
-export default useSortAppealCases
diff --git a/apps/judicial-system/web/src/utils/hooks/useSort/useSortCases.ts b/apps/judicial-system/web/src/utils/hooks/useSort/useSortCases.ts
deleted file mode 100644
index 9fa8023ba261..000000000000
--- a/apps/judicial-system/web/src/utils/hooks/useSort/useSortCases.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useMemo, useState } from 'react'
-
-import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema'
-import { sortableTableColumn } from '@island.is/judicial-system-web/src/types'
-import { compareLocaleIS } from '@island.is/judicial-system-web/src/utils/sortHelper'
-
-const useSortCases = (
-  defaultColumn: sortableTableColumn,
-  defaultDirection: 'ascending' | 'descending',
-  data: CaseListEntry[],
-) => {
-  const [sortConfig, setSortConfig] = useState({
-    column: defaultColumn,
-    direction: defaultDirection,
-  })
-
-  const requestSort = (column: sortableTableColumn) => {
-    let direction: 'ascending' | 'descending' = 'ascending'
-
-    if (sortConfig.column === column && sortConfig.direction === 'ascending') {
-      direction = 'descending'
-    }
-
-    setSortConfig({ column, direction })
-  }
-
-  const getClassNamesFor = (column: sortableTableColumn) => {
-    if (!sortConfig) {
-      return
-    }
-    return sortConfig.column === column ? sortConfig.direction : undefined
-  }
-
-  const isActiveColumn = (column: sortableTableColumn) => {
-    if (!sortConfig) {
-      return false
-    }
-    return sortConfig.column === column
-  }
-
-  const sortedData = useMemo(() => {
-    if (sortConfig && data) {
-      return [...data].sort((a, b) => {
-        const getColumnValue = (entry: CaseListEntry) => {
-          if (
-            sortConfig.column === 'defendants' &&
-            entry.defendants &&
-            entry.defendants.length > 0
-          ) {
-            return entry.defendants[0].name ?? ''
-          }
-          return entry.created
-        }
-
-        const compareResult = compareLocaleIS(
-          getColumnValue(a),
-          getColumnValue(b),
-        )
-
-        return sortConfig.direction === 'ascending'
-          ? compareResult
-          : -compareResult
-      })
-    }
-    return data
-  }, [data, sortConfig])
-
-  return { sortedData, requestSort, getClassNamesFor, isActiveColumn }
-}
-
-export default useSortCases
diff --git a/apps/judicial-system/web/src/utils/restrictions.spec.tsx b/apps/judicial-system/web/src/utils/restrictions.spec.tsx
index bfb87d7e6da6..cc602b2eb395 100644
--- a/apps/judicial-system/web/src/utils/restrictions.spec.tsx
+++ b/apps/judicial-system/web/src/utils/restrictions.spec.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { createIntl, IntlFormatters, useIntl } from 'react-intl'
 import { MockedProvider } from '@apollo/client/testing'
 import { getDefaultNormalizer, render, screen } from '@testing-library/react'
diff --git a/apps/judicial-system/web/src/utils/stepHelper.ts b/apps/judicial-system/web/src/utils/stepHelper.ts
index e410eac190bb..5ea47b22ea76 100644
--- a/apps/judicial-system/web/src/utils/stepHelper.ts
+++ b/apps/judicial-system/web/src/utils/stepHelper.ts
@@ -77,7 +77,7 @@ export const createCaseResentExplanation = (
   workingCase: Case,
   explanation?: string,
 ) => {
-  const now = new Date()
+  const now = new Date() // TODO: Find a way to set this message server side as we cannot trust the client date.
 
   return `${
     workingCase.caseResentExplanation
diff --git a/apps/judicial-system/web/src/utils/testHelpers.tsx b/apps/judicial-system/web/src/utils/testHelpers.tsx
index a8bfa94c562c..99e942d93f5c 100644
--- a/apps/judicial-system/web/src/utils/testHelpers.tsx
+++ b/apps/judicial-system/web/src/utils/testHelpers.tsx
@@ -1,4 +1,4 @@
-import React, { FC, PropsWithChildren, ReactNode } from 'react'
+import { FC, PropsWithChildren, ReactNode } from 'react'
 import { createIntl, IntlProvider } from 'react-intl'
 import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client'
 
diff --git a/apps/judicial-system/web/src/utils/utils.spec.tsx b/apps/judicial-system/web/src/utils/utils.spec.tsx
index 3953e36f3c7f..a65cc31ecc11 100644
--- a/apps/judicial-system/web/src/utils/utils.spec.tsx
+++ b/apps/judicial-system/web/src/utils/utils.spec.tsx
@@ -1,15 +1,16 @@
-import React from 'react'
 import faker from 'faker'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 
 import {
+  Case,
   Gender,
   Notification,
   NotificationType,
 } from '@island.is/judicial-system-web/src/graphql/schema'
 
 import * as formatters from './formatters'
+import { validateAndSendToServer } from './formHelper'
 import {
   getAppealEndDate,
   getShortGender,
@@ -330,6 +331,53 @@ describe('Step helper', () => {
     })
   })
 
+  describe('validateAndSendToServer', () => {
+    test('should call the updateCase function with the correct parameters', () => {
+      // Arrange
+      const spy = jest.fn()
+      const fieldToUpdate = 'courtCaseNumber'
+      const value = '1234/1234'
+      const id = faker.datatype.uuid()
+      const theCase = { id } as Case
+      const update = {
+        courtCaseNumber: value,
+      }
+
+      // Act
+      validateAndSendToServer(
+        fieldToUpdate,
+        value,
+        ['appeal-case-number-format'],
+        theCase,
+        spy,
+      )
+
+      // Assert
+      expect(spy).toBeCalledWith(id, update)
+    })
+
+    test('should not call the updateCase function if the value is invalid', () => {
+      // Arrange
+      const spy = jest.fn()
+      const fieldToUpdate = 'courtCaseNumber'
+      const value = '12341234'
+      const id = faker.datatype.uuid()
+      const theCase = { id } as Case
+
+      // Act
+      validateAndSendToServer(
+        fieldToUpdate,
+        value,
+        ['appeal-case-number-format'],
+        theCase,
+        spy,
+      )
+
+      // Assert
+      expect(spy).not.toHaveBeenCalled()
+    })
+  })
+
   test('should return false if no notification is found of a spesific notification type', () => {
     // Arrange
     const email = faker.internet.email()
diff --git a/apps/native/app/android/app/build.gradle b/apps/native/app/android/app/build.gradle
index c0019976ad31..bcdf28ccfabb 100644
--- a/apps/native/app/android/app/build.gradle
+++ b/apps/native/app/android/app/build.gradle
@@ -103,7 +103,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode getMyVersionCode(143)
-        versionName "1.4.0"
+        versionName "1.4.1"
         manifestPlaceholders = [
             appAuthRedirectScheme: "is.island.app" // project.config.get("BUNDLE_ID_ANDROID")
         ]
diff --git a/apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans-Regular.ttf b/apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans.ttf
similarity index 100%
rename from apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans-Regular.ttf
rename to apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans.ttf
diff --git a/apps/native/app/assets/fonts/IBMPlexSans.ttf b/apps/native/app/assets/fonts/IBMPlexSans.ttf
new file mode 100644
index 000000000000..702c637f51ed
Binary files /dev/null and b/apps/native/app/assets/fonts/IBMPlexSans.ttf differ
diff --git a/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj b/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
index 2c9b5ace6acf..b13fc775ca43 100644
--- a/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
+++ b/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
@@ -24,7 +24,7 @@
 		E367D440298DF24D007054A4 /* IBMPlexSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */; };
 		E367D441298DF24D007054A4 /* IBMPlexSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D433298DF24C007054A4 /* IBMPlexSans-Light.ttf */; };
 		E367D442298DF24D007054A4 /* IBMPlexSans-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D434298DF24C007054A4 /* IBMPlexSans-ExtraLight.ttf */; };
-		E367D443298DF24D007054A4 /* IBMPlexSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */; };
+		E367D443298DF24D007054A4 /* IBMPlexSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D435298DF24C007054A4 /* IBMPlexSans.ttf */; };
 		E367D444298DF24D007054A4 /* IBMPlexSans-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */; };
 		E367D445298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */; };
 		E367D446298DF24D007054A4 /* IBMPlexSans-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */; };
@@ -48,7 +48,7 @@
 		5BD3F84B09D28615BB8D415C /* Pods-IslandApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IslandApp.release.xcconfig"; path = "Target Support Files/Pods-IslandApp/Pods-IslandApp.release.xcconfig"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = IslandApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		8DCA6BB3F9BC0A645D723048 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-IslandApp/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
-		941A2A9F3CFC44F91E0A673C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = IslandApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		941A2A9F3CFC44F91E0A673C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = IslandApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		E367D422298A854E007054A4 /* IslandApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IslandApp-Bridging-Header.h"; sourceTree = "<group>"; };
 		E367D423298A854E007054A4 /* noop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = noop.swift; sourceTree = "<group>"; };
 		E367D425298AB63B007054A4 /* RNIsland.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNIsland.m; sourceTree = "<group>"; };
@@ -63,7 +63,7 @@
 		E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-LightItalic.ttf"; path = "../../assets/fonts/IBMPlexSans-LightItalic.ttf"; sourceTree = "<group>"; };
 		E367D433298DF24C007054A4 /* IBMPlexSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Light.ttf"; path = "../../assets/fonts/IBMPlexSans-Light.ttf"; sourceTree = "<group>"; };
 		E367D434298DF24C007054A4 /* IBMPlexSans-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-ExtraLight.ttf"; path = "../../assets/fonts/IBMPlexSans-ExtraLight.ttf"; sourceTree = "<group>"; };
-		E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Regular.ttf"; path = "../../assets/fonts/IBMPlexSans-Regular.ttf"; sourceTree = "<group>"; };
+		E367D435298DF24C007054A4 /* IBMPlexSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = IBMPlexSans.ttf; path = ../../assets/fonts/IBMPlexSans.ttf; sourceTree = "<group>"; };
 		E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Thin.ttf"; path = "../../assets/fonts/IBMPlexSans-Thin.ttf"; sourceTree = "<group>"; };
 		E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-MediumItalic.ttf"; path = "../../assets/fonts/IBMPlexSans-MediumItalic.ttf"; sourceTree = "<group>"; };
 		E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Medium.ttf"; path = "../../assets/fonts/IBMPlexSans-Medium.ttf"; sourceTree = "<group>"; };
@@ -189,7 +189,7 @@
 				E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */,
 				E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */,
 				E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */,
-				E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */,
+				E367D435298DF24C007054A4 /* IBMPlexSans.ttf */,
 				E367D42F298DF24C007054A4 /* IBMPlexSans-SemiBold.ttf */,
 				E367D42D298DF24C007054A4 /* IBMPlexSans-SemiBoldItalic.ttf */,
 				E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */,
@@ -269,7 +269,7 @@
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				E367D43C298DF24D007054A4 /* IBMPlexSans-BoldItalic.ttf in Resources */,
 				E367D445298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf in Resources */,
-				E367D443298DF24D007054A4 /* IBMPlexSans-Regular.ttf in Resources */,
+				E367D443298DF24D007054A4 /* IBMPlexSans.ttf in Resources */,
 				E367D43E298DF24D007054A4 /* IBMPlexSans-ThinItalic.ttf in Resources */,
 				E367D444298DF24D007054A4 /* IBMPlexSans-Thin.ttf in Resources */,
 				E367D442298DF24D007054A4 /* IBMPlexSans-ExtraLight.ttf in Resources */,
@@ -550,10 +550,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -625,10 +622,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -748,10 +742,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
diff --git a/apps/native/app/ios/IslandApp/Info.plist b/apps/native/app/ios/IslandApp/Info.plist
index f3036261e8f6..b074b56c5c00 100644
--- a/apps/native/app/ios/IslandApp/Info.plist
+++ b/apps/native/app/ios/IslandApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/apps/native/app/ios/Podfile.lock b/apps/native/app/ios/Podfile.lock
index 0030bde88e0c..d751cd655a22 100644
--- a/apps/native/app/ios/Podfile.lock
+++ b/apps/native/app/ios/Podfile.lock
@@ -1175,6 +1175,8 @@ PODS:
     - React-Core
   - react-native-cookies (6.2.1):
     - React-Core
+  - react-native-date-picker (5.0.4):
+    - React-Core
   - react-native-mmkv-storage (0.9.1):
     - MMKV (= 1.2.13)
     - React-Core
@@ -1620,6 +1622,7 @@ DEPENDENCIES:
   - react-native-app-auth (from `../node_modules/react-native-app-auth`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-cookies (from `../node_modules/@react-native-cookies/cookies`)"
+  - react-native-date-picker (from `../node_modules/react-native-date-picker`)
   - react-native-mmkv-storage (from `../node_modules/react-native-mmkv-storage`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-passkey (from `../node_modules/react-native-passkey`)
@@ -1800,6 +1803,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-blob-util"
   react-native-cookies:
     :path: "../node_modules/@react-native-cookies/cookies"
+  react-native-date-picker:
+    :path: "../node_modules/react-native-date-picker"
   react-native-mmkv-storage:
     :path: "../node_modules/react-native-mmkv-storage"
   react-native-netinfo:
@@ -1978,6 +1983,7 @@ SPEC CHECKSUMS:
   react-native-app-auth: 63fa4e58c5bd29aeb974d3a06a23c5858322d533
   react-native-blob-util: 18b510205c080a453574a7d2344d64673d0ad9af
   react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
+  react-native-date-picker: 6891317e850deae5b53d51355226e07a495aba61
   react-native-mmkv-storage: cfb6854594cfdc5f7383a9e464bb025417d1721c
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
   react-native-passkey: 29ff814a83dfd4311478498e71a801dce68043ac
diff --git a/apps/native/app/package.json b/apps/native/app/package.json
index 71f77cbd3b46..b1604aa07f38 100644
--- a/apps/native/app/package.json
+++ b/apps/native/app/package.json
@@ -68,6 +68,7 @@
     "react-native-app-auth": "7.2.0",
     "react-native-blob-util": "0.19.9",
     "react-native-code-push": "8.2.2",
+    "react-native-date-picker": "5.0.4",
     "react-native-device-info": "10.3.0",
     "react-native-dialogs": "1.1.2",
     "react-native-gesture-handler": "2.17.1",
diff --git a/apps/native/app/src/graphql/queries/inbox.graphql b/apps/native/app/src/graphql/queries/inbox.graphql
index 2ecdf2458686..ac0fe35c5927 100644
--- a/apps/native/app/src/graphql/queries/inbox.graphql
+++ b/apps/native/app/src/graphql/queries/inbox.graphql
@@ -22,6 +22,17 @@ query ListDocuments($input: DocumentsV2DocumentsInput!) {
   }
 }
 
+query GetDocumentsCategoriesAndSenders {
+  getDocumentCategories {
+    id
+    name
+  }
+  getDocumentSenders {
+    id
+    name
+  }
+}
+
 query GetDocument($input: DocumentInput!) {
   documentV2(input: $input) {
     ...ListDocument
diff --git a/apps/native/app/src/messages/en.ts b/apps/native/app/src/messages/en.ts
index 5dfabc036a6e..389df9de9346 100644
--- a/apps/native/app/src/messages/en.ts
+++ b/apps/native/app/src/messages/en.ts
@@ -195,10 +195,7 @@ export const en: TranslatedMessages = {
   'inbox.emptyListTitle': 'There are currently no documents',
   'inbox.emptyListDescription':
     'When you receive electronic documents from the government, they will appear here.',
-  'inbox.filterButtonTitle': 'Filter',
-  'inbox.filterOpenedTagTitle': 'Unread',
-  'inbox.filterArchivedTagTitle': 'Archived',
-  'inbox.filterStarredTagTitle': 'Starred',
+
   'inbox.markAllAsReadPromptTitle': 'Do you want to mark all as read?',
   'inbox.markAllAsReadPromptDescription': 'This action cannot be undone',
   'inbox.markAllAsReadPromptCancel': 'Cancel',
@@ -211,6 +208,20 @@ export const en: TranslatedMessages = {
   'inboxFilters.unreadOnly': 'Show only unread',
   'inboxFilters.starred': 'Starred',
   'inboxFilters.archived': 'Archived',
+  'inbox.filterButtonTitle': 'Filter',
+  'inbox.filterOpenedTagTitle': 'Unread',
+  'inbox.filterArchivedTagTitle': 'Archived',
+  'inbox.filterStarredTagTitle': 'Starred',
+  'inbox.filterOrganizationTitle': 'Organization',
+  'inbox.filterCategoryTitle': 'Category',
+  'inbox.filterDatesTitle': 'Dates',
+  'inbox.filterClearButton': 'Clear',
+  'inbox.filterApplyButton': 'Apply filters',
+  'inbox.filterDateFromLabel': 'Date from',
+  'inbox.filterDateToLabel': 'Date to',
+  'inbox.filterDatePlaceholder': 'Choose a date',
+  'inbox.filterDateConfirm': 'Confirm',
+  'inbox.filterDateCancel': 'Cancel',
 
   // document detail
   'documentDetail.screenTitle': 'Document',
diff --git a/apps/native/app/src/messages/is.ts b/apps/native/app/src/messages/is.ts
index 5deb9f43a606..502f6f0ebc57 100644
--- a/apps/native/app/src/messages/is.ts
+++ b/apps/native/app/src/messages/is.ts
@@ -180,7 +180,7 @@ export const is = {
   'home.onboardingModule.card4':
     'Notendum er bent á að kynna sér stefnu Stafræns Íslands um meðferð persónuupplýsinga á',
   'home.vehicleModule.summary':
-    'Skrá kílómetrastöðu  rafmagns- og tengiltvinnbíla',
+    'Skrá kílómetrastöðu rafmagns- og tengiltvinnbíla',
   'home.vehicleModule.button': 'Mín ökutæki',
   'button.seeAll': 'Sjá allt',
 
@@ -195,10 +195,6 @@ export const is = {
   'inbox.emptyListTitle': 'Hér eru engin skjöl sem stendur',
   'inbox.emptyListDescription':
     'Þegar þú færð send rafræn skjöl frá hinu opinbera birtast þau hér.',
-  'inbox.filterButtonTitle': 'Sía',
-  'inbox.filterOpenedTagTitle': 'Ólesið',
-  'inbox.filterArchivedTagTitle': 'Geymsla',
-  'inbox.filterStarredTagTitle': 'Stjörnumerkt',
   'inbox.markAllAsReadPromptTitle': 'Viltu merkja öll skjöl sem lesin?',
   'inbox.markAllAsReadPromptDescription': 'Þessi aðgerð er ekki afturkræf',
   'inbox.markAllAsReadPromptCancel': 'Hætta við',
@@ -211,6 +207,20 @@ export const is = {
   'inboxFilters.unreadOnly': 'Sýna einungis ólesið',
   'inboxFilters.starred': 'Stjörnumerkt',
   'inboxFilters.archived': 'Geymsla',
+  'inbox.filterButtonTitle': 'Sía',
+  'inbox.filterOpenedTagTitle': 'Ólesið',
+  'inbox.filterArchivedTagTitle': 'Geymsla',
+  'inbox.filterStarredTagTitle': 'Stjörnumerkt',
+  'inbox.filterOrganizationTitle': 'Stofnun',
+  'inbox.filterCategoryTitle': 'Flokkur',
+  'inbox.filterDatesTitle': 'Dagsetningar',
+  'inbox.filterClearButton': 'Hreinsa',
+  'inbox.filterApplyButton': 'Sjá valið',
+  'inbox.filterDateFromLabel': 'Dagsetning frá',
+  'inbox.filterDateToLabel': 'Dagsetning til',
+  'inbox.filterDatePlaceholder': 'Veldu dagsetningu',
+  'inbox.filterDateConfirm': 'Staðfesta',
+  'inbox.filterDateCancel': 'Hætta við',
 
   // document detail
   'documentDetail.screenTitle': 'Skjal',
diff --git a/apps/native/app/src/screens/applications/applications.tsx b/apps/native/app/src/screens/applications/applications.tsx
index 38e4b763c8a7..c4cca3365bcc 100644
--- a/apps/native/app/src/screens/applications/applications.tsx
+++ b/apps/native/app/src/screens/applications/applications.tsx
@@ -25,7 +25,6 @@ import { useConnectivityIndicator } from '../../hooks/use-connectivity-indicator
 import { useBrowser } from '../../lib/use-browser'
 import { getApplicationOverviewUrl } from '../../utils/applications-utils'
 import { testIDs } from '../../utils/test-ids'
-import { getRightButtons } from '../../utils/get-main-root'
 import { ApplicationsModule } from '../home/applications-module'
 import { isIos } from '../../utils/devices'
 
@@ -43,7 +42,6 @@ const { useNavigationOptions, getNavigationOptions } =
         searchBar: {
           visible: false,
         },
-        rightButtons: initialized ? getRightButtons({ theme } as any) : [],
       },
       bottomTab: {
         iconColor: theme.color.blue400,
@@ -100,7 +98,6 @@ export const ApplicationsScreen: NavigationFunctionComponent = ({
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons(),
     refetching,
     queryResult: [applicationsRes, res],
   })
diff --git a/apps/native/app/src/screens/document-detail/document-detail.tsx b/apps/native/app/src/screens/document-detail/document-detail.tsx
index 945d72efbd9f..709b06934fa6 100644
--- a/apps/native/app/src/screens/document-detail/document-detail.tsx
+++ b/apps/native/app/src/screens/document-detail/document-detail.tsx
@@ -15,7 +15,7 @@ import {
 import Pdf, { Source } from 'react-native-pdf'
 import Share from 'react-native-share'
 import WebView from 'react-native-webview'
-import styled from 'styled-components/native'
+import styled, { useTheme } from 'styled-components/native'
 import {
   DocumentV2,
   ListDocumentFragmentDoc,
@@ -45,8 +45,45 @@ const PdfWrapper = styled.View`
   flex: 1;
   background-color: ${dynamicColor('background')};
 `
+const regexForBr = /<br \/>*\\?>/g
 
-function getRightButtons({
+// Styles for html documents
+const useHtmlStyles = () => {
+  const theme = useTheme()
+  return `<style>
+    body {
+      font-family: "IBM Plex Sans", San Francisco, Segoe UI, sans-serif;
+      margin: ${theme.spacing[3]}px;
+    }
+    h1 {
+      color: ${theme.color.text};
+      font-size: 32px;
+      line-height: 38px;
+    }
+    h2 {
+      color: ${theme.color.text};
+      font-size: 26px;
+      line-height: 32px;
+    }
+    h3 {
+      color: ${theme.color.text};
+      font-size: 20px;
+      line-height: 26px;
+    }
+    p {
+      color: ${theme.color.text};
+      font-size: 16px;
+      line-height: 24px;
+    }
+    a {
+      color: ${theme.color.blue400};
+      text-decoration: none;
+    }
+    </style>
+    <meta name="viewport" content="width=device-width">`
+}
+
+function getRightButtonsForDocumentDetail({
   archived,
   bookmarked,
 }: {
@@ -105,7 +142,7 @@ const { useNavigationOptions, getNavigationOptions } =
       },
       topBar: {
         noBorder: true,
-        rightButtons: getRightButtons(),
+        rightButtons: getRightButtonsForDocumentDetail(),
       },
     },
   )
@@ -168,6 +205,7 @@ export const DocumentDetailScreen: NavigationFunctionComponent<{
 
   const client = useApolloClient()
   const intl = useIntl()
+  const htmlStyles = useHtmlStyles()
   const { getOrganizationLogoUrl } = useOrganizationsStore()
   const [accessToken, setAccessToken] = useState<string>()
   const [error, setError] = useState(false)
@@ -212,7 +250,7 @@ export const DocumentDetailScreen: NavigationFunctionComponent<{
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons({
+    rightButtons: getRightButtonsForDocumentDetail({
       archived: doc.data?.archived ?? false,
       bookmarked: doc.data?.bookmarked ?? false,
     }),
@@ -274,7 +312,7 @@ export const DocumentDetailScreen: NavigationFunctionComponent<{
         },
       },
     })
-  }, [Document.id, Document.opened])
+  }, [Document.id])
 
   useEffect(() => {
     const { authorizeResult, refresh } = authStore.getState()
@@ -335,7 +373,15 @@ export const DocumentDetailScreen: NavigationFunctionComponent<{
             !error &&
             (isHtml ? (
               <WebView
-                source={{ html: Document.content?.value ?? '' }}
+                source={{
+                  html:
+                    // Removing all <br /> tags to fix a bug in react-native that renders <br /> with too much vertical space
+                    // https://github.com/facebook/react-native/issues/32062
+                    `${htmlStyles}${Document.content?.value.replaceAll(
+                      regexForBr,
+                      '',
+                    )}` ?? '',
+                }}
                 scalesPageToFit
                 onLoadEnd={() => {
                   setLoaded(true)
diff --git a/apps/native/app/src/screens/home/home.tsx b/apps/native/app/src/screens/home/home.tsx
index 0b8a43b7a8a5..40fa0f020189 100644
--- a/apps/native/app/src/screens/home/home.tsx
+++ b/apps/native/app/src/screens/home/home.tsx
@@ -49,7 +49,9 @@ const { useNavigationOptions, getNavigationOptions } =
   createNavigationOptionHooks(
     (theme, intl, initialized) => ({
       topBar: {
-        rightButtons: initialized ? getRightButtons({ theme } as any) : [],
+        rightButtons: initialized
+          ? getRightButtons({ icons: ['notifications'], theme: theme as any })
+          : [],
       },
       bottomTab: {
         ...({
@@ -108,7 +110,7 @@ export const MainHomeScreen: NavigationFunctionComponent = ({
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons(),
+    rightButtons: getRightButtons({ icons: ['notifications'] }),
     queryResult: applicationsRes,
     refetching,
   })
diff --git a/apps/native/app/src/screens/inbox/inbox-filter.tsx b/apps/native/app/src/screens/inbox/inbox-filter.tsx
index cf921abd1432..121def2ffdd8 100644
--- a/apps/native/app/src/screens/inbox/inbox-filter.tsx
+++ b/apps/native/app/src/screens/inbox/inbox-filter.tsx
@@ -1,12 +1,33 @@
-import { TableViewCell, theme } from '@ui'
+import {
+  Accordion,
+  AccordionItem,
+  Button,
+  Checkbox,
+  DatePickerInput,
+  theme,
+} from '@ui'
 import { useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
-import { Platform, ScrollView, Switch } from 'react-native'
+import { ScrollView, View } from 'react-native'
 import { Navigation } from 'react-native-navigation'
-import { PressableHighlight } from '../../components/pressable-highlight/pressable-highlight'
 import { createNavigationOptionHooks } from '../../hooks/create-navigation-option-hooks'
 import { useConnectivityIndicator } from '../../hooks/use-connectivity-indicator'
-import { ComponentRegistry } from '../../utils/component-registry'
+import {
+  ButtonRegistry,
+  ComponentRegistry,
+} from '../../utils/component-registry'
+import {
+  DocumentsV2Category,
+  DocumentsV2Sender,
+} from '../../graphql/types/schema'
+import styled from 'styled-components'
+import { useNavigationButtonPress } from 'react-native-navigation-hooks'
+
+const ButtonContainer = styled(View)`
+  margin-left: ${({ theme }) => theme.spacing[2]}px;
+  margin-right: ${({ theme }) => theme.spacing[2]}px;
+  bottom: ${theme.spacing[2]}px;
+`
 
 const { useNavigationOptions, getNavigationOptions } =
   createNavigationOptionHooks((theme, intl) => ({
@@ -16,6 +37,7 @@ const { useNavigationOptions, getNavigationOptions } =
           id: 'inboxFilters.screenTitle',
         }),
       },
+      rightButtons: [],
     },
   }))
 
@@ -23,6 +45,12 @@ export function InboxFilterScreen(props: {
   opened: boolean
   bookmarked: boolean
   archived: boolean
+  availableSenders: DocumentsV2Sender[]
+  availableCategories: DocumentsV2Category[]
+  selectedSenders: string[]
+  selectedCategories: string[]
+  dateFrom?: Date
+  dateTo?: Date
   componentId: string
 }) {
   useConnectivityIndicator({ componentId: props.componentId })
@@ -31,88 +59,208 @@ export function InboxFilterScreen(props: {
   const [opened, setOpened] = useState(props.opened)
   const [bookmarked, setBookmarked] = useState(props.bookmarked)
   const [archived, setArchived] = useState(props.archived)
+  const [selectedSenders, setSelectedSenders] = useState(
+    props.selectedSenders ?? [],
+  )
+  const [selectedCategories, setSelectedCategories] = useState(
+    props.selectedCategories ?? [],
+  )
+  const [dateFrom, setDateFrom] = useState<Date | undefined>(props.dateFrom)
+  const [dateTo, setDateTo] = useState<Date | undefined>(props.dateTo)
+
+  const clearAllFilters = () => {
+    setOpened(false)
+    setBookmarked(false)
+    setArchived(false)
+    setSelectedSenders([])
+    setSelectedCategories([])
+    setDateFrom(undefined)
+    setDateTo(undefined)
+  }
+
+  const isSelected = !!(
+    opened ||
+    bookmarked ||
+    archived ||
+    selectedSenders.length ||
+    selectedCategories.length ||
+    dateFrom ||
+    dateTo
+  )
 
   useNavigationOptions(props.componentId)
 
+  useNavigationButtonPress(({ buttonId }) => {
+    if (buttonId === ButtonRegistry.InboxFilterClearButton) {
+      clearAllFilters()
+    }
+  }, props.componentId)
+
   useEffect(() => {
     Navigation.updateProps(ComponentRegistry.InboxScreen, {
       opened,
       bookmarked,
       archived,
+      senderNationalId: selectedSenders,
+      categoryIds: selectedCategories,
+      dateFrom,
+      dateTo,
     })
-  }, [opened, bookmarked, archived])
+  }, [
+    opened,
+    bookmarked,
+    archived,
+    selectedSenders,
+    selectedCategories,
+    dateFrom,
+    dateTo,
+  ])
+
+  useEffect(() => {
+    Navigation.mergeOptions(props.componentId, {
+      topBar: {
+        rightButtons: isSelected
+          ? [
+              {
+                id: ButtonRegistry.InboxFilterClearButton,
+                text: intl.formatMessage({
+                  id: 'inbox.filterClearButton',
+                }),
+              },
+            ]
+          : [],
+      },
+    })
+  }, [isSelected, props.componentId, intl])
 
   return (
-    <ScrollView style={{ flex: 1 }}>
-      <PressableHighlight
-        onPress={() => {
-          setOpened(!opened)
-        }}
-      >
-        <TableViewCell
-          title={intl.formatMessage({
+    <View
+      style={{
+        flex: 1,
+        marginTop: theme.spacing[3],
+      }}
+    >
+      <ScrollView style={{ flex: 1, marginBottom: theme.spacing[3] }}>
+        <Checkbox
+          label={intl.formatMessage({
             id: 'inboxFilters.unreadOnly',
           })}
-          accessory={
-            <Switch
-              value={opened}
-              onValueChange={() => setOpened(!opened)}
-              thumbColor={Platform.select({ android: theme.color.dark100 })}
-              trackColor={{
-                false: theme.color.dark200,
-                true: theme.color.blue400,
-              }}
-            />
-          }
-          border
+          checked={opened}
+          onPress={() => {
+            setOpened(!opened)
+          }}
         />
-      </PressableHighlight>
-      <PressableHighlight
-        onPress={() => {
-          setBookmarked(!bookmarked)
-        }}
-      >
-        <TableViewCell
-          title={intl.formatMessage({
+        <Checkbox
+          label={intl.formatMessage({
             id: 'inboxFilters.starred',
           })}
-          accessory={
-            <Switch
-              value={bookmarked}
-              onValueChange={() => setBookmarked(!bookmarked)}
-              thumbColor={Platform.select({ android: theme.color.dark100 })}
-              trackColor={{
-                false: theme.color.dark200,
-                true: theme.color.blue400,
-              }}
-            />
-          }
-          border
+          checked={bookmarked}
+          onPress={() => {
+            setBookmarked(!bookmarked)
+          }}
         />
-      </PressableHighlight>
-      <PressableHighlight
-        onPress={() => {
-          setArchived(!archived)
-        }}
-      >
-        <TableViewCell
-          title={intl.formatMessage({
+        <Checkbox
+          label={intl.formatMessage({
             id: 'inboxFilters.archived',
           })}
-          accessory={
-            <Switch
-              value={archived}
-              onValueChange={() => setArchived(!archived)}
-              thumbColor={Platform.select({ android: theme.color.dark100 })}
-              trackColor={{
-                false: theme.color.dark200,
-                true: theme.color.blue400,
-              }}
-            />
-          }
+          checked={archived}
+          onPress={() => {
+            setArchived(!archived)
+          }}
         />
-      </PressableHighlight>
-    </ScrollView>
+        <Accordion>
+          {props.availableSenders?.length ? (
+            <AccordionItem
+              key="organization"
+              title={intl.formatMessage({
+                id: 'inbox.filterOrganizationTitle',
+              })}
+              startOpen={selectedSenders.length > 0}
+            >
+              {props.availableSenders.map(({ name, id }) => {
+                return name && id ? (
+                  <Checkbox
+                    key={id}
+                    label={name}
+                    checked={selectedSenders.includes(id)}
+                    onPress={() => {
+                      if (selectedSenders.includes(id)) {
+                        setSelectedSenders((prev) =>
+                          prev.filter((senderId) => senderId !== id),
+                        )
+                      } else {
+                        setSelectedSenders((prev) => [...prev, id])
+                      }
+                    }}
+                  />
+                ) : null
+              })}
+            </AccordionItem>
+          ) : null}
+          {props.availableCategories?.length ? (
+            <AccordionItem
+              key="category"
+              title={intl.formatMessage({ id: 'inbox.filterCategoryTitle' })}
+              startOpen={selectedCategories.length > 0}
+            >
+              {props.availableCategories.map(({ name, id }) => {
+                return name && id ? (
+                  <Checkbox
+                    key={id}
+                    label={name}
+                    checked={selectedCategories.includes(id)}
+                    onPress={() => {
+                      if (selectedCategories.includes(id)) {
+                        setSelectedCategories((prev) =>
+                          prev.filter((categoryId) => categoryId !== id),
+                        )
+                      } else {
+                        setSelectedCategories((prev) => [...prev, id])
+                      }
+                    }}
+                  />
+                ) : null
+              })}
+            </AccordionItem>
+          ) : null}
+
+          <AccordionItem
+            key="dates"
+            title={intl.formatMessage({ id: 'inbox.filterDatesTitle' })}
+            startOpen={!!dateFrom || !!dateTo}
+          >
+            <DatePickerInput
+              label={intl.formatMessage({ id: 'inbox.filterDateFromLabel' })}
+              placeholder={intl.formatMessage({
+                id: 'inbox.filterDatePlaceholder',
+              })}
+              onSelectDate={setDateFrom}
+              selectedDate={dateFrom}
+            />
+            <DatePickerInput
+              label={intl.formatMessage({ id: 'inbox.filterDateToLabel' })}
+              placeholder={intl.formatMessage({
+                id: 'inbox.filterDatePlaceholder',
+              })}
+              maximumDate={new Date()}
+              minimumDate={dateFrom}
+              onSelectDate={setDateTo}
+              selectedDate={dateTo}
+            />
+          </AccordionItem>
+        </Accordion>
+      </ScrollView>
+      {isSelected && (
+        <ButtonContainer>
+          <Button
+            title={intl.formatMessage({ id: 'inbox.filterApplyButton' })}
+            onPress={() => {
+              Navigation.pop(props.componentId)
+            }}
+          />
+        </ButtonContainer>
+      )}
+    </View>
   )
 }
 
diff --git a/apps/native/app/src/screens/inbox/inbox.tsx b/apps/native/app/src/screens/inbox/inbox.tsx
index 19b2040cd6b0..6b97574ba2cc 100644
--- a/apps/native/app/src/screens/inbox/inbox.tsx
+++ b/apps/native/app/src/screens/inbox/inbox.tsx
@@ -35,6 +35,7 @@ import {
   useMarkAllDocumentsAsReadMutation,
   DocumentV2,
   useListDocumentsQuery,
+  useGetDocumentsCategoriesAndSendersQuery,
 } from '../../graphql/types/schema'
 import { createNavigationOptionHooks } from '../../hooks/create-navigation-option-hooks'
 import { useConnectivityIndicator } from '../../hooks/use-connectivity-indicator'
@@ -42,7 +43,6 @@ import { navigateTo } from '../../lib/deep-linking'
 import { useOrganizationsStore } from '../../stores/organizations-store'
 import { useUiStore } from '../../stores/ui-store'
 import { ComponentRegistry } from '../../utils/component-registry'
-import { getRightButtons } from '../../utils/get-main-root'
 import { testIDs } from '../../utils/test-ids'
 import { isAndroid } from '../../utils/devices'
 import { useApolloClient } from '@apollo/client'
@@ -73,6 +73,7 @@ const TagsWrapper = styled.View`
   margin-top: -4px;
   flex-direction: row;
   gap: ${({ theme }) => theme.spacing[2]}px;
+  flex-wrap: wrap;
 `
 
 const { useNavigationOptions, getNavigationOptions } =
@@ -82,7 +83,6 @@ const { useNavigationOptions, getNavigationOptions } =
         title: {
           text: intl.formatMessage({ id: 'inbox.screenTitle' }),
         },
-        rightButtons: initialized ? getRightButtons({ theme } as any) : [],
       },
       bottomTab: {
         iconColor: theme.color.blue400,
@@ -154,6 +154,10 @@ type Filters = {
   archived?: boolean
   bookmarked?: boolean
   subjectContains?: string
+  senderNationalId?: string[]
+  categoryIds?: string[]
+  dateFrom?: Date
+  dateTo?: Date
 }
 
 function applyFilters(filters?: Filters) {
@@ -162,6 +166,10 @@ function applyFilters(filters?: Filters) {
     bookmarked: filters?.bookmarked ? true : undefined,
     opened: filters?.opened ? false : undefined,
     subjectContains: filters?.subjectContains ?? '',
+    senderNationalId: filters?.senderNationalId ?? [],
+    categoryIds: filters?.categoryIds ?? [],
+    dateFrom: filters?.dateFrom,
+    dateTo: filters?.dateTo,
   }
 }
 
@@ -169,26 +177,42 @@ export const InboxScreen: NavigationFunctionComponent<{
   opened?: boolean
   archived?: boolean
   bookmarked?: boolean
+  senderNationalId?: string[]
+  categoryIds?: string[]
+  dateFrom?: Date
+  dateTo?: Date
 }> = ({
   componentId,
   opened = false,
   archived = false,
   bookmarked = false,
+  senderNationalId = [],
+  categoryIds = [],
+  dateFrom = undefined,
+  dateTo = undefined,
 }) => {
   useNavigationOptions(componentId)
   const ui = useUiStore()
   const intl = useIntl()
+  const theme = useTheme()
   const scrollY = useRef(new Animated.Value(0)).current
   const flatListRef = useRef<FlatList>(null)
   const client = useApolloClient()
   const [query, setQuery] = useState('')
   const [loadingMore, setLoadingMore] = useState(false)
   const queryString = useThrottleState(query)
-  const theme = useTheme()
   const [hiddenContent, setHiddenContent] = useState(isIos)
   const [refetching, setRefetching] = useState(false)
   const pageRef = useRef(1)
   const loadingTimeout = useRef<ReturnType<typeof setTimeout>>()
+  const isFilterApplied =
+    opened ||
+    archived ||
+    bookmarked ||
+    senderNationalId.length ||
+    categoryIds.length ||
+    dateFrom ||
+    dateTo
 
   const incomingFilters = useMemo(() => {
     return {
@@ -196,8 +220,21 @@ export const InboxScreen: NavigationFunctionComponent<{
       archived,
       bookmarked,
       subjectContains: queryString,
+      senderNationalId,
+      categoryIds,
+      dateTo,
+      dateFrom,
     }
-  }, [opened, archived, bookmarked, queryString])
+  }, [
+    opened,
+    archived,
+    bookmarked,
+    queryString,
+    senderNationalId,
+    categoryIds,
+    dateFrom,
+    dateTo,
+  ])
 
   const [filters, setFilters] = useState(applyFilters(incomingFilters))
 
@@ -206,10 +243,18 @@ export const InboxScreen: NavigationFunctionComponent<{
       input: {
         pageSize: DEFAULT_PAGE_SIZE,
         ...filters,
+        dateFrom: dateFrom?.toISOString(),
+        dateTo: dateTo?.toISOString(),
       },
     },
   })
 
+  const sendersAndCategories = useGetDocumentsCategoriesAndSendersQuery()
+
+  const availableSenders = sendersAndCategories.data?.getDocumentSenders ?? []
+  const availableCategories =
+    sendersAndCategories.data?.getDocumentCategories ?? []
+
   const [markAllAsRead, { loading: markAllAsReadLoading }] =
     useMarkAllDocumentsAsReadMutation({
       onCompleted: (result) => {
@@ -243,7 +288,6 @@ export const InboxScreen: NavigationFunctionComponent<{
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons(),
     queryResult: res,
     refetching: refetching || markAllAsReadLoading,
   })
@@ -432,7 +476,8 @@ export const InboxScreen: NavigationFunctionComponent<{
     )
   }
 
-  // Fix for a bug in react-native-navigation where the large title is not visible on iOS with bottom tabs https://github.com/wix/react-native-navigation/issues/6717
+  // Fix for a bug in react-native-navigation/react-native where the large title is not visible on iOS with
+  // bottom tabs https://github.com/wix/react-native-navigation/issues/6717
   if (hiddenContent) {
     return null
   }
@@ -484,6 +529,12 @@ export const InboxScreen: NavigationFunctionComponent<{
                     opened,
                     archived,
                     bookmarked,
+                    availableSenders,
+                    availableCategories,
+                    selectedSenders: senderNationalId,
+                    selectedCategories: categoryIds,
+                    dateFrom,
+                    dateTo,
                   })
                 }}
               />
@@ -501,7 +552,7 @@ export const InboxScreen: NavigationFunctionComponent<{
                 onPress={onPressMarkAllAsRead}
               />
             </ListHeaderWrapper>
-            {opened || archived || bookmarked ? (
+            {isFilterApplied ? (
               <TagsWrapper>
                 {opened && (
                   <Tag
@@ -536,6 +587,72 @@ export const InboxScreen: NavigationFunctionComponent<{
                     }
                   />
                 )}
+                {!!senderNationalId.length &&
+                  senderNationalId.map((senderId) => {
+                    const name = availableSenders.find(
+                      (sender) => sender.id === senderId,
+                    )
+                    return (
+                      <Tag
+                        key={senderId}
+                        title={name?.name?.trim() ?? senderId}
+                        closable
+                        onClose={() =>
+                          Navigation.updateProps(componentId, {
+                            senderNationalId: senderNationalId.filter(
+                              (id) => id !== senderId,
+                            ),
+                          })
+                        }
+                      />
+                    )
+                  })}
+                {!!categoryIds.length &&
+                  categoryIds.map((categoryId) => {
+                    const name = availableCategories.find(
+                      (category) => category.id === categoryId,
+                    )
+                    return (
+                      <Tag
+                        key={categoryId}
+                        title={name?.name ?? categoryId}
+                        closable
+                        onClose={() =>
+                          Navigation.updateProps(componentId, {
+                            categoryIds: categoryIds.filter(
+                              (id) => id !== categoryId,
+                            ),
+                          })
+                        }
+                      />
+                    )
+                  })}
+                {dateFrom && (
+                  <Tag
+                    title={`${intl.formatMessage({
+                      id: 'inbox.filterDateFromLabel',
+                    })} - ${intl.formatDate(dateFrom)}`}
+                    closable
+                    onClose={() =>
+                      Navigation.updateProps(componentId, {
+                        dateFrom: undefined,
+                      })
+                    }
+                  />
+                )}
+                {dateTo && (
+                  <Tag
+                    title={`${intl.formatMessage({
+                      id: 'inbox.filterDateToLabel',
+                    })} - ${intl.formatDate(dateTo)}`}
+                    closable
+                    onClose={() =>
+                      Navigation.updateProps(componentId, {
+                        dateTo: undefined,
+                      })
+                    }
+                  />
+                )}
               </TagsWrapper>
             ) : null}
           </>
diff --git a/apps/native/app/src/screens/more/more.tsx b/apps/native/app/src/screens/more/more.tsx
index 1d04d79c6441..5db381cced00 100644
--- a/apps/native/app/src/screens/more/more.tsx
+++ b/apps/native/app/src/screens/more/more.tsx
@@ -7,10 +7,7 @@ import {
   ScrollView,
   TouchableHighlight,
 } from 'react-native'
-import {
-  Navigation,
-  NavigationFunctionComponent,
-} from 'react-native-navigation'
+import { NavigationFunctionComponent } from 'react-native-navigation'
 import { useNavigationComponentDidAppear } from 'react-native-navigation-hooks'
 import styled, { useTheme } from 'styled-components/native'
 import assetsIcon from '../../assets/icons/assets.png'
@@ -44,7 +41,9 @@ const { useNavigationOptions, getNavigationOptions } =
         title: {
           text: intl.formatMessage({ id: 'profile.screenTitle' }),
         },
-        rightButtons: initialized ? getRightButtons({ theme } as any) : [],
+        rightButtons: initialized
+          ? getRightButtons({ icons: ['settings'], theme: theme as any })
+          : [],
       },
       bottomTab: {
         iconColor: theme.color.blue400,
@@ -85,7 +84,7 @@ export const MoreScreen: NavigationFunctionComponent = ({ componentId }) => {
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons(),
+    rightButtons: getRightButtons({ icons: ['settings'] }),
   })
 
   useNavigationComponentDidAppear(() => {
diff --git a/apps/native/app/src/screens/vehicles/vehicles-detail.tsx b/apps/native/app/src/screens/vehicles/vehicles-detail.tsx
index d84d601c5ef6..f98b2c1b7579 100644
--- a/apps/native/app/src/screens/vehicles/vehicles-detail.tsx
+++ b/apps/native/app/src/screens/vehicles/vehicles-detail.tsx
@@ -163,7 +163,7 @@ export const VehicleDetailScreen: NavigationFunctionComponent<{
             <Input
               loading={inputLoading}
               label={intl.formatMessage({ id: 'vehicleDetail.vehicleWeight' })}
-              value={`${technicalInfo?.vehicleWeight} kg`}
+              value={`${technicalInfo?.vehicleWeight ?? ''} kg`}
             />
             {technicalInfo?.totalWeight ? (
               <Input
diff --git a/apps/native/app/src/screens/wallet/wallet.tsx b/apps/native/app/src/screens/wallet/wallet.tsx
index 8f12cf32de5a..063a4fa482be 100644
--- a/apps/native/app/src/screens/wallet/wallet.tsx
+++ b/apps/native/app/src/screens/wallet/wallet.tsx
@@ -33,7 +33,6 @@ import { getRightButtons } from '../../utils/get-main-root'
 import { isDefined } from '../../utils/is-defined'
 import { testIDs } from '../../utils/test-ids'
 import { WalletItem } from './components/wallet-item'
-import { ButtonRegistry } from '../../utils/component-registry'
 
 type FlatListItem =
   | GenericUserLicense
@@ -54,15 +53,12 @@ const { useNavigationOptions, getNavigationOptions } =
         title: {
           text: intl.formatMessage({ id: 'wallet.screenTitle' }),
         },
-        rightButtons: initialized ? getRightButtons({ theme } as any) : [],
-        leftButtons: [
-          {
-            id: ButtonRegistry.ScanLicenseButton,
-            testID: testIDs.TOPBAR_SCAN_LICENSE_BUTTON,
-            icon: require('../../assets/icons/navbar-scan.png'),
-            color: theme.color.blue400,
-          },
-        ],
+        rightButtons: initialized
+          ? getRightButtons({
+              icons: ['licenseScan'],
+              theme: theme as any,
+            })
+          : [],
       },
       bottomTab: {
         iconColor: theme.color.blue400,
@@ -134,7 +130,7 @@ export const WalletScreen: NavigationFunctionComponent = ({ componentId }) => {
 
   useConnectivityIndicator({
     componentId,
-    rightButtons: getRightButtons(),
+    rightButtons: getRightButtons({ icons: ['licenseScan'] }),
     queryResult: [res, resPassport],
     refetching,
   })
diff --git a/apps/native/app/src/stores/auth-store.ts b/apps/native/app/src/stores/auth-store.ts
index 790f93c9a579..3091123afcf8 100644
--- a/apps/native/app/src/stores/auth-store.ts
+++ b/apps/native/app/src/stores/auth-store.ts
@@ -68,31 +68,21 @@ const getAppAuthConfig = () => {
   }
 }
 
-const clearPasskey = async (userNationalId?: string) => {
+const clearPasskey = async () => {
   // Clear passkey if exists
-  const isPasskeyEnabled = await featureFlagClient?.getValueAsync(
-    'isPasskeyEnabled',
-    false,
-    userNationalId ? { identifier: userNationalId } : undefined,
-  )
-  if (isPasskeyEnabled) {
-    preferencesStore.setState({
-      hasCreatedPasskey: false,
-      hasOnboardedPasskeys: false,
-      lastUsedPasskey: 0,
-    })
+  preferencesStore.setState({
+    hasCreatedPasskey: false,
+    hasOnboardedPasskeys: false,
+    lastUsedPasskey: 0,
+  })
 
-    const client = await getApolloClientAsync()
-    try {
-      await client.mutate<
-        DeletePasskeyMutation,
-        DeletePasskeyMutationVariables
-      >({
-        mutation: DeletePasskeyDocument,
-      })
-    } catch (e) {
-      console.error('Failed to delete passkey', e)
-    }
+  const client = await getApolloClientAsync()
+  try {
+    await client.mutate<DeletePasskeyMutation, DeletePasskeyMutationVariables>({
+      mutation: DeletePasskeyDocument,
+    })
+  } catch (e) {
+    console.error('Failed to delete passkey', e)
   }
 }
 
@@ -198,8 +188,7 @@ export const authStore = create<AuthStore>((set, get) => ({
     notificationsStore.getState().reset()
 
     // Clear passkey if exists
-    const userNationalId = get().userInfo?.nationalId
-    await clearPasskey(userNationalId)
+    await clearPasskey()
 
     const appAuthConfig = getAppAuthConfig()
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
diff --git a/apps/native/app/src/stores/notifications-store.ts b/apps/native/app/src/stores/notifications-store.ts
index 361359780179..768a537b1ab6 100644
--- a/apps/native/app/src/stores/notifications-store.ts
+++ b/apps/native/app/src/stores/notifications-store.ts
@@ -46,14 +46,6 @@ interface NotificationsActions {
 
 type NotificationsStore = NotificationsState & NotificationsActions
 
-const rightButtonScreens = [
-  ComponentRegistry.HomeScreen,
-  ComponentRegistry.InboxScreen,
-  ComponentRegistry.WalletScreen,
-  ComponentRegistry.ApplicationsScreen,
-  ComponentRegistry.MoreScreen,
-]
-
 const initialState: NotificationsState = {
   unseenCount: 0,
   pushToken: undefined,
@@ -123,12 +115,13 @@ export const notificationsStore = create<NotificationsStore>(
       updateNavigationUnseenCount(unseenCount: number) {
         set({ unseenCount })
 
-        rightButtonScreens.forEach((componentId) => {
-          Navigation.mergeOptions(componentId, {
-            topBar: {
-              rightButtons: getRightButtons({ unseenCount }),
-            },
-          })
+        Navigation.mergeOptions(ComponentRegistry.HomeScreen, {
+          topBar: {
+            rightButtons: getRightButtons({
+              unseenCount,
+              icons: ['notifications'],
+            }),
+          },
         })
       },
       async checkUnseen() {
diff --git a/apps/native/app/src/ui/assets/icons/calendar.png b/apps/native/app/src/ui/assets/icons/calendar.png
new file mode 100644
index 000000000000..118f965147f8
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/calendar.png differ
diff --git a/apps/native/app/src/ui/assets/icons/calendar@2x.png b/apps/native/app/src/ui/assets/icons/calendar@2x.png
new file mode 100644
index 000000000000..1f236dc5c5cd
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/calendar@2x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/calendar@3x.png b/apps/native/app/src/ui/assets/icons/calendar@3x.png
new file mode 100644
index 000000000000..2ca586ba16db
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/calendar@3x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-checked.png b/apps/native/app/src/ui/assets/icons/checkbox-checked.png
new file mode 100644
index 000000000000..6b88e051ee5a
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-checked.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-checked@2x.png b/apps/native/app/src/ui/assets/icons/checkbox-checked@2x.png
new file mode 100644
index 000000000000..9f817d75e1cf
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-checked@2x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-checked@3x.png b/apps/native/app/src/ui/assets/icons/checkbox-checked@3x.png
new file mode 100644
index 000000000000..d01c500778bf
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-checked@3x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-unchecked.png b/apps/native/app/src/ui/assets/icons/checkbox-unchecked.png
new file mode 100644
index 000000000000..3c38a58c8134
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-unchecked.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-unchecked@2x.png b/apps/native/app/src/ui/assets/icons/checkbox-unchecked@2x.png
new file mode 100644
index 000000000000..54870b3404d5
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-unchecked@2x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/checkbox-unchecked@3x.png b/apps/native/app/src/ui/assets/icons/checkbox-unchecked@3x.png
new file mode 100644
index 000000000000..39d5c9e44d23
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/checkbox-unchecked@3x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/minus.png b/apps/native/app/src/ui/assets/icons/minus.png
new file mode 100644
index 000000000000..d3189652c076
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/minus.png differ
diff --git a/apps/native/app/src/ui/assets/icons/minus@2x.png b/apps/native/app/src/ui/assets/icons/minus@2x.png
new file mode 100644
index 000000000000..3d8fa55f6fa9
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/minus@2x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/minus@3x.png b/apps/native/app/src/ui/assets/icons/minus@3x.png
new file mode 100644
index 000000000000..a3f6dc07d5ad
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/minus@3x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/plus.png b/apps/native/app/src/ui/assets/icons/plus.png
new file mode 100644
index 000000000000..9e448bf14cd2
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/plus.png differ
diff --git a/apps/native/app/src/ui/assets/icons/plus@2x.png b/apps/native/app/src/ui/assets/icons/plus@2x.png
new file mode 100644
index 000000000000..13c2902d39ce
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/plus@2x.png differ
diff --git a/apps/native/app/src/ui/assets/icons/plus@3x.png b/apps/native/app/src/ui/assets/icons/plus@3x.png
new file mode 100644
index 000000000000..fb94619ea451
Binary files /dev/null and b/apps/native/app/src/ui/assets/icons/plus@3x.png differ
diff --git a/apps/native/app/src/ui/index.ts b/apps/native/app/src/ui/index.ts
index a3ccf899d420..a03d29f2c1fd 100644
--- a/apps/native/app/src/ui/index.ts
+++ b/apps/native/app/src/ui/index.ts
@@ -20,6 +20,8 @@ export * from './lib/card/status-card'
 export * from './lib/card/welcome-card'
 export * from './lib/card/link-card'
 export * from './lib/card/inbox-card'
+export * from './lib/checkbox/checkbox'
+export * from './lib/date-picker/date-picker'
 export * from './lib/detail/content'
 export * from './lib/detail/header'
 export * from './lib/empty-state/empty-card'
diff --git a/apps/native/app/src/ui/lib/accordion/accordion-item.tsx b/apps/native/app/src/ui/lib/accordion/accordion-item.tsx
index 48108a4ed108..a2792cdaa45f 100644
--- a/apps/native/app/src/ui/lib/accordion/accordion-item.tsx
+++ b/apps/native/app/src/ui/lib/accordion/accordion-item.tsx
@@ -1,30 +1,20 @@
 import React, { useRef, useState } from 'react'
 import { Animated, Image, LayoutAnimation, Pressable, View } from 'react-native'
-import styled from 'styled-components/native'
-import chevron from '../../assets/icons/chevron-down.png'
-import { dynamicColor, font } from '../../utils'
+import styled, { useTheme } from 'styled-components/native'
+import plus from '../../assets/icons/plus.png'
+import minus from '../../assets/icons/minus.png'
+import { dynamicColor } from '../../utils'
+import { Typography } from '../typography/typography'
 
 const Host = styled.View<{ isOpen: boolean }>`
-  border-radius: ${({ theme }) => theme.border.radius.large};
-  border-width: ${({ theme, isOpen }) =>
-    isOpen ? theme.border.width.xl : theme.border.width.standard}px;
-  border-color: ${dynamicColor(({ theme, isOpen }) => ({
-    light: isOpen ? theme.color.mint400 : theme.color.blue200,
-    dark: isOpen ? theme.color.mint400 : theme.color.blue200,
-  }))};
   background-color: ${dynamicColor('background')};
   overflow: hidden;
-  margin-bottom: ${({ theme }) => theme.spacing[2]}px;
+  margin-bottom: ${({ theme }) => theme.spacing[1]}px;
+  margin-top: ${({ theme }) => theme.spacing[1]}px;
 `
 const Header = styled.Pressable`
-  padding: 10px 16px;
-`
-
-const Title = styled.Text`
-  ${font({
-    fontSize: 16,
-    fontWeight: '600',
-  })}
+  padding-vertical: ${({ theme }) => theme.spacing[1]}px;
+  padding-horizontal: ${({ theme }) => theme.spacing[2]}px;
 `
 
 const Icon = styled(Animated.View)`
@@ -33,19 +23,21 @@ const Icon = styled(Animated.View)`
   margin-right: ${({ theme }) => theme.spacing[1]}px;
 `
 
-const Chevron = styled(Animated.View)`
-  height: 25px;
-  width: 25px;
+const PlusMinus = styled(Animated.View)`
+  height: ${({ theme }) => theme.spacing[3]}px;
+  width: ${({ theme }) => theme.spacing[3]}px;
+  background-color: ${({ theme }) => theme.color.blue100};
+  border-radius: ${({ theme }) => theme.border.radius.circle};
+  justify-content: center;
+  align-items: center;
 `
 
-const Content = styled.View`
-  border-top-width: ${({ theme }) => theme.border.width.standard}px;
-  border-top-color: ${({ theme }) => theme.color.blue200};
-`
+const Content = styled.View``
 
 interface AccordionItemProps {
   children: React.ReactNode
   title: string
+  startOpen?: boolean
   icon?: React.ReactNode
 }
 
@@ -63,8 +55,15 @@ const toggleAnimation = {
   },
 }
 
-export function AccordionItem({ children, title, icon }: AccordionItemProps) {
-  const [isOpen, setIsOpen] = useState(false)
+export function AccordionItem({
+  children,
+  title,
+  icon,
+  startOpen = false,
+}: AccordionItemProps) {
+  const theme = useTheme()
+  const [isOpen, setIsOpen] = useState(startOpen)
+  const [shouldStartOpen, setStartOpen] = useState(startOpen)
   const animationController = useRef(new Animated.Value(0)).current
 
   const toggleListItem = () => {
@@ -75,6 +74,9 @@ export function AccordionItem({ children, title, icon }: AccordionItemProps) {
     }
     Animated.timing(animationController, config).start()
     LayoutAnimation.configureNext(toggleAnimation)
+    if (startOpen && isOpen) {
+      setStartOpen(false)
+    }
     setIsOpen(!isOpen)
   }
 
@@ -91,16 +93,25 @@ export function AccordionItem({ children, title, icon }: AccordionItemProps) {
           style={{
             flexDirection: 'row',
             justifyContent: 'space-between',
-            margin: isOpen ? -2 : 0,
+            margin: 0,
           }}
         >
           <View style={{ flexDirection: 'row', alignItems: 'center' }}>
             {icon && <Icon>{icon}</Icon>}
-            <Title>{title}</Title>
+            <Typography variant="heading5">{title}</Typography>
           </View>
-          <Chevron style={{ transform: [{ rotate: arrowTransform }] }}>
-            <Image source={chevron} style={{ width: 24, height: 24 }} />
-          </Chevron>
+          <PlusMinus
+            style={{
+              // If accordion should start open, don't transform the icon since then
+              // the minus will be displayed transformed to -90deg
+              transform: shouldStartOpen ? [] : [{ rotate: arrowTransform }],
+            }}
+          >
+            <Image
+              source={isOpen ? minus : plus}
+              style={{ width: theme.spacing[2], height: theme.spacing[2] }}
+            />
+          </PlusMinus>
         </Pressable>
       </Header>
       {isOpen && <Content>{children}</Content>}
diff --git a/apps/native/app/src/ui/lib/checkbox/checkbox.tsx b/apps/native/app/src/ui/lib/checkbox/checkbox.tsx
new file mode 100644
index 000000000000..763983b57df2
--- /dev/null
+++ b/apps/native/app/src/ui/lib/checkbox/checkbox.tsx
@@ -0,0 +1,41 @@
+import React from 'react'
+import styled from 'styled-components/native'
+import { Image } from 'react-native'
+
+import checkedIcon from '../../assets/icons/checkbox-checked.png'
+import uncheckedIcon from '../../assets/icons/checkbox-unchecked.png'
+import { dynamicColor } from '../../utils'
+import { Typography } from '../typography/typography'
+
+const Host = styled.Pressable`
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding-vertical: ${({ theme }) => theme.spacing[2]}px;
+  margin-horizontal: ${({ theme }) => theme.spacing[2]}px;
+  border-bottom-width: ${({ theme }) => theme.border.width.standard}px;
+  border-bottom-color: ${dynamicColor(
+    ({ theme }) => ({
+      light: theme.color.blue200,
+      dark: theme.shades.dark.shade300,
+    }),
+    true,
+  )};
+`
+
+interface CheckboxProps {
+  label: string
+  checked: boolean
+  onPress: () => void
+}
+
+export const Checkbox = ({ label, checked, onPress }: CheckboxProps) => {
+  return (
+    <Host onPress={onPress} accessibilityRole="checkbox" accessible>
+      <Typography style={{ fontWeight: checked ? '600' : '400' }}>
+        {label}
+      </Typography>
+      <Image source={checked ? checkedIcon : uncheckedIcon} />
+    </Host>
+  )
+}
diff --git a/apps/native/app/src/ui/lib/date-picker/date-picker.tsx b/apps/native/app/src/ui/lib/date-picker/date-picker.tsx
new file mode 100644
index 000000000000..d31868bd922f
--- /dev/null
+++ b/apps/native/app/src/ui/lib/date-picker/date-picker.tsx
@@ -0,0 +1,110 @@
+import React, { useEffect, useState } from 'react'
+import styled from 'styled-components/native'
+import DatePicker from 'react-native-date-picker'
+
+import calendarIcon from '../../assets/icons/calendar.png'
+import { Typography } from '../typography/typography'
+import { dynamicColor } from '@ui/utils/dynamic-color'
+import { useIntl } from 'react-intl'
+import { View, Image } from 'react-native'
+
+const Host = styled.View`
+  padding-vertical: ${({ theme }) => theme.spacing[1]}px;
+  margin-horizontal: ${({ theme }) => theme.spacing[2]}px;
+`
+
+const DateInput = styled.Pressable`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: ${({ theme }) => theme.spacing[1]}px;
+  padding-right: ${({ theme }) => theme.spacing[2]}px;
+  border-radius: ${({ theme }) => theme.border.radius.large};
+  border-width: 1px;
+  border-style: solid;
+  border-color: ${dynamicColor(
+    (props) => ({
+      dark: 'shade500',
+      light: props.theme.color.blue200,
+    }),
+    true,
+  )};
+  background-color: ${dynamicColor((props) => ({
+    dark: 'shade300',
+    light: props.theme.color.blue100,
+  }))};
+`
+
+const Label = styled(Typography)`
+  color: ${dynamicColor((props) => ({
+    dark: 'foreground',
+    light: props.theme.color.blue400,
+  }))};
+  margin-bottom: ${({ theme }) => theme.spacing.smallGutter}px;
+`
+
+const DateSelected = styled(Typography)<{ empty: boolean }>`
+  padding-left: ${({ theme }) => theme.spacing[1]}px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  font-weight: ${({ empty }) => (empty ? 400 : 600)};
+`
+
+interface DatePickerProps {
+  label: string
+  placeholder?: string
+  minimumDate?: Date
+  maximumDate?: Date
+  selectedDate?: Date
+  onSelectDate?: (date: Date) => void
+}
+
+export const DatePickerInput = ({
+  label,
+  placeholder,
+  maximumDate,
+  minimumDate,
+  onSelectDate,
+  selectedDate,
+}: DatePickerProps) => {
+  const intl = useIntl()
+  const [date, setDate] = useState(selectedDate)
+  const [openDatePicker, setOpenDatePicker] = useState(false)
+
+  useEffect(() => {
+    setDate(selectedDate)
+  }, [selectedDate])
+
+  return (
+    <Host>
+      <DateInput onPress={() => setOpenDatePicker(true)}>
+        <View>
+          <Label variant="eyebrow">{label}</Label>
+          <DateSelected empty={!date}>
+            {!date ? placeholder ?? '' : intl.formatDate(date)}
+          </DateSelected>
+        </View>
+        <Image source={calendarIcon} />
+      </DateInput>
+      <DatePicker
+        mode="date"
+        title={null}
+        maximumDate={maximumDate}
+        minimumDate={minimumDate}
+        modal
+        open={openDatePicker}
+        date={date ?? new Date()}
+        confirmText={intl.formatMessage({ id: 'inbox.filterDateConfirm' })}
+        cancelText={intl.formatMessage({ id: 'inbox.filterDateCancel' })}
+        onConfirm={(date) => {
+          setOpenDatePicker(false)
+          setDate(date)
+          onSelectDate?.(date)
+        }}
+        onCancel={() => {
+          setOpenDatePicker(false)
+        }}
+      />
+    </Host>
+  )
+}
diff --git a/apps/native/app/src/ui/lib/text-field/text-field.tsx b/apps/native/app/src/ui/lib/text-field/text-field.tsx
index 16ff58f518d5..48e3ae8c0ea5 100644
--- a/apps/native/app/src/ui/lib/text-field/text-field.tsx
+++ b/apps/native/app/src/ui/lib/text-field/text-field.tsx
@@ -2,6 +2,7 @@ import React, { useRef } from 'react'
 import { TextInput, TextInputProps } from 'react-native'
 import styled from 'styled-components/native'
 import { dynamicColor, font } from '../../utils'
+import { Typography } from '../typography/typography'
 
 const Host = styled.Pressable`
   padding: ${({ theme }) => theme.spacing[1]}px;
@@ -21,28 +22,23 @@ const Host = styled.Pressable`
   }))};
 `
 
-const Label = styled.Text`
-  ${font({
-    fontSize: 12,
-    lineHeight: 16,
-    fontWeight: '600',
-  })}
-
+const Label = styled(Typography)`
   color: ${dynamicColor((props) => ({
     dark: 'foreground',
     light: props.theme.color.blue400,
   }))};
-  margin-bottom: 4px;
+  margin-bottom: ${({ theme }) => theme.spacing.smallGutter}px;
 `
 
-const Input = styled(TextInput)`
+const Input = styled.TextInput<{ value: string }>`
   padding-left: ${({ theme }) => theme.spacing[1]}px;
   padding-top: 0px;
   padding-bottom: 0px;
+
   ${font({
     fontSize: 16,
     lineHeight: 20,
-    fontWeight: '600',
+    fontWeight: ({ value }) => (value === '' ? 400 : 600),
   })}
 `
 
@@ -65,7 +61,7 @@ export const TextField = ({
 
   return (
     <Host onPress={() => inputRef.current?.focus()} style={style}>
-      <Label>{label}</Label>
+      <Label variant="eyebrow">{label}</Label>
       <Input onChangeText={onChange} value={value} ref={inputRef} {...rest} />
     </Host>
   )
diff --git a/apps/native/app/src/utils/component-registry.ts b/apps/native/app/src/utils/component-registry.ts
index 3712e5e9e1be..f48cf6125a04 100644
--- a/apps/native/app/src/utils/component-registry.ts
+++ b/apps/native/app/src/utils/component-registry.ts
@@ -64,6 +64,7 @@ export const ButtonRegistry = {
   ScanLicenseDoneButton: `${prefix}.button.ScanLicenseDoneButton`,
   DocumentStarButton: `${prefix}.button.DocumentStarButton`,
   DocumentArchiveButton: `${prefix}.button.DocumentArchiveButton`,
+  InboxFilterClearButton: `${prefix}.button.InboxFilterClearButton`,
 }
 
 export const StackRegistry = {
diff --git a/apps/native/app/src/utils/get-main-root.ts b/apps/native/app/src/utils/get-main-root.ts
index 50296577a1e5..0d9f21e955da 100644
--- a/apps/native/app/src/utils/get-main-root.ts
+++ b/apps/native/app/src/utils/get-main-root.ts
@@ -10,15 +10,23 @@ import {
 import { getThemeWithPreferences } from './get-theme-with-preferences'
 import { testIDs } from './test-ids'
 
+type Icons = 'notifications' | 'settings' | 'licenseScan'
+
 type RightButtonProps = {
   unseenCount?: number
   theme?: ReturnType<typeof getThemeWithPreferences>
+  icons?: Icons[]
 }
 
 export const getRightButtons = ({
   unseenCount = notificationsStore.getState().unseenCount,
   theme = getThemeWithPreferences(preferencesStore.getState()),
+  icons,
 }: RightButtonProps = {}): OptionsTopBarButton[] => {
+  if (!icons) {
+    return []
+  }
+
   const iconBackground = {
     color: 'transparent',
     cornerRadius: 4,
@@ -26,25 +34,40 @@ export const getRightButtons = ({
     height: theme.spacing[4],
   }
 
-  return [
-    {
-      accessibilityLabel: 'Settings',
-      id: ButtonRegistry.SettingsButton,
-      testID: testIDs.TOPBAR_SETTINGS_BUTTON,
-      icon: require('../assets/icons/settings.png'),
-      iconBackground,
-    },
-    {
-      accessibilityLabel: 'Notifications',
-      id: ButtonRegistry.NotificationsButton,
-      testID: testIDs.TOPBAR_NOTIFICATIONS_BUTTON,
-      icon:
-        unseenCount > 0
-          ? require('../assets/icons/topbar-notifications-bell.png')
-          : require('../assets/icons/topbar-notifications.png'),
-      iconBackground,
-    },
-  ]
+  const rightButtons: OptionsTopBarButton[] = []
+
+  // Note: the first icon in the array will be displayed in top right corner
+  icons.forEach((icon) => {
+    if (icon === 'notifications') {
+      rightButtons.push({
+        accessibilityLabel: 'Notifications',
+        id: ButtonRegistry.NotificationsButton,
+        testID: testIDs.TOPBAR_NOTIFICATIONS_BUTTON,
+        icon:
+          unseenCount > 0
+            ? require('../assets/icons/topbar-notifications-bell.png')
+            : require('../assets/icons/topbar-notifications.png'),
+        iconBackground,
+      })
+    } else if (icon === 'settings') {
+      rightButtons.push({
+        accessibilityLabel: 'Settings',
+        id: ButtonRegistry.SettingsButton,
+        testID: testIDs.TOPBAR_SETTINGS_BUTTON,
+        icon: require('../assets/icons/settings.png'),
+        iconBackground,
+      })
+    } else if (icon === 'licenseScan') {
+      rightButtons.push({
+        id: ButtonRegistry.ScanLicenseButton,
+        testID: testIDs.TOPBAR_SCAN_LICENSE_BUTTON,
+        icon: require('../assets/icons/navbar-scan.png'),
+        color: theme.color.blue400,
+        iconBackground,
+      })
+    }
+  })
+  return rightButtons
 }
 
 /**
diff --git a/apps/service-portal/src/components/Layout/FullWidthLayout.tsx b/apps/service-portal/src/components/Layout/FullWidthLayout.tsx
index d19e25a45935..fccf3c39bd76 100644
--- a/apps/service-portal/src/components/Layout/FullWidthLayout.tsx
+++ b/apps/service-portal/src/components/Layout/FullWidthLayout.tsx
@@ -21,6 +21,7 @@ import { DocumentsPaths } from '@island.is/service-portal/documents'
 import { theme } from '@island.is/island-ui/theme'
 import { useAuth } from '@island.is/auth/react'
 import { DocumentsScope } from '@island.is/auth/scopes'
+import { FinancePaths } from '@island.is/service-portal/finance'
 
 interface FullWidthLayoutWrapperProps {
   activeParent?: PortalNavigationItem
@@ -31,6 +32,7 @@ interface FullWidthLayoutWrapperProps {
 type FullWidthLayoutProps = {
   isDashboard: boolean
   isDocuments: boolean
+  isFinance: boolean
 } & FullWidthLayoutWrapperProps
 
 export const FullWidthLayout: FC<FullWidthLayoutProps> = ({
@@ -40,6 +42,7 @@ export const FullWidthLayout: FC<FullWidthLayoutProps> = ({
   children,
   isDashboard,
   isDocuments,
+  isFinance,
 }) => {
   const navigate = useNavigate()
   const { formatMessage } = useLocale()
@@ -65,7 +68,9 @@ export const FullWidthLayout: FC<FullWidthLayoutProps> = ({
           ? styles.fullWidthSplit
           : undefined
       }
-      paddingTop={isDocuments || isDashboard ? undefined : 9}
+      paddingTop={
+        isDocuments || isDashboard ? undefined : isFinance ? [0, 0, 9] : 9
+      }
       style={{
         marginTop: height,
         minHeight: `calc(100vh - ${theme.headerHeight.large}px`,
@@ -151,12 +156,17 @@ const FullWidthLayoutWrapper: FC<FullWidthLayoutWrapperProps> = (props) => {
     matchPath(route, props.pathname),
   )
 
+  // Finance does not need extra padding in mobile
+  const isFinance = Object.values(FinancePaths).find((route) =>
+    matchPath(route, props.pathname),
+  )
   const isSpecialView = !!isDashboard || !!isDocuments
 
   return (
     <FullWidthLayout
       isDashboard={!!isDashboard}
       isDocuments={!!isDocuments}
+      isFinance={!!isFinance}
       {...props}
     >
       <ModuleAlertBannerSection paddingTop={isSpecialView ? 0 : 2} />
diff --git a/apps/services/auth/admin-api/src/app/v2/secrets/client-secrets.service.ts b/apps/services/auth/admin-api/src/app/v2/secrets/client-secrets.service.ts
index 0d0e9afb58cb..437d1a3b345c 100644
--- a/apps/services/auth/admin-api/src/app/v2/secrets/client-secrets.service.ts
+++ b/apps/services/auth/admin-api/src/app/v2/secrets/client-secrets.service.ts
@@ -131,7 +131,7 @@ export class ClientSecretsService {
       '0123456789' +
       'abcdefghijklmnopqrstuvwxyz' +
       'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +
-      '.-+!#$%'
+      '.-!#$%'
 
     for (let i = 0; i < length; i++) {
       generatedSecret += validChars[randomInt(0, validChars.length)]
diff --git a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index-test-cases.ts b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index-test-cases.ts
index 27e344502ed4..75b143ce5fd9 100644
--- a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index-test-cases.ts
+++ b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index-test-cases.ts
@@ -85,4 +85,16 @@ export const indexingTestCases: Record<string, TestCase> = {
       expectedFrom: [adult1],
     },
   ),
+  customTwoDomains: new TestCase(
+    createClient({
+      clientId: clientId,
+      supportsCustomDelegation: true,
+      supportedDelegationTypes: [AuthDelegationType.Custom],
+    }),
+    {
+      fromCustom: [adult1],
+      fromCustomOtherDomain: [adult1],
+      expectedFrom: [adult1],
+    },
+  ),
 }
diff --git a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index.service.spec.ts b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index.service.spec.ts
index 784e2025dce6..bd627e8b37be 100644
--- a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index.service.spec.ts
+++ b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegation-index.service.spec.ts
@@ -26,7 +26,13 @@ import { TestApp, truncate } from '@island.is/testing/nest'
 
 import { setupWithAuth } from '../../../../../test/setup'
 import { indexingTestCases, prRight1 } from './delegation-index-test-cases'
-import { domainName, TestCase, user } from './delegations-index-types'
+import {
+  customScopes,
+  customScopesOtherDomain,
+  domainName,
+  TestCase,
+  user,
+} from './delegations-index-types'
 
 const testDate = new Date(2024, 2, 1)
 
@@ -47,7 +53,9 @@ describe('DelegationsIndexService', () => {
 
   const setup = async (testCase: TestCase) => {
     await truncate(sequelize)
-    await factory.createDomain(testCase.domain)
+    await Promise.all(
+      testCase.domains.map((domain) => factory.createDomain(domain)),
+    )
     await factory.createClient(testCase.client)
 
     await Promise.all(
@@ -56,9 +64,10 @@ describe('DelegationsIndexService', () => {
 
     // create custom delegations
     await Promise.all(
-      testCase.customDelegations.map((delegation) =>
-        factory.createCustomDelegation(delegation),
-      ),
+      [
+        ...testCase.customDelegations,
+        ...testCase.customDelegationsOtherDomain,
+      ].map((delegation) => factory.createCustomDelegation(delegation)),
     )
 
     // create personal representation delegations
@@ -77,6 +86,9 @@ describe('DelegationsIndexService', () => {
       active: true,
     })
 
+    await delegationIndexMetaModel.destroy({ where: {} })
+    await delegationIndexModel.destroy({ where: {} })
+
     // mock national registry for ward delegations
     jest
       .spyOn(nationalRegistryApi, 'getCustodyChildren')
@@ -124,7 +136,9 @@ describe('DelegationsIndexService', () => {
 
   describe('indexDelegations', () => {
     describe('delegation index meta logic', () => {
-      beforeAll(async () => setup(indexingTestCases.custom))
+      beforeAll(async () => {
+        await setup(indexingTestCases.custom)
+      })
 
       beforeEach(async () => {
         jest.useFakeTimers()
@@ -195,7 +209,9 @@ describe('DelegationsIndexService', () => {
         const testCase = indexingTestCases[type]
         testCase.user = user
 
-        beforeEach(async () => setup(testCase))
+        beforeEach(async () => {
+          await setup(testCase)
+        })
 
         it('should index delegations', async () => {
           // Act
@@ -216,7 +232,9 @@ describe('DelegationsIndexService', () => {
     describe('Reindex (multiple indexing)', () => {
       const testCase = indexingTestCases.custom
 
-      beforeEach(async () => setup(testCase))
+      beforeEach(async () => {
+        await setup(testCase)
+      })
 
       it('should not duplicate delegations on reindex', async () => {
         // Act
@@ -424,7 +442,9 @@ describe('DelegationsIndexService', () => {
   describe('indexCustomDelegations', () => {
     const testCase = indexingTestCases.custom
 
-    beforeAll(async () => setup(testCase))
+    beforeAll(async () => {
+      await setup(testCase)
+    })
 
     it('should index custom delegations', async () => {
       // Arrange
@@ -451,12 +471,8 @@ describe('DelegationsIndexService', () => {
   describe('indexRepresentativeDelegations', () => {
     const testCase = indexingTestCases.personalRepresentative
 
-    beforeAll(async () => setup(testCase))
-
-    afterEach(async () => {
-      // remove all data
-      await delegationIndexMetaModel.destroy({ where: {} })
-      await delegationIndexModel.destroy({ where: {} })
+    beforeAll(async () => {
+      await setup(testCase)
     })
 
     it('should index personal representation delegations', async () => {
@@ -487,7 +503,9 @@ describe('DelegationsIndexService', () => {
   describe('SubjectId', () => {
     const testCase = indexingTestCases.singleCustomDelegation
 
-    beforeEach(async () => setup(testCase))
+    beforeEach(async () => {
+      await setup(testCase)
+    })
 
     afterEach(async () => {
       // remove all data
@@ -594,4 +612,44 @@ describe('DelegationsIndexService', () => {
       expect(delegations[0].subjectId).toBeDefined()
     })
   })
+
+  describe('mergeCustomDelegations', () => {
+    const testCase = indexingTestCases.customTwoDomains
+
+    beforeAll(async () => {
+      await setup(testCase)
+    })
+
+    it('should merge custom delegations', async () => {
+      // Arrange
+      const nationalId = user.nationalId
+
+      // Act
+      await delegationIndexService.indexCustomDelegations(nationalId)
+
+      // Assert
+      const delegations = await delegationModel.findAll({
+        where: {
+          toNationalId: nationalId,
+        },
+      })
+      const indexedDelegations = await delegationIndexModel.findAll({
+        where: {
+          toNationalId: nationalId,
+        },
+      })
+
+      expect(delegations.length).toEqual(2)
+      expect(indexedDelegations.length).toEqual(1)
+
+      const indexedDelegation = indexedDelegations[0]
+
+      expect(indexedDelegation.fromNationalId).toBe(testCase.expectedFrom[0])
+      expect(indexedDelegation.toNationalId).toBe(user.nationalId)
+      expect(indexedDelegation.customDelegationScopes).toHaveLength(4)
+      expect(indexedDelegation.customDelegationScopes?.sort()).toEqual(
+        [...customScopes, ...customScopesOtherDomain].sort(),
+      )
+    })
+  })
 })
diff --git a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegations-index-types.ts b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegations-index-types.ts
index 6a68f728f0b2..6588d66f7c1f 100644
--- a/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegations-index-types.ts
+++ b/apps/services/auth/delegation-api/src/app/delegations/test/delegation-index/delegations-index-types.ts
@@ -12,6 +12,7 @@ import { createCurrentUser } from '@island.is/testing/fixtures'
 
 export const clientId = '@island.is/webapp'
 export const domainName = '@island.is'
+const otherDomainName = '@other.is/webapp'
 export const user = createCurrentUser({
   nationalIdType: 'person',
   client: clientId,
@@ -20,12 +21,14 @@ export const user = createCurrentUser({
 export const legalGuardianScopes = ['lg1', 'lg2']
 export const procurationHolderScopes = ['ph1', 'ph2']
 export const customScopes = ['cu1', 'cu2']
+export const customScopesOtherDomain = ['cu-od1', 'cu-od2']
 export const representativeScopes = ['pr1', 'pr2']
 
 export interface ITestCaseOptions {
   fromChildren?: string[]
   fromCompanies?: string[]
   fromCustom?: string[]
+  fromCustomOtherDomain?: string[]
   fromRepresentative?: CreatePersonalRepresentativeDelegation[]
   scopes?: string[]
   scopeAccess?: [string, string][]
@@ -35,13 +38,16 @@ export interface ITestCaseOptions {
 
 export class TestCase {
   domainName = domainName
+  otherDomainName = otherDomainName
   user: User
   client: CreateClient
   fromChildren: string[]
   fromCompanies: string[]
   fromCustom: string[]
+  fromCustomOtherDomain: string[]
   fromRepresentative: CreatePersonalRepresentativeDelegation[]
   scopes: string[]
+  scopesOtherDomain: string[]
   scopeAccess: [string, string][]
   expectedFrom: string[]
 
@@ -51,6 +57,7 @@ export class TestCase {
     this.fromChildren = options.fromChildren ?? []
     this.fromCompanies = options.fromCompanies ?? []
     this.fromCustom = options.fromCustom ?? []
+    this.fromCustomOtherDomain = options.fromCustomOtherDomain ?? []
     this.fromRepresentative = options.fromRepresentative ?? []
     this.scopes = options.scopes ?? [
       ...legalGuardianScopes,
@@ -58,20 +65,23 @@ export class TestCase {
       ...customScopes,
       ...representativeScopes,
     ]
+    this.scopesOtherDomain = customScopesOtherDomain
     this.scopeAccess = options.scopeAccess ?? []
     this.expectedFrom = options.expectedFrom
   }
 
-  get domain(): CreateDomain {
-    return { name: this.domainName }
+  get domains(): CreateDomain[] {
+    return [{ name: this.domainName }, { name: this.otherDomainName }]
   }
 
   get apiScopes(): CreateApiScope[] {
-    return this.scopes.map((s) => ({
+    return [...this.scopes, ...this.scopesOtherDomain].map((s) => ({
       name: s,
       description: s,
       displayName: s,
-      domainName: this.domainName,
+      domainName: this.scopesOtherDomain.includes(s)
+        ? this.otherDomainName
+        : this.domainName,
       grantToLegalGuardians: legalGuardianScopes.includes(s),
       grantToProcuringHolders: procurationHolderScopes.includes(s),
       allowExplicitDelegationGrant: customScopes.includes(s),
@@ -93,6 +103,17 @@ export class TestCase {
     }))
   }
 
+  get customDelegationsOtherDomain(): CreateCustomDelegation[] {
+    return this.fromCustomOtherDomain.map((d: string) => ({
+      domainName: this.otherDomainName,
+      toNationalId: this.user.nationalId,
+      fromNationalId: d,
+      scopes: this.scopesOtherDomain.map((s) => ({
+        scopeName: s,
+      })),
+    }))
+  }
+
   get procuration(): GetIndividualRelationships {
     return {
       nationalId: this.user.nationalId,
@@ -123,7 +144,10 @@ export class TestCase {
     if (procurationHolderScopes.includes(scopeName)) {
       result.push(AuthDelegationType.ProcurationHolder)
     }
-    if (customScopes.includes(scopeName)) {
+    if (
+      customScopes.includes(scopeName) ||
+      customScopesOtherDomain.includes(scopeName)
+    ) {
       result.push(AuthDelegationType.Custom)
     }
     if (representativeScopes.includes(scopeName)) {
diff --git a/apps/services/contentful-entry-tagger/src/app/app.repository.ts b/apps/services/contentful-entry-tagger/src/app/app.repository.ts
index 91d2801df805..18b2e53de519 100644
--- a/apps/services/contentful-entry-tagger/src/app/app.repository.ts
+++ b/apps/services/contentful-entry-tagger/src/app/app.repository.ts
@@ -5,6 +5,7 @@ import {
   Entry,
   Link,
   Tag,
+  Team,
 } from 'contentful-management'
 import { ClientAPI } from 'contentful-management/dist/typings/create-contentful-api'
 
@@ -36,11 +37,52 @@ export class AppRepository {
   async getUserSpaceRoles(userId: string) {
     const managementClient = this.getManagementClient()
     const space = await managementClient.getSpace(SPACE_ID)
-    const user = await space.getSpaceMember(userId)
-    const roles = await Promise.all(
-      user.roles.map((roleLink) => space.getRole(roleLink.sys.id)),
-    )
-    return roles
+    try {
+      const user = await space.getSpaceMember(userId)
+      const roles = await Promise.all(
+        user.roles.map((roleLink) => space.getRole(roleLink.sys.id)),
+      )
+      return roles
+    } catch (error) {
+      // In case the user isn't found due to not belonging to a space we assume he has no roles
+      if ((error as { name?: string })?.name === 'NotFound') {
+        return []
+      }
+      throw error
+    }
+  }
+
+  async getUserTeams(userId: string) {
+    const managementClient = this.getManagementClient()
+    const organizations = await managementClient.getOrganizations()
+    const organization = organizations.items[0]
+
+    const teams = await organization.getTeams({
+      limit: 1000,
+    })
+
+    const teamsThatUserBelongsTo: Team[] = []
+
+    for (const team of teams.items) {
+      const memberships = await organization.getTeamMemberships({
+        teamId: team.sys.id,
+        query: {
+          limit: 1000,
+        },
+      })
+      const userBelongsToTeam = memberships.items.some((item) => {
+        const itemUserId = (
+          item.sys as unknown as { user?: { sys?: { id?: string } } }
+        ).user?.sys?.id
+        return itemUserId === userId
+      })
+
+      if (userBelongsToTeam) {
+        teamsThatUserBelongsTo.push(team)
+      }
+    }
+
+    return teamsThatUserBelongsTo
   }
 
   async tagEntry(entry: Asset | Entry, tags: string[]) {
diff --git a/apps/services/contentful-entry-tagger/src/app/app.service.ts b/apps/services/contentful-entry-tagger/src/app/app.service.ts
index 1c281189017d..f143065059bc 100644
--- a/apps/services/contentful-entry-tagger/src/app/app.service.ts
+++ b/apps/services/contentful-entry-tagger/src/app/app.service.ts
@@ -3,10 +3,13 @@ import { LOGGER_PROVIDER } from '@island.is/logging'
 import type { Logger } from '@island.is/logging'
 import { AppRepository } from './app.repository'
 import slugify from '@sindresorhus/slugify'
-import type { Entry } from 'contentful-management'
+import type { Entry, Role, Team } from 'contentful-management'
 
 const TAGGABLE_ENTRY_PREFIX = 'owner-'
 
+const extractTagNamesFromGroup = (group: Role | Team) =>
+  group.name.toLowerCase().startsWith(TAGGABLE_ENTRY_PREFIX)
+
 @Injectable()
 export class AppService {
   constructor(
@@ -15,16 +18,22 @@ export class AppService {
   ) {}
 
   async tagEntry(entry: Entry) {
-    const roles = await this.appRepository.getUserSpaceRoles(
-      entry.sys.createdBy?.sys.id as string,
-    )
+    const userId = entry.sys.createdBy?.sys.id as string
+    const [roles, teams] = await Promise.all([
+      this.appRepository.getUserSpaceRoles(userId),
+      this.appRepository.getUserTeams(userId),
+    ])
 
-    const tags = roles
-      // All roles with the prefix need to have their entries tagged in order to manage user permissions
-      .filter((role) =>
-        role.name.toLowerCase().startsWith(TAGGABLE_ENTRY_PREFIX),
-      )
-      .map((role) => slugify(role.name))
+    const rolesThatMatch = roles.filter(extractTagNamesFromGroup)
+    const teamsThatMatch = teams.filter(extractTagNamesFromGroup)
+
+    let tags: string[] = []
+
+    if (rolesThatMatch.length > 0) {
+      tags = rolesThatMatch.map((role) => slugify(role.name))
+    } else if (teamsThatMatch.length > 0) {
+      tags = teamsThatMatch.map((team) => slugify(team.name))
+    }
 
     if (tags.length === 0) {
       return
diff --git a/apps/services/endorsements/api/infra/endorsement-system-api.ts b/apps/services/endorsements/api/infra/endorsement-system-api.ts
index 33e2dc2ba6ce..865c1d945b8f 100644
--- a/apps/services/endorsements/api/infra/endorsement-system-api.ts
+++ b/apps/services/endorsements/api/infra/endorsement-system-api.ts
@@ -34,6 +34,11 @@ export const serviceSetup =
           prod: 'https://innskra.island.is',
         },
         IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/endorsement',
+        ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME: {
+          dev: 'island-is-dev-exports-endorsement-system',
+          staging: 'island-is-staging-exports-endorsement-system',
+          prod: 'island-is-prod-exports-endorsement-system',
+        },
       })
       .secrets({
         IDENTITY_SERVER_CLIENT_SECRET:
diff --git a/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.module.ts b/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.module.ts
index 0f4e834ebac8..cbabb771e3e1 100644
--- a/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.module.ts
+++ b/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.module.ts
@@ -7,12 +7,14 @@ import { EndorsementList } from '../endorsementList/endorsementList.model'
 import { EndorsementListService } from '../endorsementList/endorsementList.service'
 import { EmailModule } from '@island.is/email-service'
 import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
+import { AwsModule } from '@island.is/nest/aws'
 
 @Module({
   imports: [
     NationalRegistryV3ClientModule,
     SequelizeModule.forFeature([Endorsement, EndorsementList]),
     EmailModule,
+    AwsModule,
   ],
   controllers: [EndorsementController],
   providers: [EndorsementService, EndorsementListService],
diff --git a/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.service.ts b/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.service.ts
index 4292d78f5e94..d6dc2d6a2376 100644
--- a/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.service.ts
+++ b/apps/services/endorsements/api/src/app/modules/endorsement/endorsement.service.ts
@@ -14,6 +14,7 @@ import { EndorsementTag } from '../endorsementList/constants'
 import { paginate } from '@island.is/nest/pagination'
 import { ENDORSEMENT_SYSTEM_GENERAL_PETITION_TAGS } from '../../../environments/environment'
 import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
+import { AwsService } from '@island.is/nest/aws'
 
 interface FindEndorsementInput {
   listId: string
@@ -54,6 +55,7 @@ export class EndorsementService {
     @Inject(LOGGER_PROVIDER)
     private logger: Logger,
     private readonly nationalRegistryApiV3: NationalRegistryV3ClientService,
+    private readonly awsService: AwsService,
   ) {}
 
   async findEndorsements({ listId }: FindEndorsementsInput, query: any) {
diff --git a/apps/services/endorsements/api/src/app/modules/endorsementList/dto/endorsementListExportUrl.response.dto.ts b/apps/services/endorsements/api/src/app/modules/endorsementList/dto/endorsementListExportUrl.response.dto.ts
new file mode 100644
index 000000000000..399b4d8eb59d
--- /dev/null
+++ b/apps/services/endorsements/api/src/app/modules/endorsementList/dto/endorsementListExportUrl.response.dto.ts
@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger'
+
+export class EndorsementListExportUrlResponse {
+  @ApiProperty({
+    description: 'The presigned URL for the exported file',
+    example: 'https://example.com/presigned-url-to-file',
+  })
+  url!: string
+}
diff --git a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.controller.ts b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.controller.ts
index 7e499c273e5f..67d9c61be6e5 100644
--- a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.controller.ts
+++ b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.controller.ts
@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   Body,
   Controller,
   Get,
@@ -7,6 +8,7 @@ import {
   Post,
   Put,
   Query,
+  Res,
   UseGuards,
   UseInterceptors,
 } from '@nestjs/common'
@@ -47,6 +49,7 @@ import { EndorsementListInterceptor } from './interceptors/endorsementList.inter
 import { EndorsementListsInterceptor } from './interceptors/endorsementLists.interceptor'
 import { EmailDto } from './dto/email.dto'
 import { SendPdfEmailResponse } from './dto/sendPdfEmail.response'
+import { EndorsementListExportUrlResponse } from './dto/endorsementListExportUrl.response.dto'
 
 export class FindTagPaginationComboDto extends IntersectionType(
   FindEndorsementListByTagsDto,
@@ -358,4 +361,40 @@ export class EndorsementListController {
       query.emailAddress,
     )
   }
+
+  @ApiOperation({
+    summary: 'Export an endorsement list as PDF or CSV',
+  })
+  @Scopes(EndorsementsScope.main, AdminPortalScope.petitionsAdmin)
+  @HasAccessGroup(AccessGroup.Owner)
+  @ApiParam({ name: 'listId', type: String })
+  @ApiParam({ name: 'fileType', type: String, enum: ['pdf', 'csv'] })
+  @ApiOkResponse({
+    description: 'Presigned URL for the exported file',
+    type: EndorsementListExportUrlResponse,
+  })
+  @Get(':listId/export/:fileType')
+  @Audit()
+  async exportEndorsementList(
+    @Param(
+      'listId',
+      new ParseUUIDPipe({ version: '4' }),
+      EndorsementListByIdPipe,
+    )
+    endorsementList: EndorsementList,
+    @Param('fileType') fileType: 'pdf' | 'csv',
+    @CurrentUser() user: User,
+  ): Promise<EndorsementListExportUrlResponse> {
+    if (!['pdf', 'csv'].includes(fileType)) {
+      throw new BadRequestException(
+        'Invalid file type. Allowed values are "pdf" or "csv".',
+      )
+    }
+
+    return await this.endorsementListService.exportList(
+      endorsementList.id,
+      user,
+      fileType,
+    )
+  }
 }
diff --git a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.module.ts b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.module.ts
index 339c94fff8b3..12c9cb4ad565 100644
--- a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.module.ts
+++ b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.module.ts
@@ -8,8 +8,11 @@ import { Endorsement } from '../endorsement/models/endorsement.model'
 import { EmailModule } from '@island.is/email-service'
 import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
 
+import { AwsModule } from '@island.is/nest/aws'
+
 @Module({
   imports: [
+    AwsModule,
     NationalRegistryV3ClientModule,
     SequelizeModule.forFeature([EndorsementList, Endorsement]),
     EmailModule,
diff --git a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.service.ts b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.service.ts
index d5696e1155cb..36a942766817 100644
--- a/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.service.ts
+++ b/apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.service.ts
@@ -3,9 +3,10 @@ import {
   Injectable,
   NotFoundException,
   BadRequestException,
+  ForbiddenException,
 } from '@nestjs/common'
 import { InjectModel } from '@nestjs/sequelize'
-import { Op, Sequelize } from 'sequelize'
+import { col, Op, Sequelize } from 'sequelize'
 import type { Logger } from '@island.is/logging'
 import { LOGGER_PROVIDER } from '@island.is/logging'
 import { EndorsementList } from './endorsementList.model'
@@ -24,6 +25,11 @@ import PDFDocument from 'pdfkit'
 import getStream from 'get-stream'
 import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
 
+import csvStringify from 'csv-stringify/lib/sync'
+
+import { AwsService } from '@island.is/nest/aws'
+import { EndorsementListExportUrlResponse } from './dto/endorsementListExportUrl.response.dto'
+
 interface CreateInput extends EndorsementListDto {
   owner: string
 }
@@ -40,6 +46,7 @@ export class EndorsementListService {
     @Inject(EmailService)
     private emailService: EmailService,
     private readonly nationalRegistryApiV3: NationalRegistryV3ClientService,
+    private readonly awsService: AwsService,
   ) {}
 
   hasAdminScope(user: User): boolean {
@@ -385,7 +392,9 @@ export class EndorsementListService {
         doc.text(
           val.created.toLocaleDateString(locale) +
             ' ' +
-            (val.meta.fullName ? val.meta.fullName : 'Nafn ótilgreint'),
+            (val.meta.fullName ? val.meta.fullName : 'Nafn ótilgreint') +
+            ' ' +
+            (val.meta.locality ? val.meta.locality : 'Sveitafélag ótilgreint'),
         )
       }
     }
@@ -395,7 +404,9 @@ export class EndorsementListService {
       .fontSize(regular)
       .text(
         'Þetta skjal var framkallað sjálfvirkt þann: ' +
-          new Date().toLocaleDateString(locale),
+          new Date().toLocaleDateString(locale) +
+          ' klukkan ' +
+          new Date().toLocaleTimeString(locale),
       )
     doc.end()
     return await getStream.buffer(doc)
@@ -665,4 +676,119 @@ export class EndorsementListService {
       return { success: false }
     }
   }
+  async exportList(
+    listId: string,
+    user: User,
+    fileType: 'pdf' | 'csv',
+  ): Promise<EndorsementListExportUrlResponse> {
+    try {
+      this.logger.info(`Exporting list ${listId} as ${fileType}`, { listId })
+
+      // Validate file type
+      if (!['pdf', 'csv'].includes(fileType)) {
+        throw new BadRequestException(
+          'Invalid file type. Allowed values are "pdf" or "csv".',
+        )
+      }
+
+      // Fetch endorsement list
+      const endorsementList = await this.fetchEndorsementList(listId, user)
+      if (!endorsementList) {
+        throw new NotFoundException(
+          `Endorsement list ${listId} not found or access denied.`,
+        )
+      }
+
+      // Create file buffer
+      const fileBuffer =
+        fileType === 'pdf'
+          ? await this.createPdfBuffer(endorsementList)
+          : this.createCsvBuffer(endorsementList)
+
+      // Upload to S3
+      const filename = `undirskriftalisti-${listId}-${new Date()
+        .toISOString()
+        .replace(/[:.]/g, '-')}.${fileType}`
+      await this.uploadFileToS3(fileBuffer, filename, fileType)
+
+      // Generate presigned URL with 60 minutes expiration
+      const url = await this.awsService.getPresignedUrl(
+        environment.exportsBucketName,
+        filename,
+      )
+      return { url }
+    } catch (error) {
+      this.logger.error(`Failed to export list ${listId}`, { error })
+      throw error
+    }
+  }
+
+  private async fetchEndorsementList(
+    listId: string,
+    user: User,
+  ): Promise<EndorsementList | null> {
+    // Only admin or list owner can access the list
+    const isAdmin = this.hasAdminScope(user)
+    return this.endorsementListModel.findOne({
+      where: {
+        id: listId,
+        ...(isAdmin ? {} : { owner: user.nationalId }),
+      },
+      include: [{ model: Endorsement }],
+    })
+  }
+
+  private createCsvBuffer(endorsementList: EndorsementList): Buffer {
+    const records = (endorsementList.endorsements || []).map((endorsement) => ({
+      Dagsetning: endorsement.created.toLocaleDateString('is-IS'),
+      Nafn: endorsement.meta?.fullName || 'Nafn ótilgreint',
+      Sveitafélag: endorsement.meta?.locality || 'Sveitafélag ótilgreint',
+    }))
+    const csvString = csvStringify(records, { header: true })
+    return Buffer.from(csvString, 'utf-8')
+  }
+
+  private async createPdfBuffer(
+    endorsementList: EndorsementList,
+  ): Promise<Buffer> {
+    try {
+      const ownerName = await this.getOwnerInfo(
+        endorsementList.id,
+        endorsementList.owner,
+      )
+      const pdfBuffer = await this.createDocumentBuffer(
+        endorsementList,
+        ownerName,
+      )
+      return pdfBuffer
+    } catch (error) {
+      this.logger.error(
+        `Failed to create PDF buffer for endorsement list ${endorsementList.id}`,
+        { error },
+      )
+      throw new Error(
+        `Error generating PDF for endorsement list ${endorsementList.id}`,
+      )
+    }
+  }
+
+  private async uploadFileToS3(
+    fileBuffer: Buffer,
+    filename: string,
+    fileType: 'pdf' | 'csv',
+  ): Promise<void> {
+    try {
+      await this.awsService.uploadFile(
+        fileBuffer,
+        environment.exportsBucketName,
+        filename,
+        {
+          ContentType: fileType === 'pdf' ? 'application/pdf' : 'text/csv',
+        },
+      )
+    } catch (error) {
+      this.logger.error(`Failed to upload file to S3`, { error, filename })
+      throw new Error('Error uploading file to S3')
+    }
+  }
 }
diff --git a/apps/services/endorsements/api/src/environments/environment.ts b/apps/services/endorsements/api/src/environments/environment.ts
index 0dcd345752fc..3633c57a21c4 100644
--- a/apps/services/endorsements/api/src/environments/environment.ts
+++ b/apps/services/endorsements/api/src/environments/environment.ts
@@ -20,6 +20,7 @@ const devConfig = {
     sender: 'devland.is',
     address: 'development@island.is',
   },
+  exportsBucketName: process.env.ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME,
 }
 
 const prodConfig = {
@@ -38,6 +39,7 @@ const prodConfig = {
     sender: process.env.EMAIL_FROM_NAME ?? '',
     address: process.env.EMAIL_FROM_ADDRESS ?? '',
   },
+  exportsBucketName: process.env.ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME,
 }
 
 export default isProductionEnvironment ? prodConfig : devConfig
diff --git a/apps/services/search-indexer/jest.config.ts b/apps/services/search-indexer/jest.config.ts
index cd7a91c1b695..71cec79e0b7e 100644
--- a/apps/services/search-indexer/jest.config.ts
+++ b/apps/services/search-indexer/jest.config.ts
@@ -5,8 +5,6 @@ export default {
   roots: [__dirname],
   coverageDirectory: '<rootDir>/coverage/apps/services/search-indexer',
   globals: {},
-  globalSetup: `${__dirname}/test/globalSetup.ts`,
-  globalTeardown: `${__dirname}/test/globalTeardown.ts`,
   displayName: 'services-search-indexer',
   testEnvironment: 'node',
   transform: {
diff --git a/apps/services/search-indexer/src/environments/environment.ts b/apps/services/search-indexer/src/environments/environment.ts
index 0a2546c648c7..e67090b93702 100644
--- a/apps/services/search-indexer/src/environments/environment.ts
+++ b/apps/services/search-indexer/src/environments/environment.ts
@@ -6,6 +6,7 @@ export interface Environment {
   esDomain: string
   s3Bucket: string
   s3Folder: string
+  awsRegion: string
   dictRepo: string
   locales: ElasticsearchIndexLocale[]
   configPath: string
@@ -16,6 +17,7 @@ export const environment: Environment =
     ? {
         elasticNode: process.env.ELASTIC_NODE,
         s3Bucket: process.env.S3_BUCKET,
+        awsRegion: process.env.AWS_REGION,
         esDomain: process.env.ELASTIC_DOMAIN,
         dictRepo: 'island-is/elasticsearch-dictionaries',
         s3Folder: '',
@@ -25,6 +27,7 @@ export const environment: Environment =
     : {
         elasticNode: process.env.ELASTIC_NODE || '',
         s3Bucket: process.env.S3_BUCKET,
+        awsRegion: process.env.AWS_REGION,
         esDomain: process.env.ELASTIC_DOMAIN,
         s3Folder: '',
         dictRepo: 'island-is/elasticsearch-dictionaries',
diff --git a/apps/services/search-indexer/src/migrate/lib/aws.spec.ts b/apps/services/search-indexer/src/migrate/lib/aws.spec.ts
deleted file mode 100644
index f58a4a3bb249..000000000000
--- a/apps/services/search-indexer/src/migrate/lib/aws.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Readable } from 'stream'
-import { streamToBuffer } from './aws' // Assuming the function is exported from aws.ts
-
-describe('streamToBuffer', () => {
-  it('should correctly convert NodeJS.ReadableStream to Buffer', async () => {
-    const testData = 'Hello, World!'
-    const stream = Readable.from(Buffer.from(testData))
-
-    const result = await streamToBuffer(stream)
-    expect(result).toBeInstanceOf(Buffer)
-    expect(result.toString()).toBe(testData)
-  })
-
-  it('should correctly handle empty NodeJS.ReadableStream', async () => {
-    const stream = Readable.from([])
-
-    const result = await streamToBuffer(stream)
-    expect(result).toBeInstanceOf(Buffer)
-    expect(result.length).toBe(0)
-  })
-
-  it('should correctly handle large NodeJS.ReadableStream', async () => {
-    const largeData = Buffer.alloc(100 * 1024 * 1024, 'a') // 100MB of 'a'
-    const stream = Readable.from(largeData)
-
-    const result = await streamToBuffer(stream)
-    expect(result).toBeInstanceOf(Buffer)
-    expect(result.length).toBe(largeData.length)
-    expect(result.toString()).toBe(largeData.toString())
-  })
-
-  it('should handle NodeJS.ReadableStream with multiple chunks', async () => {
-    const chunks = ['Hello', ' ', 'World', '!']
-    const stream = Readable.from(chunks)
-
-    const result = await streamToBuffer(stream)
-    expect(result).toBeInstanceOf(Buffer)
-    expect(result.toString()).toBe(chunks.join(''))
-  })
-
-  it('should handle NodeJS.ReadableStream in object mode', async () => {
-    const objects = [{ a: 1 }, { b: 2 }, { c: 3 }]
-    const stream = Readable.from(objects, { objectMode: true })
-
-    const result = await streamToBuffer(stream)
-    expect(result).toBeInstanceOf(Buffer)
-    const parsedResult = JSON.parse(result.toString())
-    expect(parsedResult).toEqual(objects)
-  })
-})
diff --git a/apps/services/search-indexer/src/migrate/lib/aws.ts b/apps/services/search-indexer/src/migrate/lib/aws.ts
index c60dc12fd0bd..784d8a0e7e8b 100644
--- a/apps/services/search-indexer/src/migrate/lib/aws.ts
+++ b/apps/services/search-indexer/src/migrate/lib/aws.ts
@@ -1,40 +1,14 @@
-import {
-  S3Client,
-  PutObjectCommand,
-  HeadObjectCommand,
-  PutObjectCommandInput,
-} from '@aws-sdk/client-s3'
-import {
-  ElasticsearchServiceClient,
-  DescribePackagesCommand,
-  ListPackagesForDomainCommand,
-  ListDomainNamesCommand,
-  CreatePackageCommand,
-  AssociatePackageCommand,
-  DissociatePackageCommand,
-  PackageStatus,
-  DomainPackageStatus,
-  CreatePackageCommandInput,
-} from '@aws-sdk/client-elasticsearch-service'
+import AWS from 'aws-sdk'
+import { PutObjectRequest } from 'aws-sdk/clients/s3'
+import { PackageStatus, DomainPackageStatus } from 'aws-sdk/clients/es'
 import { ElasticsearchIndexLocale } from '@island.is/content-search-index-manager'
 import { logger } from '@island.is/logging'
 import { environment } from '../../environments/environment'
 import { Dictionary } from './dictionary'
-import { Readable } from 'stream'
-
-const ES_LOCALSTACK_ENDPOINT =
-  process.env.ES_ENDPOINT ?? 'http://localhost:4566'
-const S3_LOCALSTACK_ENDPOINT =
-  process.env.S3_ENDPOINT ?? 'http://localhost:4566'
-
-const awsEs = new ElasticsearchServiceClient({
-  endpoint:
-    process.env.NODE_ENV !== 'production' ? ES_LOCALSTACK_ENDPOINT : undefined,
-})
-const s3 = new S3Client({
-  endpoint:
-    process.env.NODE_ENV !== 'production' ? S3_LOCALSTACK_ENDPOINT : undefined,
-})
+
+AWS.config.update({ region: environment.awsRegion })
+const awsEs = new AWS.ES()
+const s3 = new AWS.S3()
 
 const sleep = (sec: number) => {
   return new Promise((resolve) => {
@@ -69,65 +43,66 @@ interface PackageStatuses {
 const getPackageStatuses = async (
   packageId: string,
 ): Promise<PackageStatuses> => {
-  const describePackagesCommand = new DescribePackagesCommand({
+  const params = {
     Filters: [
       {
         Name: 'PackageID',
         Value: [packageId],
       },
     ],
-  })
-  const packages = await awsEs.send(describePackagesCommand)
+  }
+  const packages = await awsEs.describePackages(params).promise()
 
-  const listPackagesForDomainCommand = new ListPackagesForDomainCommand({
-    DomainName: environment.esDomain,
-  })
-  const domainPackageList = await awsEs.send(listPackagesForDomainCommand)
+  const domainPackageList = await awsEs
+    .listPackagesForDomain({
+      DomainName: environment.esDomain,
+    })
+    .promise()
 
-  const domainPackage = domainPackageList.DomainPackageDetailsList?.find(
+  const domainPackage = domainPackageList.DomainPackageDetailsList.find(
     (listItem) => listItem.PackageID === packageId,
   )
 
   return {
-    packageStatus: packages.PackageDetailsList?.[0]
-      .PackageStatus as PackageStatus,
-    domainStatus:
-      domainPackage?.DomainPackageStatus ?? DomainPackageStatus.DISSOCIATING,
+    packageStatus: packages.PackageDetailsList[0].PackageStatus,
+    domainStatus: domainPackage?.DomainPackageStatus ?? 'DISSOCIATED',
   }
 }
 
 export const getAssociatedEsPackages = async (
   requestedVersion: string,
 ): Promise<AwsEsPackage[]> => {
-  const listPackagesForDomainCommand = new ListPackagesForDomainCommand({
-    DomainName: environment.esDomain,
-  })
-  const domainPackageList = await awsEs.send(listPackagesForDomainCommand)
+  const domainPackageList = await awsEs
+    .listPackagesForDomain({
+      DomainName: environment.esDomain,
+    })
+    .promise()
 
   return (
-    domainPackageList.DomainPackageDetailsList?.filter((esPackage) => {
-      const { version, locale, analyzerType } = parsePackageName(
-        esPackage.PackageName ?? '',
-      )
-      logger.info('Found associated package for domain', {
-        version,
-        locale,
-        analyzerType,
-        requestedVersion,
-        willBeUsed: requestedVersion === version,
+    domainPackageList.DomainPackageDetailsList
+      // we only want to return packages for current version
+      .filter((esPackage) => {
+        const { version, locale, analyzerType } = parsePackageName(
+          esPackage.PackageName,
+        )
+        logger.info('Found associated package for domain', {
+          version,
+          locale,
+          analyzerType,
+          requestedVersion,
+          willBeUsed: requestedVersion === version,
+        })
+        return requestedVersion === version
+      })
+      .map((esPackage) => {
+        const { locale, analyzerType } = parsePackageName(esPackage.PackageName)
+        return {
+          packageName: esPackage.PackageName,
+          packageId: esPackage.PackageID,
+          locale: locale as ElasticsearchIndexLocale,
+          analyzerType,
+        }
       })
-      return requestedVersion === version
-    }).map((esPackage) => {
-      const { locale, analyzerType } = parsePackageName(
-        esPackage.PackageName ?? '',
-      )
-      return {
-        packageName: esPackage.PackageName,
-        packageId: esPackage.PackageID,
-        locale: locale as ElasticsearchIndexLocale,
-        analyzerType,
-      }
-    }) ?? []
   )
 }
 
@@ -176,18 +151,18 @@ export const checkAWSAccess = async (): Promise<boolean> => {
     return false
   }
 
-  const listDomainNamesCommand = new ListDomainNamesCommand({})
   const domains = await awsEs
-    .send(listDomainNamesCommand)
-    .then((response) => response.DomainNames)
+    .listDomainNames()
+    .promise()
+    .then((domains) => domains.DomainNames)
     .catch((error) => {
       logger.error('Failed to check aws access', { error })
       // return empty list to indicate no access
       return []
     })
 
-  logger.info('Validating esDomain against aws domain list', { domains })
-  return !!domains?.find((domain) => domain.DomainName === environment.esDomain)
+  logger.info('Validating esDomain agains aws domain list', { domains })
+  return !!domains.find((domain) => domain.DomainName === environment.esDomain)
 }
 
 interface CreateS3KeyInput {
@@ -206,9 +181,7 @@ const createS3Key = ({
   return `${environment.s3Folder}${prefix}${filename}.txt`
 }
 
-const uploadFileToS3 = async (
-  options: Omit<PutObjectCommandInput, 'Bucket'>,
-) => {
+const uploadFileToS3 = (options: Omit<PutObjectRequest, 'Bucket'>) => {
   const params = {
     Bucket: environment.s3Bucket,
     ...options,
@@ -217,26 +190,24 @@ const uploadFileToS3 = async (
     Bucket: params.Bucket,
     Key: params.Key,
   })
-  try {
-    return await s3.send(new PutObjectCommand(params))
-  } catch (error) {
-    logger.error('Failed to upload s3 package', error)
-    throw error
-  }
+  return s3
+    .upload(params)
+    .promise()
+    .catch((error) => {
+      logger.error('Failed to upload s3 package', error)
+      throw error
+    })
 }
 
-const checkIfS3Exists = async (key: string) => {
-  try {
-    await s3.send(
-      new HeadObjectCommand({
-        Bucket: environment.s3Bucket,
-        Key: key,
-      }),
-    )
-    return true
-  } catch {
-    return false
-  } // we don't want this to throw on error so we can handle if not exists manually
+const checkIfS3Exists = (key: string) => {
+  return s3
+    .headObject({
+      Bucket: environment.s3Bucket,
+      Key: key,
+    })
+    .promise()
+    .then(() => true)
+    .catch(() => false) // we don't want this to throw on error so we can handle if not exists manually
 }
 
 interface S3DictionaryFile {
@@ -244,37 +215,6 @@ interface S3DictionaryFile {
   analyzerType: string
   version: string
 }
-
-export const streamToBuffer = async (
-  file: NodeJS.ReadableStream,
-): Promise<Buffer> => {
-  return new Promise((resolve, reject) => {
-    if (!(file instanceof Readable)) {
-      // In case the input is not a Readable stream (shouldn't happen due to typing)
-      reject(new Error('Input is not a valid Readable stream'))
-    }
-    const chunks: Uint8Array[] = []
-    file.on('data', (chunk) => chunks.push(chunk))
-    file.on('end', () => {
-      if (chunks.every((chunk) => typeof chunk === 'string')) {
-        // If all chunks are strings, concatenate them and convert to Buffer
-        resolve(Buffer.from(chunks.join('')))
-      } else if (
-        chunks.every(
-          (chunk) => Buffer.isBuffer(chunk) || chunk instanceof Uint8Array,
-        )
-      ) {
-        // If all chunks are Buffer or Uint8Array, use Buffer.concat
-        resolve(Buffer.concat(chunks))
-      } else {
-        // For mixed types or object mode, stringify and convert to Buffer
-        resolve(Buffer.from(JSON.stringify(chunks)))
-      }
-    })
-    file.on('error', (err) => reject(err))
-  })
-}
-
 export const uploadS3DictionaryFiles = async (
   dictionaries: Dictionary[],
 ): Promise<S3DictionaryFile[]> => {
@@ -286,9 +226,7 @@ export const uploadS3DictionaryFiles = async (
     const exists = await checkIfS3Exists(s3Key)
     if (!exists) {
       logger.info('S3 file not found, uploading file', { key: s3Key })
-
-      const uploadBody = await streamToBuffer(file)
-      await uploadFileToS3({ Key: s3Key, Body: uploadBody })
+      await uploadFileToS3({ Key: s3Key, Body: file })
     } else {
       logger.info('S3 file found, skipping upload of file', { key: s3Key })
     }
@@ -306,10 +244,7 @@ export const uploadS3DictionaryFiles = async (
 
 const getAwsEsPackagesDetails = async () => {
   logger.info('Getting all AWS ES packages')
-  const describePackagesCommand = new DescribePackagesCommand({
-    MaxResults: 100,
-  })
-  const packages = await awsEs.send(describePackagesCommand)
+  const packages = await awsEs.describePackages({ MaxResults: 100 }).promise()
 
   return packages.PackageDetailsList
 }
@@ -319,7 +254,7 @@ const checkIfAwsEsPackageExists = async (
 ): Promise<string | null> => {
   const esPackages = await getAwsEsPackagesDetails()
   logger.info('Checking if package exists', { packageName })
-  const foundPackage = esPackages?.find(
+  const foundPackage = esPackages.find(
     (esPackage) => esPackage.PackageName === packageName,
   )
   return foundPackage?.PackageID ?? null
@@ -327,7 +262,7 @@ const checkIfAwsEsPackageExists = async (
 
 /*
 createAwsEsPackages should only run when we are updating, we can therefore assume no assigned packages exist in AWS ES for this version
-We run a remove packages for this version function to handle failed partial updates that might not have associated the package to the domain
+We run a remove packages for this version function to handle failed partial updates that might not have associated the package to the domain 
 */
 export interface AwsEsPackage {
   packageName?: string
@@ -343,10 +278,10 @@ export const createAwsEsPackages = async (
     const { analyzerType, locale, version } = uploadedFile
     const packageName = createPackageName(locale, analyzerType, version)
     const foundPackageId = await checkIfAwsEsPackageExists(packageName)
-    let uploadedPackageId: string
+    let uploadedPackageId
 
     if (!foundPackageId) {
-      const params: CreatePackageCommandInput = {
+      const params = {
         PackageName: createPackageName(locale, analyzerType, version), // version is here so we don't conflict with older packages
         PackageType: 'TXT-DICTIONARY',
         PackageSource: {
@@ -357,17 +292,16 @@ export const createAwsEsPackages = async (
 
       logger.info('Creating AWS ES package', params)
 
-      const createPackageCommand = new CreatePackageCommand(params)
-      const esPackage = await awsEs.send(createPackageCommand)
+      const esPackage = await awsEs.createPackage(params).promise()
 
       // we have to wait for package to be ready cause AWS ES can only process one request at a time
       await waitForPackageStatus(
-        esPackage.PackageDetails?.PackageID ?? '',
-        PackageStatus.AVAILABLE,
+        esPackage.PackageDetails.PackageID,
+        'AVAILABLE',
       )
 
       logger.info('Created AWS ES package', { esPackage })
-      uploadedPackageId = esPackage.PackageDetails?.PackageID
+      uploadedPackageId = esPackage.PackageDetails.PackageID
     } else {
       logger.info('AWS ES package found, skipping upload of package', {
         packageId: foundPackageId,
@@ -385,25 +319,24 @@ export const createAwsEsPackages = async (
 }
 
 const getDomainPackages = () => {
-  const listPackagesForDomainCommand = new ListPackagesForDomainCommand({
-    DomainName: environment.esDomain,
-  })
-  return awsEs.send(listPackagesForDomainCommand)
+  return awsEs
+    .listPackagesForDomain({
+      DomainName: environment.esDomain,
+    })
+    .promise()
 }
 
 const getPackageAssociationStatus = async (
-  packageId: string,
+  packageId,
 ): Promise<'missing' | 'active' | 'broken'> => {
   const domainPackageList = await getDomainPackages()
-  const domainPackage = domainPackageList.DomainPackageDetailsList?.find(
+  const domainPackage = domainPackageList.DomainPackageDetailsList.find(
     (domainPackageEntry) => domainPackageEntry.PackageID === packageId,
   )
   if (!domainPackage) {
     return 'missing'
   }
-  return domainPackage.DomainPackageStatus === DomainPackageStatus.ACTIVE
-    ? 'active'
-    : 'broken'
+  return domainPackage.DomainPackageStatus === 'ACTIVE' ? 'active' : 'broken'
 }
 
 const dissociatePackageWithAwsEsSearchDomain = async (packageId: string) => {
@@ -413,10 +346,8 @@ const dissociatePackageWithAwsEsSearchDomain = async (packageId: string) => {
   }
 
   logger.info('Disassociating package from AWS ES domain', params)
-  const dissociatePackageCommand = new DissociatePackageCommand(params)
-  const result = await awsEs.send(dissociatePackageCommand)
-  // This used to be 'DISSOCIATED', but that was never a valid status 🤷
-  await waitForPackageStatus(packageId, DomainPackageStatus.DISSOCIATING)
+  const result = await awsEs.dissociatePackage(params).promise()
+  await waitForPackageStatus(packageId, 'DISSOCIATED')
   return result
 }
 
@@ -441,13 +372,12 @@ export const associatePackagesWithAwsEsSearchDomain = async (
       }
 
       logger.info('Associating package with AWS ES domain', params)
-      const associatePackageCommand = new AssociatePackageCommand(params)
-      const esPackage = await awsEs.send(associatePackageCommand)
+      const esPackage = await awsEs.associatePackage(params).promise()
 
       // we have to wait for package to be ready cause AWS ES can only process one request at a time
       await waitForPackageStatus(
-        esPackage.DomainPackageDetails?.PackageID ?? '',
-        DomainPackageStatus.ACTIVE,
+        esPackage.DomainPackageDetails.PackageID,
+        'ACTIVE',
       )
     } else {
       logger.info(
diff --git a/apps/services/search-indexer/src/migrate/lib/dictionary.ts b/apps/services/search-indexer/src/migrate/lib/dictionary.ts
index 8bcb947f4592..e225c8dcb946 100644
--- a/apps/services/search-indexer/src/migrate/lib/dictionary.ts
+++ b/apps/services/search-indexer/src/migrate/lib/dictionary.ts
@@ -26,19 +26,20 @@ interface Commit {
   sha: string
 }
 
-const getDictionaryFile = async (
+const getDictionaryFile = (
   sha: string,
   locale: ElasticsearchIndexLocale,
   analyzer: string,
-): Promise<NodeJS.ReadableStream> => {
-  const response = await fetch(
+) => {
+  return fetch(
     `https://github.com/${environment.dictRepo}/blob/${sha}/${locale}/${analyzer}.txt?raw=true`,
-  )
-  if (response.ok) {
-    return response.body
-  } else {
-    return null
-  }
+  ).then((response) => {
+    if (response.ok) {
+      return response.body
+    } else {
+      return null
+    }
+  })
 }
 
 // get a list of all latest commits for this repo
diff --git a/apps/services/search-indexer/test/globalSetup.ts b/apps/services/search-indexer/test/globalSetup.ts
deleted file mode 100644
index 289e08508e64..000000000000
--- a/apps/services/search-indexer/test/globalSetup.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { register } from 'tsconfig-paths'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const tsConfig = require(`../${require('../tsconfig.json').extends}`)
-register({ baseUrl: './', paths: tsConfig.compilerOptions.paths })
-import { startLocalstack } from '@island.is/testing/containers'
-
-export default async () => {
-  await startLocalstack()
-}
diff --git a/apps/services/search-indexer/test/globalTeardown.ts b/apps/services/search-indexer/test/globalTeardown.ts
deleted file mode 100644
index ae0b950bc15b..000000000000
--- a/apps/services/search-indexer/test/globalTeardown.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { register } from 'tsconfig-paths'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const tsConfig = require(`../${require('../tsconfig.json').extends}`)
-register({ baseUrl: './', paths: tsConfig.compilerOptions.paths })
-import { stopLocalstack } from '@island.is/testing/containers'
-
-export default async () => {
-  await stopLocalstack()
-}
diff --git a/apps/services/sessions/docker-compose.yml b/apps/services/sessions/docker-compose.yml
index 141df26f84d0..a897c95ed0d3 100644
--- a/apps/services/sessions/docker-compose.yml
+++ b/apps/services/sessions/docker-compose.yml
@@ -17,7 +17,7 @@ services:
 
   redis_cluster:
     container_name: redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     networks:
       - local
     privileged: true
diff --git a/apps/services/university-gateway/src/app/modules/application/dto/createApplicationDto.ts b/apps/services/university-gateway/src/app/modules/application/dto/createApplicationDto.ts
index 72172ce99b76..4ca3440c75b2 100644
--- a/apps/services/university-gateway/src/app/modules/application/dto/createApplicationDto.ts
+++ b/apps/services/university-gateway/src/app/modules/application/dto/createApplicationDto.ts
@@ -113,10 +113,10 @@ class CreateApplicationFileDto {
 
   @IsString()
   @ApiProperty({
-    description: 'Blob for file',
+    description: 'A public download link to a s3 file',
     example: '',
   })
-  blob!: Blob
+  url!: string
 }
 
 class CreateApplicationEducationDto {
diff --git a/apps/services/user-notification/docker-compose.yml b/apps/services/user-notification/docker-compose.yml
index 1a3bb8d89000..9796f0e095fb 100644
--- a/apps/services/user-notification/docker-compose.yml
+++ b/apps/services/user-notification/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - 5432:5432
   redis_cluster:
     container_name: redis_cluster
-    image: docker.io/grokzen/redis-cluster:7.0.0
+    image: docker.io/grokzen/redis-cluster:6.0.16
     networks:
       - local
     privileged: true
diff --git a/apps/services/user-notification/infra/user-notification.ts b/apps/services/user-notification/infra/user-notification.ts
index 99c701c45e2a..162a3a82d3d0 100644
--- a/apps/services/user-notification/infra/user-notification.ts
+++ b/apps/services/user-notification/infra/user-notification.ts
@@ -2,6 +2,7 @@ import {
   Base,
   Client,
   NationalRegistryB2C,
+  RskCompanyInfo,
 } from '../../../../infra/src/dsl/xroad'
 import {
   json,
@@ -68,7 +69,7 @@ export const userNotificationServiceSetup = (services: {
       NATIONAL_REGISTRY_B2C_CLIENT_SECRET:
         '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET',
     })
-    .xroad(Base, Client, NationalRegistryB2C)
+    .xroad(Base, Client, NationalRegistryB2C, RskCompanyInfo)
     .liveness('/liveness')
     .readiness('/health/check')
     .ingress({
@@ -156,7 +157,7 @@ export const userNotificationWorkerSetup = (services: {
       NATIONAL_REGISTRY_B2C_CLIENT_SECRET:
         '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET',
     })
-    .xroad(Base, Client, NationalRegistryB2C)
+    .xroad(Base, Client, NationalRegistryB2C, RskCompanyInfo)
     .liveness('/liveness')
     .readiness('/health/check')
 
diff --git a/apps/services/user-notification/src/app/app.module.ts b/apps/services/user-notification/src/app/app.module.ts
index 771697de9de8..39c68c3ff69e 100644
--- a/apps/services/user-notification/src/app/app.module.ts
+++ b/apps/services/user-notification/src/app/app.module.ts
@@ -12,12 +12,13 @@ import { NationalRegistryV3ClientConfig } from '@island.is/clients/national-regi
 import { FeatureFlagConfig } from '@island.is/nest/feature-flags'
 import { UserProfileClientConfig } from '@island.is/clients/user-profile'
 import { AuthDelegationApiClientConfig } from '@island.is/clients/auth/delegation-api'
+import { CmsConfig } from '@island.is/clients/cms'
+import { CompanyRegistryConfig } from '@island.is/clients/rsk/company-registry'
+import { emailModuleConfig } from '@island.is/email-service'
 
 import { SequelizeConfigService } from './sequelizeConfig.service'
 import { environment } from '../environments/environment'
 import { UserNotificationsConfig } from '../config'
-import { CmsConfig } from '@island.is/clients/cms'
-import { emailModuleConfig } from '@island.is/email-service'
 
 @Module({
   imports: [
@@ -40,6 +41,7 @@ import { emailModuleConfig } from '@island.is/email-service'
         AuthDelegationApiClientConfig,
         CmsConfig,
         emailModuleConfig,
+        CompanyRegistryConfig,
       ],
     }),
     NotificationsModule,
diff --git a/apps/services/user-notification/src/app/modules/notifications/notifications.module.ts b/apps/services/user-notification/src/app/modules/notifications/notifications.module.ts
index 45e63184aba4..812bdde441be 100644
--- a/apps/services/user-notification/src/app/modules/notifications/notifications.module.ts
+++ b/apps/services/user-notification/src/app/modules/notifications/notifications.module.ts
@@ -1,8 +1,11 @@
 import { Module } from '@nestjs/common'
 import { SequelizeModule } from '@nestjs/sequelize'
 import * as firebaseAdmin from 'firebase-admin'
+
 import { AuthDelegationApiClientModule } from '@island.is/clients/auth/delegation-api'
+import { CmsModule } from '@island.is/clients/cms'
 import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
+import { CompanyRegistryClientModule } from '@island.is/clients/rsk/company-registry'
 import { UserProfileClientModule } from '@island.is/clients/user-profile'
 import { CmsTranslationsModule } from '@island.is/cms-translations'
 import { EmailModule } from '@island.is/email-service'
@@ -10,6 +13,7 @@ import { LoggingModule } from '@island.is/logging'
 import { QueueModule } from '@island.is/message-queue'
 import { FeatureFlagModule } from '@island.is/nest/feature-flags'
 import { type ConfigType } from '@island.is/nest/config'
+
 import { UserNotificationsConfig } from '../../../config'
 import { FIREBASE_PROVIDER } from '../../../constants'
 import { environment } from '../../../environments/environment'
@@ -20,7 +24,6 @@ import { Notification } from './notification.model'
 import { NotificationDispatchService } from './notificationDispatch.service'
 import { NotificationsWorkerService } from './notificationsWorker/notificationsWorker.service'
 import { MessageProcessorService } from './messageProcessor.service'
-import { CmsModule } from '@island.is/clients/cms'
 
 @Module({
   exports: [NotificationsService],
@@ -44,6 +47,7 @@ import { CmsModule } from '@island.is/clients/cms'
     NationalRegistryV3ClientModule,
     AuthDelegationApiClientModule,
     CmsModule,
+    CompanyRegistryClientModule,
   ],
   controllers: [NotificationsController, MeNotificationsController],
   providers: [
diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts
index d682f863e966..2c34e7ea7311 100644
--- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts
+++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts
@@ -53,6 +53,17 @@ export const userWithNoDelegations: MockUserProfileDto = {
   isRestricted: false,
 }
 
+export const userWithNoEmail: MockUserProfileDto = {
+  name: 'userWithNoEmail',
+  nationalId: createNationalId('person'),
+  mobilePhoneNumber: '1234567',
+  emailVerified: false,
+  mobilePhoneNumberVerified: true,
+  documentNotifications: true,
+  emailNotifications: true,
+  isRestricted: false,
+}
+
 export const userWithEmailNotificationsDisabled: MockUserProfileDto = {
   name: 'userWithEmailNotificationsDisabled',
   nationalId: createNationalId('person'),
@@ -101,6 +112,18 @@ export const userWithSendToDelegationsFeatureFlagDisabled: MockUserProfileDto =
     isRestricted: false,
   }
 
+export const companyUser: MockUserProfileDto = {
+  name: 'companyUser',
+  nationalId: createNationalId('company'),
+  mobilePhoneNumber: '1234567',
+  email: 'email@company.com',
+  emailVerified: true,
+  mobilePhoneNumberVerified: true,
+  documentNotifications: true,
+  emailNotifications: true,
+  isRestricted: false,
+}
+
 export const mockTemplateId = 'HNIPP.DEMO.ID'
 
 export const getMockHnippTemplate = ({
@@ -127,6 +150,8 @@ export const userProfiles = [
   userWithDocumentNotificationsDisabled,
   userWithFeatureFlagDisabled,
   userWithSendToDelegationsFeatureFlagDisabled,
+  userWithNoEmail,
+  companyUser,
 ]
 
 const delegations: Record<string, DelegationRecordDTO[]> = {
diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts
index aaaf8aec510b..49f10d6ca335 100644
--- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts
+++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts
@@ -10,6 +10,11 @@ import { FeatureFlagService } from '@island.is/nest/feature-flags'
 import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
 import { EmailService } from '@island.is/email-service'
 import { DelegationsApi } from '@island.is/clients/auth/delegation-api'
+import { CmsService } from '@island.is/clients/cms'
+import {
+  CompanyExtendedInfo,
+  CompanyRegistryClientService,
+} from '@island.is/clients/rsk/company-registry'
 
 import { UserNotificationsConfig } from '../../../../config'
 import { FIREBASE_PROVIDER } from '../../../../constants'
@@ -18,12 +23,15 @@ import { SequelizeConfigService } from '../../../sequelizeConfig.service'
 import { NotificationDispatchService } from '../notificationDispatch.service'
 import { Notification } from '../notification.model'
 import { NotificationsService } from '../notifications.service'
+import { NotificationsWorkerService } from './notificationsWorker.service'
 import { wait } from './helpers'
 import {
   MockDelegationsService,
   MockFeatureFlagService,
   MockNationalRegistryV3ClientService,
   MockUserNotificationsConfig,
+  companyUser,
+  userWithNoEmail,
   userWithDelegations,
   userWithDelegations2,
   userWithDocumentNotificationsDisabled,
@@ -36,7 +44,6 @@ import {
   userWithNoDelegations,
   userProfiles,
 } from './mocks'
-import { CmsService } from '@island.is/clients/cms'
 
 const workingHoursDelta = 1000 * 60 * 60 // 1 hour
 const insideWorkingHours = new Date(2021, 1, 1, 9, 0, 0)
@@ -74,7 +81,10 @@ describe('NotificationsWorkerService', () => {
   let queue: QueueService
   let notificationModel: typeof Notification
   let notificationsService: NotificationsService
+  let notificationsWorkerService: NotificationsWorkerService
   let userProfileApi: V2UsersApi
+  let nationalRegistryService: NationalRegistryV3ClientService
+  let companyRegistryService: CompanyRegistryClientService
 
   beforeAll(async () => {
     app = await testServer({
@@ -101,14 +111,15 @@ describe('NotificationsWorkerService', () => {
     })
 
     sequelize = await app.resolve(getConnectionToken() as Type<Sequelize>)
-    notificationDispatch = app.get<NotificationDispatchService>(
-      NotificationDispatchService,
-    )
-    emailService = app.get<EmailService>(EmailService)
-    queue = app.get<QueueService>(getQueueServiceToken('notifications'))
+    notificationDispatch = app.get(NotificationDispatchService)
+    emailService = app.get(EmailService)
+    queue = app.get(getQueueServiceToken('notifications'))
     notificationModel = app.get(getModelToken(Notification))
-    notificationsService = app.get<NotificationsService>(NotificationsService)
+    notificationsService = app.get(NotificationsService)
+    notificationsWorkerService = app.get(NotificationsWorkerService)
     userProfileApi = app.get(V2UsersApi)
+    nationalRegistryService = app.get(NationalRegistryV3ClientService)
+    companyRegistryService = app.get(CompanyRegistryClientService)
   })
 
   beforeEach(async () => {
@@ -131,6 +142,21 @@ describe('NotificationsWorkerService', () => {
     jest
       .spyOn(notificationsService, 'getTemplate')
       .mockReturnValue(Promise.resolve(getMockHnippTemplate({})))
+    jest.spyOn(notificationsWorkerService, 'createEmail')
+
+    jest.spyOn(nationalRegistryService, 'getName')
+
+    jest.spyOn(companyRegistryService, 'getCompany').mockReturnValue(
+      Promise.resolve<CompanyExtendedInfo>({
+        nationalId: '1234567890',
+        name: 'Test Company',
+        formOfOperation: [],
+        addresses: [],
+        relatedParty: [],
+        vat: [],
+        status: 'somestatus',
+      }),
+    )
   })
 
   afterAll(async () => {
@@ -361,6 +387,7 @@ describe('NotificationsWorkerService', () => {
   it('should not send email or push notification if no profile is found for recipient', async () => {
     await addToQueue('1234567890')
 
+    expect(notificationsWorkerService.createEmail).not.toHaveBeenCalled()
     expect(emailService.sendEmail).not.toHaveBeenCalled()
     expect(notificationDispatch.sendPushNotification).not.toHaveBeenCalled()
   })
@@ -379,6 +406,14 @@ describe('NotificationsWorkerService', () => {
     expect(notificationDispatch.sendPushNotification).toHaveBeenCalledTimes(1)
   })
 
+  it('should not send email if user has no email registered', async () => {
+    await addToQueue(userWithNoEmail.nationalId)
+
+    expect(notificationsWorkerService.createEmail).not.toHaveBeenCalled()
+    expect(emailService.sendEmail).not.toHaveBeenCalled()
+    expect(notificationDispatch.sendPushNotification).toHaveBeenCalledTimes(1)
+  })
+
   it('should not send email if user has email notifications disabled', async () => {
     await addToQueue(userWithEmailNotificationsDisabled.nationalId)
 
@@ -392,4 +427,22 @@ describe('NotificationsWorkerService', () => {
     expect(emailService.sendEmail).toHaveBeenCalledTimes(1)
     expect(notificationDispatch.sendPushNotification).not.toHaveBeenCalled()
   })
+
+  it('should call national registry for persons', async () => {
+    await addToQueue(userWithNoDelegations.nationalId)
+
+    expect(nationalRegistryService.getName).toHaveBeenCalledTimes(1)
+    expect(companyRegistryService.getCompany).not.toHaveBeenCalled()
+    expect(emailService.sendEmail).toHaveBeenCalledTimes(1)
+    expect(notificationDispatch.sendPushNotification).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call company registry for companies', async () => {
+    await addToQueue(companyUser.nationalId)
+
+    expect(nationalRegistryService.getName).not.toHaveBeenCalled()
+    expect(companyRegistryService.getCompany).toHaveBeenCalledTimes(1)
+    expect(emailService.sendEmail).toHaveBeenCalledTimes(1)
+    expect(notificationDispatch.sendPushNotification).not.toHaveBeenCalled()
+  })
 })
diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts
index f29420bfbbc4..0406fa17612a 100644
--- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts
+++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts
@@ -5,7 +5,10 @@ import { isCompany } from 'kennitala'
 
 import { User } from '@island.is/auth-nest-tools'
 import { DocumentsScope } from '@island.is/auth/scopes'
-import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
+import {
+  EinstaklingurDTONafnAllt,
+  NationalRegistryV3ClientService,
+} from '@island.is/clients/national-registry-v3'
 import {
   UserProfileDto,
   V2UsersApi,
@@ -32,6 +35,10 @@ import { CreateHnippNotificationDto } from '../dto/createHnippNotification.dto'
 import { NotificationsService } from '../notifications.service'
 import { HnippTemplate } from '../dto/hnippTemplate.response'
 import { Notification } from '../notification.model'
+import {
+  CompanyExtendedInfo,
+  CompanyRegistryClientService,
+} from '@island.is/clients/rsk/company-registry'
 
 const WORK_STARTING_HOUR = 8 // 8 AM
 const WORK_ENDING_HOUR = 23 // 11 PM
@@ -57,6 +64,7 @@ export class NotificationsWorkerService implements OnApplicationBootstrap {
     private readonly userProfileApi: V2UsersApi,
     private readonly delegationsApi: DelegationsApi,
     private readonly nationalRegistryService: NationalRegistryV3ClientService,
+    private readonly companyRegistryService: CompanyRegistryClientService,
     private readonly featureFlagService: FeatureFlagService,
     private readonly emailService: EmailService,
 
@@ -240,10 +248,13 @@ export class NotificationsWorkerService implements OnApplicationBootstrap {
       return
     }
 
-    if (!profile.email && !profile.emailNotifications) {
-      this.logger.info('User does not have email notifications enabled', {
-        messageId,
-      })
+    if (!profile.email || !profile.emailNotifications) {
+      this.logger.info(
+        'User does not have registered email or email notifications enabled',
+        {
+          messageId,
+        },
+      )
 
       return
     }
@@ -453,8 +464,15 @@ export class NotificationsWorkerService implements OnApplicationBootstrap {
   }
 
   private async getFullName(nationalId: string): Promise<string> {
-    const individual = await this.nationalRegistryService.getName(nationalId)
-    return individual?.fulltNafn ?? ''
+    let identity: CompanyExtendedInfo | EinstaklingurDTONafnAllt | null
+
+    if (isCompany(nationalId)) {
+      identity = await this.companyRegistryService.getCompany(nationalId)
+      return identity?.name ?? ''
+    }
+
+    identity = await this.nationalRegistryService.getName(nationalId)
+    return identity?.fulltNafn ?? ''
   }
 
   /* Private methods */
diff --git a/apps/services/user-notification/src/app/modules/notifications/tests/me-notifications.controller.spec.ts b/apps/services/user-notification/src/app/modules/notifications/tests/me-notifications.controller.spec.ts
index 5abf69310245..d89ce9488a07 100644
--- a/apps/services/user-notification/src/app/modules/notifications/tests/me-notifications.controller.spec.ts
+++ b/apps/services/user-notification/src/app/modules/notifications/tests/me-notifications.controller.spec.ts
@@ -12,130 +12,128 @@ import { AppModule } from '../../../app.module'
 import { SequelizeConfigService } from '../../../sequelizeConfig.service'
 import { DocumentsScope } from '@island.is/auth/scopes'
 
-describe('MeNotificationsController', () => {
-  beforeAll(async () => {
-    process.env.INIT_SCHEMA = 'true' // Disabling Firebase init
-  })
-
-  describe('No Auth', () => {
-    it.each`
-      method     | endpoint
-      ${'GET'}   | ${'/v1/me/notifications'}
-      ${'GET'}   | ${'/v1/me/notifications/some-notification-id'}
-      ${'GET'}   | ${'/v1/me/notifications/unread-count'}
-      ${'GET'}   | ${'/v1/me/notifications/unseen-count'}
-      ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
-    `(
-      '$method $endpoint should return 401 when user is unauthenticated',
-      async ({ method, endpoint }: TestEndpointOptions) => {
-        //Arrange
-        const app = await setupAppWithoutAuth({
-          AppModule: AppModule,
-          SequelizeConfigService: SequelizeConfigService,
-        })
-        const server = request(app.getHttpServer())
-
-        //Act
-        const res = await getRequestMethod(server, method)(endpoint)
-
-        //Assert
-        expect(res.status).toEqual(401)
-
-        app.cleanUp()
-      },
-    )
-  })
-
-  describe('With Auth No Scope', () => {
-    it.each`
-      method     | endpoint
-      ${'GET'}   | ${'/v1/me/notifications'}
-      ${'GET'}   | ${'/v1/me/notifications/some-notification-id'}
-      ${'GET'}   | ${'/v1/me/notifications/unread-count'}
-      ${'GET'}   | ${'/v1/me/notifications/unseen-count'}
-      ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
-    `(
-      '$method $endpoint should return 403 when user is unauthorized',
-      async ({ method, endpoint }: TestEndpointOptions) => {
-        //Arrange
-        const app = await setupApp({
-          AppModule,
-          SequelizeConfigService,
-          user: createCurrentUser({}),
-        })
-        const server = request(app.getHttpServer())
-
-        //Act
-        const res = await getRequestMethod(server, method)(endpoint)
-
-        //Assert
-        expect(res.status).toEqual(403)
-
-        app.cleanUp()
-      },
-    )
-  })
-
-  describe('GET With Auth And Scope', () => {
-    it.each`
-      method   | endpoint
-      ${'GET'} | ${'/v1/me/notifications/unread-count'}
-      ${'GET'} | ${'/v1/me/notifications/unseen-count'}
-    `(
-      '$method $endpoint should return 200 when user is authorized',
-      async ({ method, endpoint }: TestEndpointOptions) => {
-        //Arrange
-        const app = await setupApp({
-          AppModule,
-          SequelizeConfigService,
-          user: createCurrentUser({
-            scope: [DocumentsScope.main],
-          }),
-        })
-        const server = request(app.getHttpServer())
-
-        //Act
-        const res = await getRequestMethod(server, method)(endpoint)
-
-        //Assert
-        expect(res.status).toEqual(200)
-
-        app.cleanUp()
-      },
-    )
-  })
-
-  describe('PATCH With Auth And Scope', () => {
-    it.each`
-      method     | endpoint
-      ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
-      ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
-    `(
-      '$method $endpoint should return 204 when user is authorized',
-      async ({ method, endpoint }: TestEndpointOptions) => {
-        //Arrange
-        const app = await setupApp({
-          AppModule,
-          SequelizeConfigService,
-          user: createCurrentUser({
-            scope: [DocumentsScope.main],
-          }),
-        })
-        const server = request(app.getHttpServer())
-
-        //Act
-        const res = await getRequestMethod(server, method)(endpoint)
-
-        //Assert
-        expect(res.status).toEqual(204)
-
-        app.cleanUp()
-      },
-    )
-  })
+beforeAll(async () => {
+  process.env.INIT_SCHEMA = 'true' // Disabling Firebase init
+})
+
+describe('MeNotificationsController - No Auth', () => {
+  it.each`
+    method     | endpoint
+    ${'GET'}   | ${'/v1/me/notifications'}
+    ${'GET'}   | ${'/v1/me/notifications/some-notification-id'}
+    ${'GET'}   | ${'/v1/me/notifications/unread-count'}
+    ${'GET'}   | ${'/v1/me/notifications/unseen-count'}
+    ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
+  `(
+    '$method $endpoint should return 401 when user is unauthenticated',
+    async ({ method, endpoint }: TestEndpointOptions) => {
+      //Arrange
+      const app = await setupAppWithoutAuth({
+        AppModule: AppModule,
+        SequelizeConfigService: SequelizeConfigService,
+      })
+      const server = request(app.getHttpServer())
+
+      //Act
+      const res = await getRequestMethod(server, method)(endpoint)
+
+      //Assert
+      expect(res.status).toEqual(401)
+
+      app.cleanUp()
+    },
+  )
+})
+
+describe('MeNotificationsController - With Auth No Scope', () => {
+  it.each`
+    method     | endpoint
+    ${'GET'}   | ${'/v1/me/notifications'}
+    ${'GET'}   | ${'/v1/me/notifications/some-notification-id'}
+    ${'GET'}   | ${'/v1/me/notifications/unread-count'}
+    ${'GET'}   | ${'/v1/me/notifications/unseen-count'}
+    ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
+  `(
+    '$method $endpoint should return 403 when user is unauthorized',
+    async ({ method, endpoint }: TestEndpointOptions) => {
+      //Arrange
+      const app = await setupApp({
+        AppModule,
+        SequelizeConfigService,
+        user: createCurrentUser({}),
+      })
+      const server = request(app.getHttpServer())
+
+      //Act
+      const res = await getRequestMethod(server, method)(endpoint)
+
+      //Assert
+      expect(res.status).toEqual(403)
+
+      app.cleanUp()
+    },
+  )
+})
+
+describe('MeNotificationsController - GET With Auth And Scope', () => {
+  it.each`
+    method   | endpoint
+    ${'GET'} | ${'/v1/me/notifications/unread-count'}
+    ${'GET'} | ${'/v1/me/notifications/unseen-count'}
+  `(
+    '$method $endpoint should return 200 when user is authorized',
+    async ({ method, endpoint }: TestEndpointOptions) => {
+      //Arrange
+      const app = await setupApp({
+        AppModule,
+        SequelizeConfigService,
+        user: createCurrentUser({
+          scope: [DocumentsScope.main],
+        }),
+      })
+      const server = request(app.getHttpServer())
+
+      //Act
+      const res = await getRequestMethod(server, method)(endpoint)
+
+      //Assert
+      expect(res.status).toEqual(200)
+
+      app.cleanUp()
+    },
+  )
+})
+
+describe('MeNotificationsController - PATCH With Auth And Scope', () => {
+  it.each`
+    method     | endpoint
+    ${'PATCH'} | ${'/v1/me/notifications/some-notification-id'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-seen'}
+    ${'POST'}  | ${'/v1/me/notifications/mark-all-as-read'}
+  `(
+    '$method $endpoint should return 204 when user is authorized',
+    async ({ method, endpoint }: TestEndpointOptions) => {
+      //Arrange
+      const app = await setupApp({
+        AppModule,
+        SequelizeConfigService,
+        user: createCurrentUser({
+          scope: [DocumentsScope.main],
+        }),
+      })
+      const server = request(app.getHttpServer())
+
+      //Act
+      const res = await getRequestMethod(server, method)(endpoint)
+
+      //Assert
+      expect(res.status).toEqual(204)
+
+      app.cleanUp()
+    },
+  )
 })
diff --git a/apps/services/user-notification/test/environment.ts b/apps/services/user-notification/test/environment.ts
index 2e16defc6436..77956bffa36e 100644
--- a/apps/services/user-notification/test/environment.ts
+++ b/apps/services/user-notification/test/environment.ts
@@ -5,6 +5,8 @@ export const environment = {
   SQS_ACCESS_KEY: 'testing',
   SQS_SECRET_ACCESS_KEY: 'testing',
   SERVICE_PORTAL_CLICK_ACTION_URL: 'https://island.is/minarsidur',
+  // Disable redis registration during testing
+  REDIS_URL_NODE_01: '[]',
 } as const
 
 process.env = {
diff --git a/apps/services/user-notification/test/globalSetup.ts b/apps/services/user-notification/test/globalSetup.ts
index 04335679b565..ffddcda16d97 100644
--- a/apps/services/user-notification/test/globalSetup.ts
+++ b/apps/services/user-notification/test/globalSetup.ts
@@ -3,14 +3,10 @@ import { register } from 'tsconfig-paths'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsConfig = require(`../${require('../tsconfig.json').extends}`)
 register({ baseUrl: './', paths: tsConfig.compilerOptions.paths })
+import { startPostgres, startLocalstack } from '@island.is/testing/containers'
 import { CreateQueueCommand, SQSClient } from '@aws-sdk/client-sqs'
 import { environment } from './environment'
 import { logger } from '@island.is/logging'
-import {
-  startPostgres,
-  startLocalstack,
-  startRedis,
-} from '@island.is/testing/containers'
 
 const setupSqsQueue = async () => {
   try {
@@ -41,7 +37,7 @@ const setupSqsQueue = async () => {
 }
 
 export default async () => {
-  await Promise.all([startPostgres(), startLocalstack(), startRedis()])
+  await Promise.all([startPostgres(), startLocalstack()])
 
   // Setting up the SQS queue to prevent concurrent issues between spec files.
   await setupSqsQueue()
diff --git a/apps/services/user-notification/test/globalTeardown.ts b/apps/services/user-notification/test/globalTeardown.ts
index e49d09c31312..8a747ae41079 100644
--- a/apps/services/user-notification/test/globalTeardown.ts
+++ b/apps/services/user-notification/test/globalTeardown.ts
@@ -3,12 +3,8 @@ import { register } from 'tsconfig-paths'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsConfig = require(`../${require('../tsconfig.json').extends}`)
 register({ baseUrl: './', paths: tsConfig.compilerOptions.paths })
-import {
-  stopLocalstack,
-  stopPostgres,
-  stopRedis,
-} from '@island.is/testing/containers'
+import { stopLocalstack, stopPostgres } from '@island.is/testing/containers'
 
 export default async () => {
-  await Promise.all([stopLocalstack(), stopPostgres(), stopRedis()])
+  await Promise.all([stopLocalstack(), stopPostgres()])
 }
diff --git a/apps/skilavottord/ws/src/app/modules/recyclingRequest/recyclingRequest.service.ts b/apps/skilavottord/ws/src/app/modules/recyclingRequest/recyclingRequest.service.ts
index 653525a1e904..c72768a0509b 100644
--- a/apps/skilavottord/ws/src/app/modules/recyclingRequest/recyclingRequest.service.ts
+++ b/apps/skilavottord/ws/src/app/modules/recyclingRequest/recyclingRequest.service.ts
@@ -41,6 +41,9 @@ export class RecyclingRequestService {
     disposalStation: string,
     mileage = 0,
   ) {
+    const apiVersion = '3.0'
+    const apiVersionParam = '?api-version=' + apiVersion
+
     try {
       const { restAuthUrl, restDeRegUrl, restUsername, restPassword } =
         environment.samgongustofa
@@ -51,10 +54,12 @@ export class RecyclingRequestService {
       const jsonAuthBody = JSON.stringify(jsonObj)
       const headerAuthRequest = {
         'Content-Type': 'application/json',
+        'Api-version': apiVersion,
       }
+
       // TODO: saved jToken and use it in next 7 days ( until it expires )
       const authRes = await lastValueFrom(
-        this.httpService.post(restAuthUrl, jsonAuthBody, {
+        this.httpService.post(restAuthUrl + apiVersionParam, jsonAuthBody, {
           headers: headerAuthRequest,
         }),
       )
@@ -75,9 +80,11 @@ export class RecyclingRequestService {
       const headerDeRegRequest = {
         'Content-Type': 'application/json',
         Authorization: 'Bearer ' + jToken,
+        'Api-version': apiVersion,
       }
+
       const deRegRes = await lastValueFrom(
-        this.httpService.post(restDeRegUrl, jsonDeRegBody, {
+        this.httpService.post(restDeRegUrl + apiVersionParam, jsonDeRegBody, {
           headers: headerDeRegRequest,
         }),
       )
@@ -88,9 +95,11 @@ export class RecyclingRequestService {
           `Failed on deregisterd on deRegisterVehicle with status: ${deRegRes.statusText}`,
         )
       }
-    } catch (err) {
-      delete err.data
-      this.logger.error(`Failed to deregister vehicle`, { error: err })
+    } catch (error) {
+      if (error?.config) {
+        error.config.data = undefined
+      }
+      this.logger.error(`Failed to deregister vehicle`, { error })
       throw new Error(`Failed to deregister vehicle ${vehiclePermno.slice(-3)}`)
     }
   }
diff --git a/apps/skilavottord/ws/src/app/services/icelandicTransportAuthority.services.ts b/apps/skilavottord/ws/src/app/services/icelandicTransportAuthority.services.ts
index 83062615d9e5..d56f9873585e 100644
--- a/apps/skilavottord/ws/src/app/services/icelandicTransportAuthority.services.ts
+++ b/apps/skilavottord/ws/src/app/services/icelandicTransportAuthority.services.ts
@@ -55,7 +55,9 @@ export class IcelandicTransportAuthorityServices {
 
       return authRes.data['jwtToken']
     } catch (error) {
-      delete error.config
+      if (error?.config) {
+        error.config.data = undefined
+      }
       logger.error('car-recycling: Authentication failed on information', error)
       throw error
     }
diff --git a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/mocks/education.mock.ts b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/mocks/education.mock.ts
new file mode 100644
index 000000000000..1a13f965d729
--- /dev/null
+++ b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/mocks/education.mock.ts
@@ -0,0 +1,203 @@
+import { addXroadMock } from '../../../../../support/wire-mocks'
+import { HttpMethod, Response } from '@anev/ts-mountebank'
+import {
+  Education,
+  HealthInsurance,
+} from '../../../../../../../../infra/src/dsl/xroad'
+import { StudentAssessmentViewModel } from '@island.is/clients/mms/grade'
+
+const mockObject: StudentAssessmentViewModel = {
+  einkunnir: [
+    {
+      bekkur: 4,
+      namsgreinar: [
+        {
+          heiti: 'Testlenskan',
+          dagsetning: new Date(1990, 1, 1),
+          haefnieinkunn: 'Glæsó',
+          haefnieinkunnStada: 'A+123',
+          samtals: {
+            heiti: 'bing',
+            radeinkunn: {
+              einkunn: '99',
+              heiti: 'Raðeinkunn',
+              vaegi: 0,
+            },
+            grunnskolaeinkunn: {
+              einkunn: '67',
+              heiti: 'Grunnskólaeinkunn',
+              vaegi: 0,
+            },
+          },
+          framfaraTexti: {
+            einkunn: 'Framfarir eru flottar og mikilvægar jibbí',
+            heiti: 'Framfaratexti',
+            vaegi: 0,
+          },
+          einkunnir: [
+            {
+              heiti: 'Lesskilningur',
+              radeinkunn: {
+                einkunn: '896',
+                heiti: 'Lesskilningur, raðeinkunn',
+                vaegi: 97,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '2',
+                heiti: 'Lesskilningur, Grunnskólaeinkunn',
+                vaegi: 97,
+              },
+            },
+            {
+              heiti: 'Málnotkun',
+              radeinkunn: {
+                einkunn: '896',
+                heiti: 'Málnotkun, raðeinkunn',
+                vaegi: 64,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '2',
+                heiti: 'Málnotkun, Grunnskólaeinkunn',
+                vaegi: 965,
+              },
+            },
+          ],
+          ordOgTalnadaemi: {
+            einkunn: 'Test svipað gott í öllum fögum',
+            heiti: 'Frammistaða í hinu og þessu',
+            vaegi: 0,
+          },
+        },
+        {
+          heiti: 'Stærðófræðó',
+          dagsetning: new Date(1650, 1, 1),
+          haefnieinkunn: 'Slæm',
+          haefnieinkunnStada: 'F--',
+          samtals: {
+            heiti: 'bunrb',
+            radeinkunn: {
+              einkunn: '3',
+              heiti: 'Raðeinkunn',
+              vaegi: 0,
+            },
+            grunnskolaeinkunn: {
+              einkunn: '8765',
+              heiti: 'Grunnskólaeinkunn',
+              vaegi: 0,
+            },
+          },
+          framfaraTexti: {
+            einkunn: 'Framfarir eru lit',
+            heiti: 'Framfaratexti',
+            vaegi: 0,
+          },
+          einkunnir: [
+            {
+              heiti: 'Samlagning',
+              radeinkunn: {
+                einkunn: '88',
+                heiti: 'Samlagning, raðeinkunn',
+                vaegi: 97,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '287692',
+                heiti: 'Samlagning, Grunnskólaeinkunn',
+                vaegi: 97,
+              },
+            },
+            {
+              heiti: 'Ekki gera vitlaust',
+              radeinkunn: {
+                einkunn: '89756',
+                heiti: 'Málnotkun, raðeinkunn',
+                vaegi: 64,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '-7654',
+                heiti: 'Málnotkun, Grunnskólaeinkunn',
+                vaegi: 965,
+              },
+            },
+          ],
+          ordOgTalnadaemi: {
+            einkunn: 'L+elegt',
+            heiti: 'Frekar',
+            vaegi: 0,
+          },
+        },
+      ],
+    },
+    {
+      bekkur: 9,
+      namsgreinar: [
+        {
+          heiti: 'Bíngó',
+          dagsetning: new Date(1990, 1, 1),
+          haefnieinkunn: 'Glæsó',
+          haefnieinkunnStada: 'A+123',
+          samtals: {
+            heiti: 'goieo',
+            radeinkunn: {
+              einkunn: '99',
+              heiti: 'Raðeinkunn',
+              vaegi: 0,
+            },
+            grunnskolaeinkunn: {
+              einkunn: '67',
+              heiti: 'Grunnskólaeinkunn',
+              vaegi: 0,
+            },
+          },
+          framfaraTexti: {
+            einkunn: 'Framfarir eru flottar og mikilvægar jibbí',
+            heiti: 'Framfaratexti',
+            vaegi: 0,
+          },
+          einkunnir: [
+            {
+              heiti: 'Lesskilningur',
+              radeinkunn: {
+                einkunn: '896',
+                heiti: 'Lesskilningur, raðeinkunn',
+                vaegi: 97,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '2',
+                heiti: 'Lesskilningur, Grunnskólaeinkunn',
+                vaegi: 97,
+              },
+            },
+            {
+              heiti: 'Málnotkun',
+              radeinkunn: {
+                einkunn: '896',
+                heiti: 'Málnotkun, raðeinkunn',
+                vaegi: 64,
+              },
+              grunnskolaeinkunn: {
+                einkunn: '2',
+                heiti: 'Málnotkun, Grunnskólaeinkunn',
+                vaegi: 965,
+              },
+            },
+          ],
+          ordOgTalnadaemi: {
+            einkunn: 'Bah',
+            heiti: 'Hab',
+            vaegi: 0,
+          },
+        },
+      ],
+    },
+  ],
+}
+
+export const loadEducationXroadMocks = async () => {
+  await addXroadMock({
+    prefixType: 'only-base-path',
+    config: Education,
+    prefix: 'XROAD_MMS_GRADE_SERVICE_ID',
+    apiPath: '/api/v2/public/studentAssessments/0101302399',
+    response: [new Response().withJSONBody(mockObject)],
+  })
+}
diff --git a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts
index 3f48d47a8bee..1be727f724d3 100644
--- a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts
+++ b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts
@@ -8,6 +8,7 @@ import { loadHealthInsuranceXroadMocks } from './mocks/healthInsurance.mock'
 import { loadSocialInsuranceXroadMocks } from './mocks/socialInsurance.mock'
 import { loadLicensesXroadMocks } from './mocks/licenses.mock'
 import { loadOccupationalLicensesXroadMocks } from './mocks/occupationalLicenses.mock'
+import { loadEducationXroadMocks } from './mocks/education.mock'
 
 export const setupXroadMocks = async () => {
   await resetMocks()
@@ -18,6 +19,7 @@ export const setupXroadMocks = async () => {
   await loadSocialInsuranceXroadMocks()
   await loadLicensesXroadMocks()
   await loadOccupationalLicensesXroadMocks()
+  await loadEducationXroadMocks()
 
   const { envs } = getEnvVariables(Base.getEnv(), 'system-e2e', env)
   const xroadBasePath = envs['XROAD_BASE_PATH']
diff --git a/apps/web/components/GenericList/GenericList.tsx b/apps/web/components/GenericList/GenericList.tsx
index f10d5f04612d..a25fc35baf2b 100644
--- a/apps/web/components/GenericList/GenericList.tsx
+++ b/apps/web/components/GenericList/GenericList.tsx
@@ -71,9 +71,9 @@ interface ItemProps {
   item: GenericListItem
 }
 
-const NonClickableItem = ({ item }: ItemProps) => {
+export const NonClickableItem = ({ item }: ItemProps) => {
   const { format } = useDateUtils()
-
+  const filterTags = item.filterTags ?? []
   return (
     <Box
       padding={[2, 2, 3]}
@@ -95,29 +95,44 @@ const NonClickableItem = ({ item }: ItemProps) => {
             <Box>{webRichText(item.cardIntro ?? [])}</Box>
           )}
         </Stack>
-        <Inline space={1}>
-          {item.filterTags?.map((tag) => (
-            <Tag disabled={true} variant="purple" outlined={true} key={tag.id}>
-              {tag.title}
-            </Tag>
-          ))}
-        </Inline>
+        {filterTags.length > 0 && (
+          <Inline space={1}>
+            {filterTags.map((tag) => (
+              <Tag
+                disabled={true}
+                variant="purple"
+                outlined={true}
+                key={tag.id}
+              >
+                {tag.title}
+              </Tag>
+            ))}
+          </Inline>
+        )}
       </Stack>
     </Box>
   )
 }
 
-const ClickableItem = ({ item }: ItemProps) => {
+interface ClickableItemProps {
+  item: ItemProps['item']
+  baseUrl?: string
+}
+
+export const ClickableItem = ({ item, baseUrl }: ClickableItemProps) => {
   const { format } = useDateUtils()
   const router = useRouter()
 
-  const pathname = new URL(router.asPath, 'https://island.is').pathname
+  const pathname = new URL(baseUrl || router.asPath, 'https://island.is')
+    .pathname
 
   let href = item.slug ? `${pathname}/${item.slug}` : undefined
   if (item.assetUrl) {
     href = item.assetUrl
   }
 
+  const filterTags = item.filterTags ?? []
+
   return (
     <FocusableBox
       padding={[2, 2, 3]}
@@ -154,18 +169,20 @@ const ClickableItem = ({ item }: ItemProps) => {
               <Box>{webRichText(item.cardIntro ?? [])}</Box>
             )}
           </Box>
-          <Inline space={1}>
-            {item.filterTags?.map((tag) => (
-              <Tag
-                disabled={true}
-                variant="purple"
-                outlined={true}
-                key={tag.id}
-              >
-                {tag.title}
-              </Tag>
-            ))}
-          </Inline>
+          {filterTags.length > 0 && (
+            <Inline space={1}>
+              {filterTags.map((tag) => (
+                <Tag
+                  disabled={true}
+                  variant="purple"
+                  outlined={true}
+                  key={tag.id}
+                >
+                  {tag.title}
+                </Tag>
+              ))}
+            </Inline>
+          )}
         </Stack>
       </Box>
     </FocusableBox>
@@ -559,19 +576,13 @@ export const GenericListWrapper = ({
         <GridRow rowGap={3}>
           {!itemsAreClickable &&
             items.map((item) => (
-              <GridColumn
-                key={item.id}
-                span={['1/1', '1/1', '1/1', '1/1', '1/2']}
-              >
+              <GridColumn key={item.id} span="1/1">
                 <NonClickableItem item={item} />
               </GridColumn>
             ))}
           {itemsAreClickable &&
             items.map((item) => (
-              <GridColumn
-                key={item.id}
-                span={['1/1', '1/1', '1/1', '1/1', '1/2']}
-              >
+              <GridColumn key={item.id} span="1/1">
                 <ClickableItem item={item} />
               </GridColumn>
             ))}
diff --git a/apps/web/components/GenericList/LatestGenericListItems/LatestGenericListItems.tsx b/apps/web/components/GenericList/LatestGenericListItems/LatestGenericListItems.tsx
new file mode 100644
index 000000000000..2ea75b950012
--- /dev/null
+++ b/apps/web/components/GenericList/LatestGenericListItems/LatestGenericListItems.tsx
@@ -0,0 +1,75 @@
+import { Box, Button, LinkV2, Stack } from '@island.is/island-ui/core'
+import { Text } from '@island.is/island-ui/core'
+import { LatestGenericListItems as LatestGenericListItemsSchema } from '@island.is/web/graphql/schema'
+import { useLinkResolver } from '@island.is/web/hooks'
+
+import { ClickableItem, NonClickableItem } from '../GenericList'
+
+interface LatestGenericListItemsProps {
+  slice: LatestGenericListItemsSchema
+}
+
+export const LatestGenericListItems = ({
+  slice,
+}: LatestGenericListItemsProps) => {
+  const { linkResolver } = useLinkResolver()
+
+  const items = slice.itemResponse?.items ?? []
+  if (items.length === 0) {
+    return null
+  }
+
+  const itemsAreClickable = slice.genericList?.itemType === 'Clickable'
+
+  // Only allow organization subpage links as is
+  let seeMoreLinkHref = ''
+  if (
+    slice.seeMorePage?.__typename === 'OrganizationSubpage' &&
+    slice.seeMorePage.organizationPage?.slug &&
+    slice.seeMorePage.slug
+  ) {
+    seeMoreLinkHref = linkResolver('organizationsubpage', [
+      slice.seeMorePage.organizationPage.slug,
+      slice.seeMorePage.slug,
+    ]).href
+  }
+
+  return (
+    <Stack space={6}>
+      <Stack space={3}>
+        {slice.title && <Text variant="h2">{slice.title}</Text>}
+        <Stack space={4}>
+          {!itemsAreClickable &&
+            items.map((item) => <NonClickableItem key={item.id} item={item} />)}
+          {itemsAreClickable &&
+            items.map((item) => (
+              <ClickableItem
+                key={item.id}
+                item={item}
+                baseUrl={seeMoreLinkHref}
+              />
+            ))}
+        </Stack>
+      </Stack>
+      {slice.seeMoreLinkText && seeMoreLinkHref && (
+        <Box
+          display="flex"
+          flexDirection="row"
+          justifyContent="flexEnd"
+          alignItems="center"
+        >
+          <LinkV2 href={seeMoreLinkHref}>
+            <Button
+              icon="arrowForward"
+              iconType="filled"
+              variant="text"
+              as="span"
+            >
+              {slice.seeMoreLinkText}
+            </Button>
+          </LinkV2>
+        </Box>
+      )}
+    </Stack>
+  )
+}
diff --git a/apps/web/components/Organization/Slice/SliceMachine.tsx b/apps/web/components/Organization/Slice/SliceMachine.tsx
index dff0592cd94d..23ec73dd0095 100644
--- a/apps/web/components/Organization/Slice/SliceMachine.tsx
+++ b/apps/web/components/Organization/Slice/SliceMachine.tsx
@@ -103,6 +103,10 @@ const ChartNumberBox = dynamic(() =>
   import('@island.is/web/components').then((mod) => mod.ChartNumberBox),
 )
 
+const LatestGenericListItems = dynamic(() =>
+  import('@island.is/web/components').then((mod) => mod.LatestGenericListItems),
+)
+
 interface SliceMachineProps {
   slice: Slice
   namespace?: Record<string, string>
@@ -212,6 +216,9 @@ const renderSlice = (
       )
     case 'ChartNumberBox':
       return <ChartNumberBox slice={slice} />
+    case 'LatestGenericListItems': {
+      return <LatestGenericListItems slice={slice} />
+    }
     default:
       return <RichText body={[slice]} />
   }
diff --git a/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx b/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
index 68734ed33293..c97ec5516c7f 100644
--- a/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
+++ b/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
@@ -1,4 +1,11 @@
-import React, { ReactNode, useEffect, useMemo, useState } from 'react'
+import React, {
+  PropsWithChildren,
+  ReactNode,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react'
+import { IntlConfig, IntlProvider } from 'react-intl'
 import { useWindowSize } from 'react-use'
 import NextLink from 'next/link'
 import { useRouter } from 'next/router'
@@ -838,25 +845,54 @@ const getActiveNavigationItemTitle = (
     }
   }
 }
+
+interface TranslationNamespaceProviderProps {
+  messages: IntlConfig['messages']
+}
+
+const TranslationNamespaceProvider = ({
+  messages,
+  children,
+}: PropsWithChildren<TranslationNamespaceProviderProps>) => {
+  const { activeLocale } = useI18n()
+
+  return (
+    <IntlProvider locale={activeLocale} messages={messages}>
+      {children}
+    </IntlProvider>
+  )
+}
+
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore make web strict
 const renderConnectedComponent = (slice) => {
   if (!slice?.componentType) return null
 
+  let connectedComponent = null
+
   switch (slice.componentType) {
     case 'LatestNewsCard':
-      return (
+      connectedComponent = (
         <LatestNewsCardConnectedComponent key={slice?.id} {...slice?.json} />
       )
+      break
     case 'Fiskistofa/ShipSearchSidebarInput':
-      return (
-        <SidebarShipSearchInput key={slice?.id} namespace={slice?.json ?? {}} />
-      )
+      connectedComponent = <SidebarShipSearchInput key={slice?.id} />
+      break
     case 'OrganizationSearchBox':
-      return <SearchBox key={slice?.id} {...slice?.json} />
+      connectedComponent = <SearchBox key={slice?.id} {...slice?.json} />
+      break
     default:
       return null
   }
+
+  return (
+    <TranslationNamespaceProvider
+      messages={slice.translationStrings ?? slice.json ?? {}}
+    >
+      {connectedComponent}
+    </TranslationNamespaceProvider>
+  )
 }
 
 export const OrganizationWrapper: React.FC<
diff --git a/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/AdministrationOfOccupationalSafetyAndHealthCourses.tsx b/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/AdministrationOfOccupationalSafetyAndHealthCourses.tsx
index 337f945e1d21..d29a58cda6fb 100644
--- a/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/AdministrationOfOccupationalSafetyAndHealthCourses.tsx
+++ b/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/AdministrationOfOccupationalSafetyAndHealthCourses.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQuery } from '@apollo/client/react'
 
 import {
@@ -11,11 +12,11 @@ import {
 } from '@island.is/island-ui/core'
 import { BorderAbove } from '@island.is/web/components'
 import { ConnectedComponent, Query } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
 import { extractHeadingLevels } from '@island.is/web/utils/navigation'
 
 import { GET_ADMINISTRATION_OF_SAFETY_AND_HEALTH_COURSES_QUERY } from './queries'
+import { translation as translationStrings } from './translation.strings'
 import { getCurrencyString, parseDateString } from './utils'
 
 const normalizesAndMatch = (value1: string, value2: string) => {
@@ -31,8 +32,8 @@ type ListState = 'loading' | 'loaded' | 'error'
 const AdministrationOfOccupationalSafetyAndHealthCourses = ({
   slice,
 }: AdministrationOfOccupationalSafetyAndHealthCoursesProps) => {
-  const n = useNamespace(slice.json ?? {})
   const { format } = useDateUtils()
+  const { formatMessage } = useIntl()
 
   const title = slice.json?.title ?? null
   const hasBorderAbove = slice.configJson?.hasBorderAbove ?? false
@@ -99,15 +100,17 @@ const AdministrationOfOccupationalSafetyAndHealthCourses = ({
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n('errorMessage', 'Ekki tókst að sækja áfengisleyfi.')}
+          title={formatMessage(translationStrings.errorTitle)}
+          message={formatMessage(translationStrings.errorMessage)}
           type="error"
         />
       )}
 
       {listState === 'loaded' && courses.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">{n('noResults', 'Engin Námskeið fundust.')}</Text>
+          <Text variant="h3">
+            {formatMessage(translationStrings.noResults)}
+          </Text>
         </Box>
       )}
       {listState === 'loaded' && courses.length > 0 && (
@@ -168,19 +171,19 @@ const AdministrationOfOccupationalSafetyAndHealthCourses = ({
                   >
                     <Box style={{ flex: '0 0 50%' }}>
                       <Text>
-                        {n('validPeriodLabel', 'Dagsetning')}:{' '}
+                        {formatMessage(translationStrings.validPeriodLabel)}:{' '}
                         {dateFrom !== dateTo
                           ? dateFrom + ' - ' + dateTo
                           : dateFrom}
                       </Text>
                       <Text paddingBottom={2}>
-                        {n('time', 'Klukkan')}: {course.time}
+                        {formatMessage(translationStrings.time)}: {course.time}
                       </Text>
                     </Box>
 
                     <Box paddingLeft={[0, 0, 0, 2]}>
                       <Text>
-                        {n('price', 'Verð')}:{' '}
+                        {formatMessage(translationStrings.price)}:{' '}
                         {getCurrencyString(course.price || 0)}
                       </Text>
                     </Box>
diff --git a/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/translation.strings.ts b/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/translation.strings.ts
new file mode 100644
index 000000000000..8379f4468caf
--- /dev/null
+++ b/apps/web/components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/translation.strings.ts
@@ -0,0 +1,34 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  errorTitle: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Titill á villu skilaboðum',
+  },
+  errorMessage: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja námskeið.',
+    description: 'Texti fyrir villu skilaboð',
+  },
+  noResults: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:noResults',
+    defaultMessage: 'Engin Námskeið fundust.',
+    description: 'Texti þegar engin námskeið finnast',
+  },
+  validPeriodLabel: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:validPeriodLabel',
+    defaultMessage: 'Dagsetning',
+    description: 'Texti fyrir framan dagsetningar á námskeiða spjöldum',
+  },
+  time: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:time',
+    defaultMessage: 'Klukkan',
+    description: 'Texti fyrir framan tímasetningu á námskeiða spjöldum',
+  },
+  price: {
+    id: 'web.administrationOfOccupationalSafetyAndHealthCourses:price',
+    defaultMessage: 'Verð',
+    description: 'Texti fyrir framan verð á námskeiða spjöldum',
+  },
+})
diff --git a/apps/web/components/connected/DrivingInstructorList/DrivingInstructorList.tsx b/apps/web/components/connected/DrivingInstructorList/DrivingInstructorList.tsx
index daafb38fcf8e..53853ed68285 100644
--- a/apps/web/components/connected/DrivingInstructorList/DrivingInstructorList.tsx
+++ b/apps/web/components/connected/DrivingInstructorList/DrivingInstructorList.tsx
@@ -1,4 +1,7 @@
+import { useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQuery } from '@apollo/client'
+
 import {
   AlertMessage,
   Box,
@@ -13,9 +16,9 @@ import {
   GetDrivingInstructorsQuery,
   GetDrivingInstructorsQueryVariables,
 } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { GET_DRIVING_INSTRUCTORS_QUERY } from '@island.is/web/screens/queries/DrivingInstructors'
-import { useState } from 'react'
+
+import { translation as translationStrings } from './translation.strings'
 
 const DEFAULT_ITEMS_PER_PAGE = 10
 
@@ -79,7 +82,7 @@ interface DrivingInstructorListProps {
 
 const DrivingInstructorList = ({ slice }: DrivingInstructorListProps) => {
   const [selectedPage, setSelectedPage] = useState(1)
-  const n = useNamespace(slice?.json ?? {})
+  const { formatMessage } = useIntl()
   const [searchValue, setSearchValue] = useState('')
 
   const { data, error, loading, called } = useQuery<
@@ -104,7 +107,7 @@ const DrivingInstructorList = ({ slice }: DrivingInstructorListProps) => {
       <Box marginBottom={4}>
         <Input
           name="driving-license-input"
-          placeholder={n('searchPlaceholder', 'Leita')}
+          placeholder={formatMessage(translationStrings.searchPlaceholder)}
           backgroundColor={['blue', 'blue', 'white']}
           size="sm"
           icon={{
@@ -122,15 +125,15 @@ const DrivingInstructorList = ({ slice }: DrivingInstructorListProps) => {
       {called && !loading && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja ökukennara')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
 
       {called && !loading && !error && !filteredInstructors?.length && (
         <Box display="flex" justifyContent="center">
           <Text fontWeight="semiBold">
-            {n('noResultsFound', 'Engir ökukennarar fundust')}
+            {formatMessage(translationStrings.noResultsFound)}
           </Text>
         </Box>
       )}
@@ -146,16 +149,18 @@ const DrivingInstructorList = ({ slice }: DrivingInstructorListProps) => {
           <T.Table>
             <T.Head>
               <T.HeadData>
-                <Text fontWeight="semiBold">{n('name', 'Nafn')}</Text>
+                <Text fontWeight="semiBold">
+                  {formatMessage(translationStrings.name)}
+                </Text>
               </T.HeadData>
               <T.HeadData>
                 <Text fontWeight="semiBold">
-                  {n('nationalId', 'Kennitala')}
+                  {formatMessage(translationStrings.nationalId)}
                 </Text>
               </T.HeadData>
               <T.HeadData>
                 <Text fontWeight="semiBold">
-                  {n('driverLicenseId', 'Ökuréttindisnúmer')}
+                  {formatMessage(translationStrings.driverLicenseId)}
                 </Text>
               </T.HeadData>
             </T.Head>
diff --git a/apps/web/components/connected/DrivingInstructorList/translation.strings.ts b/apps/web/components/connected/DrivingInstructorList/translation.strings.ts
new file mode 100644
index 000000000000..48b5359ffd73
--- /dev/null
+++ b/apps/web/components/connected/DrivingInstructorList/translation.strings.ts
@@ -0,0 +1,39 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  searchPlaceholder: {
+    id: 'web.drivingInstructorList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Titill á placeholder í leitarglugga',
+  },
+  errorOccurredTitle: {
+    id: 'web.drivingInstructorList:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill á villu skilaboðum',
+  },
+  errorOccurredMessage: {
+    id: 'web.drivingInstructorList:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja ökukennara',
+    description: 'Texti fyrir villu skilaboð',
+  },
+  noResultsFound: {
+    id: 'web.drivingInstructorList:noResultsFound',
+    defaultMessage: 'Engir ökukennarar fundust',
+    description: 'Texti þegar engin námskeið finnast',
+  },
+  name: {
+    id: 'web.drivingInstructorList:name',
+    defaultMessage: 'Nafn',
+    description: 'Texti fyrir nafn í töflu haus',
+  },
+  nationalId: {
+    id: 'web.drivingInstructorList:nationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Texti fyrir kennitölu í töflu haus',
+  },
+  driverLicenseId: {
+    id: 'web.drivingInstructorList:driverLicenseId',
+    defaultMessage: 'Ökuréttindisnúmer',
+    description: 'Texti fyrir ökuréttindisnúmer í töflu haus',
+  },
+})
diff --git a/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/GrindavikResidentialPropertyPurchaseCalculator.tsx b/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/GrindavikResidentialPropertyPurchaseCalculator.tsx
index f46110257a54..35295b5f4b9b 100644
--- a/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/GrindavikResidentialPropertyPurchaseCalculator.tsx
+++ b/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/GrindavikResidentialPropertyPurchaseCalculator.tsx
@@ -1,5 +1,6 @@
 import { useRef, useState } from 'react'
 import { FormProvider, useFieldArray, useForm, useWatch } from 'react-hook-form'
+import { useIntl } from 'react-intl'
 import isEqual from 'lodash/isEqual'
 
 import {
@@ -12,10 +13,9 @@ import {
 } from '@island.is/island-ui/core'
 import { InputController } from '@island.is/shared/form-fields'
 import { ConnectedComponent } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
-import { useI18n } from '@island.is/web/i18n'
 import { formatCurrency } from '@island.is/web/utils/currency'
 
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './GrindavikResidentialPropertyPurchaseCalculator.css'
 
 interface ResultState {
@@ -88,7 +88,7 @@ const focusLoanInput = (index: number, delay = 100) => {
 const GrindavikResidentialPropertyPurchaseCalculator = ({
   slice,
 }: GrindavikResidentialPropertyPurchaseCalculatorProps) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const methods = useForm<InputState>({
     defaultValues: { loans: [{ value: undefined }] },
   })
@@ -96,7 +96,7 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
     name: 'loans',
     control: methods.control,
   })
-  const { activeLocale } = useI18n()
+
   const resultContainerRef = useRef<HTMLDivElement>(null)
 
   const fireInsuranceValue = methods.watch('fireInsuranceValue')
@@ -128,31 +128,18 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
     setResultState(calculateResultState(inputState, thorkatlaPurchasePrice))
   }
 
-  const mainHeading = n(
-    'mainHeading',
-    'Útreikningur vegna uppkaupa fasteigna í Grindavík',
-  )
-  const currencySuffix = n('currencySuffix', ' krónur') as string
+  const mainHeading = formatMessage(translationStrings.mainHeading)
+  const currencySuffix = formatMessage(translationStrings.currencySuffix)
 
   const canCalculate = !isEqual(resultState?.inputState, inputState)
 
   const maxLength = (slice.configJson?.maxLength ?? 11) + currencySuffix.length
 
-  const thorkatlaPaymentDisclaimer = n(
-    'thorkatlaPaymentDisclaimer',
-    'Seljandi getur valið afhendingardagsetningu minnst 1 mánuði frá kaupsamningi og mest 3 mánuðum frá kaupsamningi. Afsal fer fram einum mánuði frá afhendingu.',
-  )
-  const purchaseAgreementPaymentDisclaimer = n(
-    'purchaseAgreementPaymentDisclaimer',
-    '*Greiðslur frá félaginu fara til eigenda í samræmi við eignarhlutfall.',
-  )
-  const closingResultDisclaimer = n(
-    'closingResultDisclaimer',
-    '**Í afsalsgreiðslu fer fram lögskilauppgjör sem kemur til hækkunar eða lækkunar á afsalsgreiðslu.',
+  const thorkatlaPaymentDisclaimer = formatMessage(
+    translationStrings.thorkatlaPaymentDisclaimer,
   )
-  const loanDisclaimer = n(
-    'loanDisclaimer',
-    'Samtal er enn í gangi við lífeyrissjóði um þátttöku þeirra í úrræðinu. Vonast er til þess að niðurstaða liggi fyrir fljótlega',
+  const purchaseAgreementPaymentDisclaimer = formatMessage(
+    translationStrings.purchaseAgreementPaymentDisclaimer,
   )
 
   return (
@@ -168,13 +155,17 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
               {mainHeading && <Text variant="h3">{mainHeading}</Text>}
               <Stack space={3}>
                 <Text variant="h4">
-                  {n('fireInsuranceValueHeading', 'Brunabótamat eignar')}
+                  {formatMessage(translationStrings.fireInsuranceValueHeading)}
                 </Text>
                 <InputController
                   id="fireInsuranceValue"
                   name="fireInsuranceValue"
-                  label={n('fireInsuranceValueLabel', 'Brunabótamat')}
-                  placeholder={n('currencyInputPlaceholder', 'kr.')}
+                  label={formatMessage(
+                    translationStrings.fireInsuranceValueLabel,
+                  )}
+                  placeholder={formatMessage(
+                    translationStrings.currencyInputPlaceholder,
+                  )}
                   currency={true}
                   maxLength={maxLength}
                   type="number"
@@ -186,9 +177,8 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
 
               <Stack space={2}>
                 <Text>
-                  {n(
-                    'thorkatlaPurchasePriceLabel',
-                    'Kaupverð Þórkötlu (95% af brunabótamati)',
+                  {formatMessage(
+                    translationStrings.thorkatlaPurchasePriceLabel,
                   )}
                 </Text>
                 <Text variant="h4" color="blue400">
@@ -197,7 +187,9 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
               </Stack>
 
               <Stack space={3}>
-                <Text variant="h4">{n('loanHeading', 'Áhvílandi lán')}</Text>
+                <Text variant="h4">
+                  {formatMessage(translationStrings.loanHeading)}
+                </Text>
                 <Stack space={2}>
                   {loansFieldArray.fields.map((field, index) => {
                     const name = `loans[${index}].value`
@@ -215,10 +207,14 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                             key={field.id}
                             id={name}
                             name={name}
-                            label={`${n('loanLabel', 'Lán')} ${index + 1}`}
+                            label={`${formatMessage(
+                              translationStrings.loanLabel,
+                            )} ${index + 1}`}
                             currency={true}
                             maxLength={maxLength}
-                            placeholder={n('currencyInputPlaceholder', 'kr.')}
+                            placeholder={formatMessage(
+                              translationStrings.currencyInputPlaceholder,
+                            )}
                             type="number"
                             size="sm"
                             inputMode="numeric"
@@ -241,12 +237,7 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                           }}
                         >
                           <VisuallyHidden>
-                            {n(
-                              'removeLoan',
-                              activeLocale === 'is'
-                                ? 'Eyða láni'
-                                : 'Remove loan',
-                            )}
+                            {formatMessage(translationStrings.removeLoan)}
                           </VisuallyHidden>
                           <Icon
                             icon="removeCircle"
@@ -273,14 +264,14 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                       size="small"
                       variant="utility"
                     >
-                      {n('appendLoan', 'Bæta við láni')}
+                      {formatMessage(translationStrings.appendLoan)}
                     </Button>
                   </Box>
                 </Stack>
               </Stack>
 
               <Button disabled={!canCalculate} type="submit">
-                {n('calculate', 'Reikna')}
+                {formatMessage(translationStrings.calculate)}
               </Button>
             </Stack>
           </form>
@@ -298,7 +289,9 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
       >
         <Stack space={[5, 5, 8]}>
           <Stack space={3}>
-            <Text variant="h3">{n('resultsHeading', 'Niðurstöður')}</Text>
+            <Text variant="h3">
+              {formatMessage(translationStrings.resultsHeading)}
+            </Text>
             <Stack space={5}>
               <Box
                 columnGap={2}
@@ -308,7 +301,7 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                 flexDirection={['column', 'row']}
               >
                 <Text variant="h4">
-                  {n('thorkatlaPaymentLabel', 'Greitt úr af Þórkötlu*')}
+                  {formatMessage(translationStrings.thorkatlaPaymentLabel)}
                 </Text>
                 <Text variant="h4" color="blue400" whiteSpace="nowrap">
                   {formatCurrency(
@@ -318,7 +311,9 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                 </Text>
               </Box>
               <Stack space={1}>
-                <Text variant="eyebrow">{n('breakdown', 'Sundurliðun')}</Text>
+                <Text variant="eyebrow">
+                  {formatMessage(translationStrings.breakdown)}
+                </Text>
                 <Stack space={2}>
                   <Box
                     columnGap={2}
@@ -328,9 +323,8 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                     flexDirection={['column', 'row']}
                   >
                     <Text>
-                      {n(
-                        'purchaseAgreementPaymentLabel',
-                        'Greitt við kaupsamning',
+                      {formatMessage(
+                        translationStrings.purchaseAgreementPaymentLabel,
                       )}
                     </Text>
                     <Text whiteSpace="nowrap">
@@ -348,10 +342,7 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
                     flexDirection={['column', 'row']}
                   >
                     <Text>
-                      {n(
-                        'closingPaymentLabel',
-                        'Greitt við afsal (5% af kaupvirði)**',
-                      )}
+                      {formatMessage(translationStrings.closingPaymentLabel)}
                     </Text>
                     <Text whiteSpace="nowrap">
                       {formatCurrency(
@@ -372,10 +363,6 @@ const GrindavikResidentialPropertyPurchaseCalculator = ({
             {purchaseAgreementPaymentDisclaimer && (
               <Text variant="small">{purchaseAgreementPaymentDisclaimer}</Text>
             )}
-            {closingResultDisclaimer && (
-              <Text variant="small">{closingResultDisclaimer}</Text>
-            )}
-            {loanDisclaimer && <Text variant="small">{loanDisclaimer}</Text>}
           </Stack>
         </Stack>
       </Box>
diff --git a/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/translation.strings.ts b/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/translation.strings.ts
new file mode 100644
index 000000000000..531befd12211
--- /dev/null
+++ b/apps/web/components/connected/GrindavikResidentialPropertyPurchaseCalculator/translation.strings.ts
@@ -0,0 +1,96 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  mainHeading: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:mainHeading',
+    defaultMessage: 'Bráðabirgðaútreikningur',
+    description: 'Titill á útreikning vegna uppkaupa fasteigna í Grindavík',
+  },
+  currencySuffix: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:currencySuffix',
+    defaultMessage: ' kr.',
+    description: 'Gjaldeyrisviðskeyti',
+  },
+  thorkatlaPaymentDisclaimer: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:thorkatlaPaymentDisclaimer',
+    defaultMessage:
+      'Seljandi getur valið afhendingardagsetningu á bilinu 1-3 mánuðum eftir kaupsamning. Afsal fer fram einum mánuði frá afhendingu.',
+    description: 'Texti fyrir greiðslufyrirvara skilaboð',
+  },
+  purchaseAgreementPaymentDisclaimer: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:purchaseAgreementPaymentDisclaimer',
+    defaultMessage:
+      'Samhliða afsalsgreiðslu fer fram lögskilauppgjör sem kemur til hækkunar eða lækkunar á afsalsgreiðslu.',
+    description: 'Texti fyrir greiðslufyrirvara kaupsamnings',
+  },
+  fireInsuranceValueHeading: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:fireInsuranceValueHeading',
+    defaultMessage: 'Brunabótamat eignar',
+    description: 'Titill fyrir brunabótamat eignar',
+  },
+  fireInsuranceValueLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:fireInsuranceValueLabel',
+    defaultMessage: 'Brunabótamat',
+    description: 'Label fyrir brunabótamat input',
+  },
+  currencyInputPlaceholder: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:currencyInputPlaceholder',
+    defaultMessage: 'kr.',
+    description: 'Gjaldmiðill sem birtist í input reitum',
+  },
+  thorkatlaPurchasePriceLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:thorkatlaPurchasePriceLabel',
+    defaultMessage: 'Kaupverð Þórkötlu (95% af brunabótamati)',
+    description: 'Label fyrir kaupverð Þórkötlu (95% af brunabótamati)',
+  },
+  loanHeading: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:loanHeading',
+    defaultMessage: 'Áhvílandi lán',
+    description: 'Áhvílandi lán',
+  },
+  loanLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:loanLabel',
+    defaultMessage: 'Lán',
+    description: 'Label fyrir lán input',
+  },
+  removeLoan: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:removeLoan',
+    defaultMessage: 'Eyða láni',
+    description: 'Eyða láni',
+  },
+  appendLoan: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:appendLoan',
+    defaultMessage: 'Bæta við láni',
+    description: 'Bæta við láni',
+  },
+  calculate: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Reikna',
+  },
+  resultsHeading: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:resultsHeading',
+    defaultMessage: 'Niðurstöður',
+    description: 'Niðurstöður',
+  },
+  thorkatlaPaymentLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:thorkatlaPaymentLabel',
+    defaultMessage: 'Greitt til seljenda',
+    description: 'Label fyrir greiðslu til seljanda',
+  },
+  breakdown: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:breakdown',
+    defaultMessage: 'Sundurliðun',
+    description: 'Sundurliðun',
+  },
+  purchaseAgreementPaymentLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:purchaseAgreementPaymentLabel',
+    defaultMessage: 'Greitt við kaupsamning',
+    description: 'Label fyrir greitt við kaupsamning',
+  },
+  closingPaymentLabel: {
+    id: 'web.GrindavikResidentialPropertyPurchaseCalculator:closingPaymentLabel',
+    defaultMessage: 'Greitt við afsal (5% af kaupvirði)',
+    description: 'Label fyrir greiðslu við afsal',
+  },
+})
diff --git a/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator.tsx b/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/HousingBenefitCalculator.tsx
similarity index 77%
rename from apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator.tsx
rename to apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/HousingBenefitCalculator.tsx
index cddd141b9ec0..2007328c511e 100644
--- a/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator.tsx
+++ b/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/HousingBenefitCalculator.tsx
@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
+import { useIntl } from 'react-intl'
 import { useLazyQuery } from '@apollo/client'
 
 import {
@@ -17,10 +18,11 @@ import {
   GetHousingBenefitCalculationQuery,
   GetHousingBenefitCalculationQueryVariables,
 } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { GET_HOUSING_BENEFIT_CALCULATION } from '@island.is/web/screens/queries/HousingBenefitCalculator'
 import { formatCurrency } from '@island.is/web/utils/currency'
 
+import { translation as translationStrings } from './translation.strings'
+
 const MAX_LENGTH = 15
 
 interface InputState {
@@ -35,7 +37,7 @@ interface HousingBenefitCalculatorProps {
 }
 
 const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const [inputState, setInputState] = useState<InputState>({
     income: '',
     housingCost: '',
@@ -116,9 +118,15 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
     if (slice?.configJson?.showSixOptions) {
       options.push({ label: '4', value: 4 })
       options.push({ label: '5', value: 5 })
-      options.push({ label: n('sixOrMore', '6 eða fleiri'), value: 6 })
+      options.push({
+        label: formatMessage(translationStrings.sixOrMore),
+        value: 6,
+      })
     } else {
-      options.push({ label: n('fourOrMore', '4 eða fleiri'), value: 4 })
+      options.push({
+        label: formatMessage(translationStrings.fourOrMore),
+        value: 4,
+      })
     }
 
     return options
@@ -135,7 +143,7 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
         <Stack space={5}>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n('numberOfHouseholdMembers', 'Fjöldi heimilismanna í húsnæði?')}
+              {formatMessage(translationStrings.numberOfHouseholdMembers)}
             </Text>
 
             <Controller
@@ -162,9 +170,8 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
           </Box>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n(
-                'monthlyIncomeOfHouseholdMembers18YearsAndOlder',
-                'Samanlagðar mánaðarlegartekjur heimilismanna 18 ára og eldri (tekjur f. skatt)?',
+              {formatMessage(
+                translationStrings.monthlyIncomeOfHouseholdMembers18YearsAndOlder,
               )}
             </Text>
 
@@ -172,8 +179,8 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
               id="income"
               control={control}
               name="income"
-              label={n('incomeLabel', 'Tekjur')}
-              placeholder={n('incomePlaceholder', 'kr.')}
+              label={formatMessage(translationStrings.incomeLabel)}
+              placeholder={formatMessage(translationStrings.incomePlaceholder)}
               currency={true}
               type="number"
               onChange={(event) => {
@@ -186,9 +193,8 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
           </Box>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n(
-                'assetsOfHouseholdMembers18YearsAndOlder',
-                'Eignir heimilismanna 18 ára og eldri?',
+              {formatMessage(
+                translationStrings.assetsOfHouseholdMembers18YearsAndOlder,
               )}
             </Text>
 
@@ -196,8 +202,8 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
               id="assets"
               control={control}
               name="assets"
-              label={n('assetsLabel', 'Eignir')}
-              placeholder={n('assetsPlaceholder', 'kr.')}
+              label={formatMessage(translationStrings.assetsLabel)}
+              placeholder={formatMessage(translationStrings.assetsPlaceholder)}
               currency={true}
               type="number"
               onChange={(event) => {
@@ -210,14 +216,16 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
           </Box>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n('housingCostsPerMonth', 'Húsnæðiskostnaður á mánuði?')}
+              {formatMessage(translationStrings.housingCostsPerMonth)}
             </Text>
             <InputController
               id="housingCost"
               control={control}
               name="housingCost"
-              label={n('housingCostLabel', 'Húsnæðiskostnaður')}
-              placeholder={n('housingCostPlaceholder', 'kr.')}
+              label={formatMessage(translationStrings.housingCostLabel)}
+              placeholder={formatMessage(
+                translationStrings.housingCostPlaceholder,
+              )}
               currency={true}
               type="number"
               onChange={(event) => {
@@ -229,13 +237,10 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
             />
           </Box>
           <Text variant="small" lineHeight="lg">
-            {n(
-              'calculatorDisclaimer',
-              'Útreikningur húsnæðisbóta samkvæmt reiknivélinni byggir á þeim forsendum sem þú gafst upp og telst ekki bindandi ákvörðun um húsnæðisbætur. Útreikningur miðast við greiðslur húsnæðisbóta fyrir heilt almanaksár.',
-            )}
+            {formatMessage(translationStrings.calculatorDisclaimer)}
           </Text>
           <Button loading={loading} onClick={calculate} disabled={!canSubmit}>
-            {n('calculate', 'Reikna')}
+            {formatMessage(translationStrings.calculate)}
           </Button>
         </Stack>
       </Box>
@@ -246,7 +251,7 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
           paddingX={[3, 3, 3, 3, 12]}
         >
           <Text variant="h3">
-            <strong>{n('results', 'Niðurstöður')}</strong>
+            <strong>{formatMessage(translationStrings.results)}</strong>
           </Text>
           <Stack space={5}>
             <Box>
@@ -257,12 +262,9 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
                   paddingBottom={2}
                   paddingTop={5}
                 >
-                  {n(
-                    'maximumHousingBenefits',
-                    'Hámarksbætur miðað við fjölda heimilismanna eru',
-                  )}{' '}
+                  {formatMessage(translationStrings.maximumHousingBenefits)}{' '}
                   {formatCurrency(maximumHousingBenefits)}{' '}
-                  {n('perMonth', 'á mánuði.')}
+                  {formatMessage(translationStrings.perMonth)}
                 </Text>
               )}
 
@@ -270,30 +272,29 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
                 {typeof reductionsDueToIncome === 'number' &&
                   reductionsDueToIncome > 0 && (
                     <Text variant="medium" fontWeight="light">
-                      {n('reductionDueToIncome', 'Skerðing vegna tekna eru')}{' '}
+                      {formatMessage(translationStrings.reductionDueToIncome)}{' '}
                       {formatCurrency(reductionsDueToIncome)}{' '}
-                      {n('perMonth', 'á mánuði.')}
+                      {formatMessage(translationStrings.perMonth)}
                     </Text>
                   )}
 
                 {typeof reductionsDueToAssets === 'number' &&
                   reductionsDueToAssets > 0 && (
                     <Text variant="medium" fontWeight="light">
-                      {n('reductionDueToAssets', 'Skerðing vegna eigna eru')}{' '}
+                      {formatMessage(translationStrings.reductionDueToAssets)}{' '}
                       {formatCurrency(reductionsDueToAssets)}{' '}
-                      {n('perMonth', 'á mánuði.')}
+                      {formatMessage(translationStrings.perMonth)}
                     </Text>
                   )}
 
                 {typeof reductionsDueToHousingCosts === 'number' &&
                   reductionsDueToHousingCosts > 0 && (
                     <Text variant="medium" fontWeight="light">
-                      {n(
-                        'reductionsDueToHousingCosts',
-                        'Skerðing vegna húsnæðiskostnaðar eru',
+                      {formatMessage(
+                        translationStrings.reductionsDueToHousingCosts,
                       )}{' '}
                       {formatCurrency(reductionsDueToHousingCosts)}{' '}
-                      {n('perMonth', 'á mánuði.')}
+                      {formatMessage(translationStrings.perMonth)}
                     </Text>
                   )}
               </Stack>
@@ -301,9 +302,9 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
 
             {typeof estimatedHousingBenefits === 'number' && (
               <Text variant="medium" fontWeight="light">
-                {n('estimatedHousingBenefits', 'Áætlaðar húsnæðisbætur eru')}{' '}
+                {formatMessage(translationStrings.estimatedHousingBenefits)}{' '}
                 <strong>{formatCurrency(estimatedHousingBenefits)}</strong>{' '}
-                {n('perMonth', 'á mánuði.')}
+                {formatMessage(translationStrings.perMonth)}
               </Text>
             )}
           </Stack>
@@ -312,8 +313,8 @@ const HousingBenefitCalculator = ({ slice }: HousingBenefitCalculatorProps) => {
       {!loading && called && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja niðurstöður')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
     </Box>
diff --git a/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/translation.strings.ts b/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/translation.strings.ts
new file mode 100644
index 000000000000..683b32a080a5
--- /dev/null
+++ b/apps/web/components/connected/HousingBenefitCalculator/HousingBenefitCalculator/translation.strings.ts
@@ -0,0 +1,122 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  sixOrMore: {
+    id: 'web.HousingBenefitCalculator:sixOrMore',
+    defaultMessage: '6 eða fleiri',
+    description: 'Label fyrir 6 eða fleiri',
+  },
+  fourOrMore: {
+    id: 'web.HousingBenefitCalculator:fourOrMore',
+    defaultMessage: '4 eða fleiri',
+    description: 'Label fyrir 4 eða fleiri',
+  },
+  numberOfHouseholdMembers: {
+    id: 'web.HousingBenefitCalculator:numberOfHouseholdMembers',
+    defaultMessage: 'Fjöldi heimilismanna í húsnæði?',
+    description: 'Fjöldi heimilismanna í húsnæði',
+  },
+  monthlyIncomeOfHouseholdMembers18YearsAndOlder: {
+    id: 'web.HousingBenefitCalculator:monthlyIncomeOfHouseholdMembers18YearsAndOlder',
+    defaultMessage:
+      'Samanlagðar mánaðarlegartekjur heimilismanna 18 ára og eldri (tekjur f. skatt)?',
+    description:
+      'Samanlagðar mánaðarlegartekjur heimilismanna 18 ára og eldri (tekjur f. skatt)',
+  },
+  incomeLabel: {
+    id: 'web.HousingBenefitCalculator:incomeLabel',
+    defaultMessage: 'Tekjur',
+    description: 'Label fyrir tekjur input reit',
+  },
+  incomePlaceholder: {
+    id: 'web.HousingBenefitCalculator:incomePlaceholder',
+    defaultMessage: 'kr.',
+    description: 'Placeholder fyrir tekjur input reit',
+  },
+  assetsOfHouseholdMembers18YearsAndOlder: {
+    id: 'web.HousingBenefitCalculator:assetsOfHouseholdMembers18YearsAndOlder',
+    defaultMessage: 'Eignir heimilismanna 18 ára og eldri?',
+    description: 'Eignir heimilismanna 18 ára og eldri',
+  },
+  assetsLabel: {
+    id: 'web.HousingBenefitCalculator:assetsLabel',
+    defaultMessage: 'Eignir',
+    description: 'Label fyrir eignir input reit',
+  },
+  assetsPlaceholder: {
+    id: 'web.HousingBenefitCalculator:assetsPlaceholder',
+    defaultMessage: 'kr.',
+    description: 'Placeholder fyrir eignir input reit',
+  },
+  housingCostsPerMonth: {
+    id: 'web.HousingBenefitCalculator:housingCostsPerMonth',
+    defaultMessage: 'Húsnæðiskostnaður á mánuði?',
+    description: 'Húsnæðiskostnaður á mánuði',
+  },
+  housingCostLabel: {
+    id: 'web.HousingBenefitCalculator:housingCostLabel',
+    defaultMessage: 'Húsnæðiskostnaður',
+    description: 'Label fyrir húsnæðiskostnaður',
+  },
+  housingCostPlaceholder: {
+    id: 'web.HousingBenefitCalculator:housingCostPlaceholder',
+    defaultMessage: 'kr.',
+    description: 'Placeholder fyrir húsnæðiskostnaðar input reit',
+  },
+  calculatorDisclaimer: {
+    id: 'web.HousingBenefitCalculator:calculatorDisclaimer',
+    defaultMessage:
+      'Útreikningur húsnæðisbóta samkvæmt reiknivélinni byggir á þeim forsendum sem þú gafst upp og telst ekki bindandi ákvörðun um húsnæðisbætur. Útreikningur miðast við greiðslur húsnæðisbóta fyrir heilt almanaksár.',
+    description: 'Reiknivéla fyrirvari',
+  },
+  calculate: {
+    id: 'web.HousingBenefitCalculator:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Texti á takka til að reikna',
+  },
+  results: {
+    id: 'web.HousingBenefitCalculator:results',
+    defaultMessage: 'Niðurstöður',
+    description: 'Titill á niðurstöðum',
+  },
+  maximumHousingBenefits: {
+    id: 'web.HousingBenefitCalculator:maximumHousingBenefits',
+    defaultMessage: 'Hámarksbætur miðað við fjölda heimilismanna eru',
+    description: 'Hámarksbætur miðað við fjölda heimilismanna eru',
+  },
+  perMonth: {
+    id: 'web.HousingBenefitCalculator:perMonth',
+    defaultMessage: 'á mánuði.',
+    description: 'á mánuði',
+  },
+  reductionDueToIncome: {
+    id: 'web.HousingBenefitCalculator:reductionDueToIncome',
+    defaultMessage: 'Skerðing vegna tekna eru',
+    description: 'Skerðing vegna tekna eru',
+  },
+  reductionDueToAssets: {
+    id: 'web.HousingBenefitCalculator:reductionDueToAssets',
+    defaultMessage: 'Skerðing vegna eigna eru',
+    description: 'Skerðing vegna eigna eru',
+  },
+  reductionsDueToHousingCosts: {
+    id: 'web.HousingBenefitCalculator:reductionsDueToHousingCosts',
+    defaultMessage: 'Skerðing vegna húsnæðiskostnaðar eru',
+    description: 'Skerðing vegna húsnæðiskostnaðar eru',
+  },
+  estimatedHousingBenefits: {
+    id: 'web.HousingBenefitCalculator:estimatedHousingBenefits',
+    defaultMessage: 'Áætlaðar húsnæðisbætur eru',
+    description: 'Áætlaðar húsnæðisbætur eru',
+  },
+  errorOccurredTitle: {
+    id: 'web.HousingBenefitCalculator:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill þegar villa kemur upp',
+  },
+  errorOccurredMessage: {
+    id: 'web.HousingBenefitCalculator:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja niðurstöður',
+    description: 'Skilaboð þegar villa kemur upp',
+  },
+})
diff --git a/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator.tsx b/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/SpecificHousingBenefitSupportCalculator.tsx
similarity index 78%
rename from apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator.tsx
rename to apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/SpecificHousingBenefitSupportCalculator.tsx
index 734a07a10e5a..6059770a3512 100644
--- a/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator.tsx
+++ b/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/SpecificHousingBenefitSupportCalculator.tsx
@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
+import { useIntl } from 'react-intl'
 import { useLazyQuery } from '@apollo/client'
 
 import {
@@ -21,6 +22,8 @@ import { useNamespace } from '@island.is/web/hooks'
 import { GET_SPECIFIC_HOUSING_BENEFIT_SUPPORT_CALCULATION } from '@island.is/web/screens/queries/HousingBenefitCalculator'
 import { formatCurrency } from '@island.is/web/utils/currency'
 
+import { translation as translationStrings } from './translation.strings'
+
 const MAX_LENGTH = 15
 
 interface InputState {
@@ -28,14 +31,8 @@ interface InputState {
   householdMemberCount: number
 }
 
-interface SpecificHousingBenefitSupportCalculatorProps {
-  slice: ConnectedComponent
-}
-
-const SpecificHousingBenefitSupportCalculator = ({
-  slice,
-}: SpecificHousingBenefitSupportCalculatorProps) => {
-  const n = useNamespace(slice.json ?? {})
+const SpecificHousingBenefitSupportCalculator = () => {
+  const { formatMessage } = useIntl()
   const [inputState, setInputState] = useState<InputState>({
     housingCost: '',
     householdMemberCount: 1,
@@ -103,7 +100,7 @@ const SpecificHousingBenefitSupportCalculator = ({
       { label: '3', value: 3 },
       { label: '4', value: 4 },
       { label: '5', value: 5 },
-      { label: n('sixOrMore', '6 eða fleiri'), value: 6 },
+      { label: formatMessage(translationStrings.sixOrMore), value: 6 },
     ]
   }, [])
 
@@ -118,7 +115,7 @@ const SpecificHousingBenefitSupportCalculator = ({
         <Stack space={5}>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n('numberOfHouseholdMembers', 'Fjöldi heimilismanna í húsnæði?')}
+              {formatMessage(translationStrings.numberOfHouseholdMembers)}
             </Text>
 
             <Controller
@@ -145,15 +142,17 @@ const SpecificHousingBenefitSupportCalculator = ({
           </Box>
           <Box>
             <Text variant="medium" fontWeight="light" paddingBottom={2}>
-              {n('housingCostsPerMonth', 'Húsnæðiskostnaður á mánuði?')}
+              {formatMessage(translationStrings.housingCostsPerMonth)}
             </Text>
 
             <InputController
               id="housingCost"
               control={control}
               name="housingCost"
-              label={n('housingCostLabel', 'Húsnæðiskostnaður')}
-              placeholder={n('housingCostPlaceholder', 'kr.')}
+              label={formatMessage(translationStrings.housingCostLabel)}
+              placeholder={formatMessage(
+                translationStrings.housingCostPlaceholder,
+              )}
               currency={true}
               type="number"
               onChange={(event) => {
@@ -165,13 +164,10 @@ const SpecificHousingBenefitSupportCalculator = ({
             />
           </Box>
           <Text variant="small" lineHeight="lg">
-            {n(
-              'calculatorDisclaimer',
-              'Útreikningur húsnæðisbóta samkvæmt reiknivélinni byggir á þeim forsendum sem þú gafst upp og telst ekki bindandi ákvörðun um húsnæðisbætur. Útreikningur miðast við greiðslur húsnæðisbóta fyrir heilt almanaksár.',
-            )}
+            {formatMessage(translationStrings.calculatorDisclaimer)}
           </Text>
           <Button loading={loading} onClick={calculate} disabled={!canSubmit}>
-            {n('calculate', 'Reikna')}
+            {formatMessage(translationStrings.calculate)}
           </Button>
         </Stack>
       </Box>
@@ -182,7 +178,7 @@ const SpecificHousingBenefitSupportCalculator = ({
           paddingX={[3, 3, 3, 3, 12]}
         >
           <Text variant="h3">
-            <strong>{n('results', 'Niðurstöður')}</strong>
+            <strong>{formatMessage(translationStrings.results)}</strong>
           </Text>
           <Stack space={5}>
             <Box>
@@ -193,12 +189,9 @@ const SpecificHousingBenefitSupportCalculator = ({
                   paddingBottom={2}
                   paddingTop={5}
                 >
-                  {n(
-                    'maximumHousingBenefits',
-                    'Hámarksbætur miðað við fjölda heimilismanna eru',
-                  )}{' '}
+                  {formatMessage(translationStrings.maximumHousingBenefits)}{' '}
                   {formatCurrency(maximumHousingBenefits)}{' '}
-                  {n('perMonth', 'á mánuði.')}
+                  {formatMessage(translationStrings.perMonth)}
                 </Text>
               )}
 
@@ -206,12 +199,11 @@ const SpecificHousingBenefitSupportCalculator = ({
                 {typeof reductionsDueToHousingCosts === 'number' &&
                   reductionsDueToHousingCosts > 0 && (
                     <Text variant="medium" fontWeight="light">
-                      {n(
-                        'reductionsDueToHousingCosts',
-                        'Skerðing vegna húsnæðiskostnaðar eru',
+                      {formatMessage(
+                        translationStrings.reductionsDueToHousingCosts,
                       )}{' '}
                       {formatCurrency(reductionsDueToHousingCosts)}{' '}
-                      {n('perMonth', 'á mánuði.')}
+                      {formatMessage(translationStrings.perMonth)}
                     </Text>
                   )}
               </Stack>
@@ -219,9 +211,9 @@ const SpecificHousingBenefitSupportCalculator = ({
 
             {typeof estimatedHousingBenefits === 'number' && (
               <Text variant="medium" fontWeight="light">
-                {n('estimatedHousingBenefits', 'Áætlaðar húsnæðisbætur eru')}{' '}
+                {formatMessage(translationStrings.estimatedHousingBenefits)}{' '}
                 <strong>{formatCurrency(estimatedHousingBenefits)}</strong>{' '}
-                {n('perMonth', 'á mánuði.')}
+                {formatMessage(translationStrings.perMonth)}
               </Text>
             )}
           </Stack>
@@ -230,8 +222,8 @@ const SpecificHousingBenefitSupportCalculator = ({
       {!loading && called && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja niðurstöður')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
     </Box>
diff --git a/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/translation.strings.ts b/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/translation.strings.ts
new file mode 100644
index 000000000000..51436a7251c5
--- /dev/null
+++ b/apps/web/components/connected/HousingBenefitCalculator/SpecificHousingBenefitSupportCalculator/translation.strings.ts
@@ -0,0 +1,75 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  sixOrMore: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:sixOrMore',
+    defaultMessage: '6 eða fleiri',
+    description: 'Label fyrir 6 eða fleiri',
+  },
+  numberOfHouseholdMembers: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:numberOfHouseholdMembers',
+    defaultMessage: 'Fjöldi heimilismanna í húsnæði?',
+    description: 'Fjöldi heimilismanna í húsnæði',
+  },
+  housingCostsPerMonth: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:housingCostsPerMonth',
+    defaultMessage: 'Húsnæðiskostnaður á mánuði?',
+    description: 'Húsnæðiskostnaður á mánuði',
+  },
+  housingCostLabel: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:housingCostLabel',
+    defaultMessage: 'Húsnæðiskostnaður',
+    description: 'Label fyrir húsnæðiskostnaður input reit',
+  },
+  housingCostPlaceholder: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:housingCostPlaceholder',
+    defaultMessage: 'kr.',
+    description: 'Placeholder fyrir húsnæðiskostnaður input reit',
+  },
+  calculatorDisclaimer: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:calculatorDisclaimer',
+    defaultMessage:
+      'Útreikningur húsnæðisbóta samkvæmt reiknivélinni byggir á þeim forsendum sem þú gafst upp og telst ekki bindandi ákvörðun um húsnæðisbætur. Útreikningur miðast við greiðslur húsnæðisbóta fyrir heilt almanaksár.',
+    description: 'Reiknivéla fyrirvari',
+  },
+  calculate: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Texti á takka til að reikna',
+  },
+  results: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:results',
+    defaultMessage: 'Niðurstöður',
+    description: 'Titill á niðurstöðum',
+  },
+  maximumHousingBenefits: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:maximumHousingBenefits',
+    defaultMessage: 'Hámarksbætur miðað við fjölda heimilismanna eru',
+    description: 'Hámarksbætur miðað við fjölda heimilismanna eru',
+  },
+  perMonth: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:perMonth',
+    defaultMessage: 'á mánuði.',
+    description: 'á mánuði',
+  },
+  reductionsDueToHousingCosts: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:reductionsDueToHousingCosts',
+    defaultMessage: 'Skerðing vegna húsnæðiskostnaðar eru',
+    description: 'Skerðing vegna húsnæðiskostnaðar eru',
+  },
+  estimatedHousingBenefits: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:estimatedHousingBenefits',
+    defaultMessage: 'Áætlaðar húsnæðisbætur eru',
+    description: 'Áætlaðar húsnæðisbætur eru',
+  },
+  errorOccurredTitle: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill þegar villa kemur upp',
+  },
+  errorOccurredMessage: {
+    id: 'web.SpecificHousingBenefitSupportCalculator:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja niðurstöður',
+    description: 'Skilaboð þegar villa kemur upp',
+  },
+})
diff --git a/apps/web/components/connected/HousingBenefitCalculator/index.ts b/apps/web/components/connected/HousingBenefitCalculator/index.ts
index ba754fa25196..8cd4530e31cc 100644
--- a/apps/web/components/connected/HousingBenefitCalculator/index.ts
+++ b/apps/web/components/connected/HousingBenefitCalculator/index.ts
@@ -1,14 +1,17 @@
 import dynamic from 'next/dynamic'
 
 export const HousingBenefitCalculator = dynamic(
-  () => import('./HousingBenefitCalculator'),
+  () => import('./HousingBenefitCalculator/HousingBenefitCalculator'),
   {
     ssr: false,
   },
 )
 
 export const SpecificHousingBenefitSupportCalculator = dynamic(
-  () => import('./SpecificHousingBenefitSupportCalculator'),
+  () =>
+    import(
+      './SpecificHousingBenefitSupportCalculator/SpecificHousingBenefitSupportCalculator'
+    ),
   {
     ssr: true,
   },
diff --git a/apps/web/components/connected/UmbodsmadurSkuldara/UmsCostOfLivingCalculator.tsx b/apps/web/components/connected/UmbodsmadurSkuldara/UmsCostOfLivingCalculator.tsx
index 5665daae30a0..9d03a50583c0 100644
--- a/apps/web/components/connected/UmbodsmadurSkuldara/UmsCostOfLivingCalculator.tsx
+++ b/apps/web/components/connected/UmbodsmadurSkuldara/UmsCostOfLivingCalculator.tsx
@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react'
 import { Control, Controller, useForm } from 'react-hook-form'
+import { useIntl } from 'react-intl'
 import { PropsValue } from 'react-select'
 import { useQuery } from '@apollo/client/react'
 
@@ -13,11 +14,10 @@ import {
   Text,
 } from '@island.is/island-ui/core'
 import { InputController } from '@island.is/shared/form-fields'
-import { ConnectedComponent, Query } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
-import { useI18n } from '@island.is/web/i18n'
+import { Query } from '@island.is/web/graphql/schema'
 import { GET_UMS_COST_OF_LIVING_CALCULATOR } from '@island.is/web/screens/queries/UmsCostOfLivingCalculator'
 
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './UmsCostOfLivingCalculator.css'
 
 interface CalculatedFieldWrapperProps {
@@ -84,15 +84,10 @@ interface CostOfLivingInput {
   otherExpenses?: string
 }
 
-interface CostOfLivingCalculatorProps {
-  slice: ConnectedComponent
-}
-
 type DataState = 'loading' | 'loaded' | 'error'
 
-const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
-  const n = useNamespace(slice.json ?? {})
-  const { activeLocale } = useI18n()
+const UmsCostOfLivingCalculator = () => {
+  const { formatMessage } = useIntl()
   const methods = useForm<CostOfLivingInput>({
     defaultValues: { familySize: '1+0' },
   })
@@ -115,196 +110,109 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
   const costOfLivingOptions = useMemo(() => {
     return [
       {
-        label: n(
-          'individualLabel',
-          activeLocale === 'is' ? 'Einstaklingur' : 'Individual',
-        ),
+        label: formatMessage(translationStrings.individualLabel),
         options: [
           {
-            label: n(
-              'individualChildlessLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur, barnlaus'
-                : 'Individual, childless',
-            ),
+            label: formatMessage(translationStrings.individualChildlessLabel),
             value: '1+0',
           },
           {
-            label: n(
-              'individualOneChildLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 1 barn'
-                : 'Individual with 1 child',
-            ),
+            label: formatMessage(translationStrings.individualOneChildLabel),
             value: '1+1',
           },
           {
-            label: n(
-              'individualTwoChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 2 börn'
-                : 'Individual with 2 children',
-            ),
+            label: formatMessage(translationStrings.individualTwoChildrenLabel),
             value: '1+2',
           },
           {
-            label: n(
-              'individualThreeChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 3 börn'
-                : 'Individual with 3 children',
+            label: formatMessage(
+              translationStrings.individualThreeChildrenLabel,
             ),
             value: '1+3',
           },
           {
-            label: n(
-              'individualFourChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 4 börn'
-                : 'Individual with 4 children',
+            label: formatMessage(
+              translationStrings.individualFourChildrenLabel,
             ),
             value: '1+4',
           },
           {
-            label: n(
-              'individualFiveChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 5 börn'
-                : 'Individual with 5 children',
+            label: formatMessage(
+              translationStrings.individualFiveChildrenLabel,
             ),
             value: '1+5',
           },
           {
-            label: n(
-              'individualSixChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 6 börn'
-                : 'Individual with 6 children',
-            ),
+            label: formatMessage(translationStrings.individualSixChildrenLabel),
             value: '1+6',
           },
           {
-            label: n(
-              'individualSevenChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 7 börn'
-                : 'Individual with 7 children',
+            label: formatMessage(
+              translationStrings.individualSevenChildrenLabel,
             ),
             value: '1+7',
           },
           {
-            label: n(
-              'individualEightChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 8 börn'
-                : 'Individual with 8 children',
+            label: formatMessage(
+              translationStrings.individualEightChildrenLabel,
             ),
             value: '1+8',
           },
           {
-            label: n(
-              'individualNineChildrenLabel',
-              activeLocale === 'is'
-                ? 'Einstaklingur með 9 börn'
-                : 'Individual with 9 children',
+            label: formatMessage(
+              translationStrings.individualNineChildrenLabel,
             ),
             value: '1+9',
           },
         ],
       },
       {
-        label: n('coupleLabel', activeLocale === 'is' ? 'Hjón' : 'Couple'),
+        label: formatMessage(translationStrings.coupleLabel),
         options: [
           {
-            label: n(
-              'coupleChildlessLable',
-              activeLocale === 'is' ? 'Hjón, barnlaus' : 'Couple, childless',
-            ),
+            label: formatMessage(translationStrings.coupleChildlessLable),
             value: '2+0',
           },
           {
-            label: n(
-              'coupleOneChildLabel',
-              activeLocale === 'is' ? 'Hjón með 1 barn' : 'Couple with 1 child',
-            ),
+            label: formatMessage(translationStrings.coupleOneChildLabel),
             value: '2+1',
           },
           {
-            label: n(
-              'coupleTwoChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 2 börn'
-                : 'Couple with 2 children',
-            ),
+            label: formatMessage(translationStrings.coupleTwoChildrenLable),
             value: '2+2',
           },
           {
-            label: n(
-              'coupleThreeChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 3 börn'
-                : 'Couple with 3 children',
-            ),
+            label: formatMessage(translationStrings.coupleThreeChildrenLable),
             value: '2+3',
           },
           {
-            label: n(
-              'coupleFourChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 4 börn'
-                : 'Couple with 4 children',
-            ),
+            label: formatMessage(translationStrings.coupleFourChildrenLable),
             value: '2+4',
           },
           {
-            label: n(
-              'coupleFiveChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 5 börn'
-                : 'Couple with 5 children',
-            ),
+            label: formatMessage(translationStrings.coupleFiveChildrenLable),
             value: '2+5',
           },
           {
-            label: n(
-              'coupleSixChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 6 barn'
-                : 'Couple with 6 children',
-            ),
+            label: formatMessage(translationStrings.coupleSixChildrenLable),
             value: '2+6',
           },
           {
-            label: n(
-              'coupleSevenChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 7 börn'
-                : 'Couple with 7 children',
-            ),
+            label: formatMessage(translationStrings.coupleSevenChildrenLable),
             value: '2+7',
           },
           {
-            label: n(
-              'coupleEightChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 8 börn'
-                : 'Couple with 8 children',
-            ),
+            label: formatMessage(translationStrings.coupleEightChildrenLable),
             value: '2+8',
           },
           {
-            label: n(
-              'coupleNineChildrenLable',
-              activeLocale === 'is'
-                ? 'Hjón með 9 börn'
-                : 'Couple with 9 children',
-            ),
+            label: formatMessage(translationStrings.coupleNineChildrenLable),
             value: '2+9',
           },
         ],
       },
     ]
-  }, [])
+  }, [formatMessage])
 
   const getSelectedValues = (option: string | undefined) => {
     if (costOfLivingCalculator) {
@@ -376,13 +284,8 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
         )}
         {dataState === 'error' && (
           <AlertMessage
-            title={n('errorTitle', 'Villa')}
-            message={n(
-              'errorMessage',
-              activeLocale === 'is'
-                ? 'Ekki tókst að sækja gögn fyrir framfærslu reiknivél.'
-                : 'Failed to retieve data for cost of living calculator',
-            )}
+            title={formatMessage(translationStrings.errorTitle)}
+            message={formatMessage(translationStrings.errorMessage)}
             type="error"
           />
         )}
@@ -390,10 +293,7 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
           <Stack space={5}>
             <Stack space={2}>
               <Text variant="h2">
-                {n(
-                  'costOfLivingCalculatorTitle',
-                  activeLocale === 'is' ? 'Fjölskyldustærð' : 'Family size',
-                )}
+                {formatMessage(translationStrings.costOfLivingCalculatorTitle)}
               </Text>
               <Controller
                 control={control}
@@ -401,10 +301,7 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
                 defaultValue="1+0"
                 render={({ field: { onChange, value } }) => (
                   <Select
-                    label={n(
-                      'familySizeLabel',
-                      activeLocale === 'is' ? 'Fjölskyldustærð' : 'Family size',
-                    )}
+                    label={formatMessage(translationStrings.familySizeLabel)}
                     options={costOfLivingOptions}
                     value={selectValue(value)}
                     size="sm"
@@ -418,69 +315,35 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
             </Stack>
             <Stack space={3}>
               <Text variant="h3">
-                {n(
-                  'preCalculatedTitle',
-                  activeLocale === 'is'
-                    ? 'Framfærsluviðmið umboðsmanns skuldara'
-                    : 'Subsistence criteria',
-                )}
+                {formatMessage(translationStrings.preCalculatedTitle)}
               </Text>
 
               <CalculatedFieldWrapper
-                title={n(
-                  'foodLabel',
-                  activeLocale === 'is'
-                    ? 'Matur, hreinlætisvörur og heimilisbúnaður'
-                    : 'Food, hygiene products and household equipment',
-                )}
+                title={formatMessage(translationStrings.foodLabel)}
                 value={familySizeData?.food}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'clothesLabel',
-                  activeLocale === 'is' ? 'Föt og skór' : 'Clothes and shoes',
-                )}
+                title={formatMessage(translationStrings.clothesLabel)}
                 value={familySizeData?.clothes}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'medicalCostLabel',
-                  activeLocale === 'is'
-                    ? 'Læknis- og lyfjakostnaður'
-                    : 'Medical and pharmaceutical costs',
-                )}
+                title={formatMessage(translationStrings.medicalCostLabel)}
                 value={familySizeData?.medicalCost}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'hobbyLabel',
-                  activeLocale === 'is' ? 'Tómstundir' : 'Hobby',
-                )}
+                title={formatMessage(translationStrings.hobbyLabel)}
                 value={familySizeData?.hobby}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'communicationLabel',
-                  activeLocale === 'is'
-                    ? 'Samskiptakostnaður'
-                    : 'Communication expenses',
-                )}
+                title={formatMessage(translationStrings.communicationLabel)}
                 value={familySizeData?.communication}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'transportLabel',
-                  activeLocale === 'is' ? 'Samgöngur' : 'Transport',
-                )}
+                title={formatMessage(translationStrings.transportLabel)}
                 value={familySizeData?.transport}
               />
               <CalculatedFieldWrapper
-                title={n(
-                  'otherServicesLabel',
-                  activeLocale === 'is'
-                    ? 'Önnur þjónusta fyrir heimili'
-                    : 'Other household expenses',
-                )}
+                title={formatMessage(translationStrings.otherServicesLabel)}
                 value={familySizeData?.otherServices}
               />
             </Stack>
@@ -488,20 +351,10 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
               <Box>
                 <Stack space={2}>
                   <Text variant="h4">
-                    {n(
-                      'calculatorInputsTitle',
-                      activeLocale === 'is'
-                        ? 'Önnur mánaðarleg útgjöld'
-                        : 'Other monthly expenses',
-                    )}
+                    {formatMessage(translationStrings.calculatorInputsTitle)}
                   </Text>
                   <Text>
-                    {n(
-                      'calculatorInputsIntro',
-                      activeLocale === 'is'
-                        ? 'Fyrir önnur útgjöld notar umboðsmaður skuldara ekki viðmið, heldur tekur mið af raunútgjöldum hverrar fjölskyldu'
-                        : 'For other expenses, the debtor`s representative does not use criteria, but takes into account the actual expenses of each family',
-                    )}
+                    {formatMessage(translationStrings.calculatorInputsIntro)}
                   </Text>
                 </Stack>
               </Box>
@@ -510,79 +363,52 @@ const UmsCostOfLivingCalculator = ({ slice }: CostOfLivingCalculatorProps) => {
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'houseRent' as keyof CostOfLivingInput}
-                    label={n(
-                      'houseRentLabel',
-                      activeLocale === 'is' ? 'Húsaleiga' : 'House rent',
-                    )}
+                    label={formatMessage(translationStrings.houseRentLabel)}
                   />
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'electricity' as keyof CostOfLivingInput}
-                    label={n(
-                      'electricityLabel',
-                      activeLocale === 'is'
-                        ? 'Rafmagn, hiti og hússjóður'
-                        : 'Electricity, house heating and housing fund ',
-                    )}
+                    label={formatMessage(translationStrings.electricityLabel)}
                   />
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'propertyTaxes' as keyof CostOfLivingInput}
-                    label={n(
-                      'propertyTaxesLabel',
-                      activeLocale === 'is'
-                        ? 'Fasteigna-,vatns-,fráveitugjöld'
-                        : 'Property taxes',
-                    )}
+                    label={formatMessage(translationStrings.propertyTaxesLabel)}
                   />
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'propertyInsurances' as keyof CostOfLivingInput}
-                    label={n(
-                      'propertyInsurancesLabel',
-                      activeLocale === 'is'
-                        ? 'Tryggingar, aðrar en bílatryggingar'
-                        : 'Insurances, other than car insurance',
+                    label={formatMessage(
+                      translationStrings.propertyInsurancesLabel,
                     )}
                   />
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'schoolAndDayCare' as keyof CostOfLivingInput}
-                    label={n(
-                      'schoolAndDayCareLabel',
-                      activeLocale === 'is'
-                        ? 'Skóli og dagvistun'
-                        : 'School and day care',
+                    label={formatMessage(
+                      translationStrings.schoolAndDayCareLabel,
                     )}
                   />
                   <InputControllerFieldWrapper
                     control={control}
                     nameAndId={'otherExpenses' as keyof CostOfLivingInput}
-                    label={n(
-                      'otherExpensesLabel',
-                      activeLocale === 'is'
-                        ? 'Önnur útgjöld'
-                        : 'Other expenses',
-                    )}
+                    label={formatMessage(translationStrings.otherExpensesLabel)}
                   />
                 </Stack>
               </Box>
             </Stack>
             <Stack space={2}>
               <Text variant="h3" fontWeight="semiBold">
-                {n('totalText', activeLocale === 'is' ? 'Samtals' : 'Total')}
+                {formatMessage(translationStrings.totalText)}
               </Text>
               <Box className={styles.total}>
                 <Text variant="eyebrow" fontWeight="semiBold" color="blue400">
-                  {n('totalText', activeLocale === 'is' ? 'Samtals' : 'Total')}
+                  {formatMessage(translationStrings.totalText)}
                 </Text>
                 <Box paddingLeft={2} textAlign="right">
                   <Text fontWeight="semiBold">
                     {numberFormatter.format(getTotal())}{' '}
-                    {n(
-                      'currencyText',
-                      activeLocale === 'is' ? 'krónur' : 'ISK',
-                    )}
+                    {formatMessage(translationStrings.currencyText)}
                   </Text>
                 </Box>
               </Box>
diff --git a/apps/web/components/connected/UmbodsmadurSkuldara/translation.strings.ts b/apps/web/components/connected/UmbodsmadurSkuldara/translation.strings.ts
new file mode 100644
index 000000000000..8840340b3d5c
--- /dev/null
+++ b/apps/web/components/connected/UmbodsmadurSkuldara/translation.strings.ts
@@ -0,0 +1,225 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  individualLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualLabel',
+    defaultMessage: 'Einstaklingur',
+    description: 'Label fyrir einstaklingur group',
+  },
+  individualChildlessLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualChildlessLabel',
+    defaultMessage: 'Einstaklingur, barnlaus',
+    description: 'Label fyrir einstakling án barns valmöguleika',
+  },
+  individualOneChildLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualOneChildLabel',
+    defaultMessage: 'Einstaklingur með 1 barn',
+    description: 'Label fyrir einstakling með 1 barn valmöguleika',
+  },
+  individualTwoChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualTwoChildrenLabel',
+    defaultMessage: 'Einstaklingur með 2 börn',
+    description: 'Label fyrir einstakling með 2 börn valmöguleika',
+  },
+  individualThreeChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualThreeChildrenLabel',
+    defaultMessage: 'Einstaklingur með 3 börn',
+    description: 'Label fyrir einstakling með 3 börn valmöguleika',
+  },
+  individualFourChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualFourChildrenLabel',
+    defaultMessage: 'Einstaklingur með 4 börn',
+    description: 'Label fyrir einstakling með 4 börn valmöguleika',
+  },
+  individualFiveChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualFiveChildrenLabel',
+    defaultMessage: 'Einstaklingur með 5 börn',
+    description: 'Label fyrir einstakling með 5 börn valmöguleika',
+  },
+  individualSixChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualSixChildrenLabel',
+    defaultMessage: 'Einstaklingur með 6 börn',
+    description: 'Label fyrir einstakling með 6 börn valmöguleika',
+  },
+  individualSevenChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualSevenChildrenLabel',
+    defaultMessage: 'Einstaklingur með 7 börn',
+    description: 'Label fyrir einstakling með 7 börn valmöguleika',
+  },
+  individualEightChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualEightChildrenLabel',
+    defaultMessage: 'Einstaklingur með 8 börn',
+    description: 'Label fyrir einstakling með 8 börn valmöguleika',
+  },
+  individualNineChildrenLabel: {
+    id: 'web.UmsCostOfLivingCalculator:individualNineChildrenLabel',
+    defaultMessage: 'Einstaklingur með 9 börn',
+    description: 'Label fyrir einstakling með 9 börn valmöguleika',
+  },
+  coupleLabel: {
+    id: 'web.UmsCostOfLivingCalculator:coupleLabel',
+    defaultMessage: 'Hjón',
+    description: 'Label fyrir hjón group',
+  },
+  coupleChildlessLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleChildlessLable',
+    defaultMessage: 'Hjón, barnlaus',
+    description: 'Label fyrir barnlaus hjón valmöguleika',
+  },
+  coupleOneChildLabel: {
+    id: 'web.UmsCostOfLivingCalculator:coupleOneChildLabel',
+    defaultMessage: 'Hjón með 1 barn',
+    description: 'Label fyrir hjón með 1 barn valmöguleika',
+  },
+  coupleTwoChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleTwoChildrenLable',
+    defaultMessage: 'Hjón með 2 börn',
+    description: 'Label fyrir hjón með 2 börn valmöguleika',
+  },
+  coupleThreeChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleThreeChildrenLable',
+    defaultMessage: 'Hjón með 3 börn',
+    description: 'Label fyrir hjón með 3 börn valmöguleika',
+  },
+  coupleFourChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleFourChildrenLable',
+    defaultMessage: 'Hjón með 4 börn',
+    description: 'Label fyrir hjón með 4 börn valmöguleika',
+  },
+  coupleFiveChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleFiveChildrenLable',
+    defaultMessage: 'Hjón með 5 börn',
+    description: 'Label fyrir hjón með 5 börn valmöguleika',
+  },
+  coupleSixChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleSixChildrenLable',
+    defaultMessage: 'Hjón með 6 börn',
+    description: 'Label fyrir hjón með 6 börn valmöguleika',
+  },
+  coupleSevenChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleSevenChildrenLable',
+    defaultMessage: 'Hjón með 7 börn',
+    description: 'Label fyrir hjón með 7 börn valmöguleika',
+  },
+  coupleEightChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleEightChildrenLable',
+    defaultMessage: 'Hjón með 8 börn',
+    description: 'Label fyrir hjón með 8 börn valmöguleika',
+  },
+  coupleNineChildrenLable: {
+    id: 'web.UmsCostOfLivingCalculator:coupleNineChildrenLable',
+    defaultMessage: 'Hjón með 9 börn',
+    description: 'Label fyrir hjón með 9 börn valmöguleika',
+  },
+  errorTitle: {
+    id: 'web.UmsCostOfLivingCalculator:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Titill fyrir villu',
+  },
+  errorMessage: {
+    id: 'web.UmsCostOfLivingCalculator:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja gögn fyrir framfærslu reiknivél.',
+    description: 'Villuskilaboð',
+  },
+  costOfLivingCalculatorTitle: {
+    id: 'web.UmsCostOfLivingCalculator:costOfLivingCalculatorTitle',
+    defaultMessage: 'Fjölskyldustærð',
+    description: 'Titill efst á framfærslu reiknivél',
+  },
+  familySizeLabel: {
+    id: 'web.UmsCostOfLivingCalculator:familySizeLabel',
+    defaultMessage: 'Fjölskyldustærð',
+    description: 'Label á fjölskyldu stærð input reit',
+  },
+  preCalculatedTitle: {
+    id: 'web.UmsCostOfLivingCalculator:preCalculatedTitle',
+    defaultMessage: 'Framfærsluviðmið umboðsmanns skuldara',
+    description: 'Titill fyrir ofan fyrirfram reiknuðu reitina',
+  },
+  foodLabel: {
+    id: 'web.UmsCostOfLivingCalculator:foodLabel',
+    defaultMessage: 'Matur, hreinlætisvörur og heimilisbúnaður',
+    description: 'Matur, hreinlætisvörur og heimilisbúnaður',
+  },
+  clothesLabel: {
+    id: 'web.UmsCostOfLivingCalculator:clothesLabel',
+    defaultMessage: 'Föt og skór',
+    description: 'Föt og skór',
+  },
+  medicalCostLabel: {
+    id: 'web.UmsCostOfLivingCalculator:medicalCostLabel',
+    defaultMessage: 'Læknis- og lyfjakostnaður',
+    description: 'Læknis- og lyfjakostnaður',
+  },
+  hobbyLabel: {
+    id: 'web.UmsCostOfLivingCalculator:hobbyLabel',
+    defaultMessage: 'Tómstundir',
+    description: 'Tómstundir',
+  },
+  communicationLabel: {
+    id: 'web.UmsCostOfLivingCalculator:communicationLabel',
+    defaultMessage: 'Samskiptakostnaður',
+    description: 'Samskiptakostnaður',
+  },
+  transportLabel: {
+    id: 'web.UmsCostOfLivingCalculator:transportLabel',
+    defaultMessage: 'Samgöngur',
+    description: 'Samgöngur',
+  },
+  otherServicesLabel: {
+    id: 'web.UmsCostOfLivingCalculator:otherServicesLabel',
+    defaultMessage: 'Önnur þjónusta fyrir heimili',
+    description: 'Önnur þjónusta fyrir heimili',
+  },
+  calculatorInputsTitle: {
+    id: 'web.UmsCostOfLivingCalculator:calculatorInputsTitle',
+    defaultMessage: 'Önnur mánaðarleg útgjöld',
+    description: 'Titill fyrir ofan önnur mánaðarleg útgjöld',
+  },
+  calculatorInputsIntro: {
+    id: 'web.UmsCostOfLivingCalculator:calculatorInputsIntro',
+    defaultMessage:
+      'Fyrir önnur útgjöld notar umboðsmaður skuldara ekki viðmið, heldur tekur mið af raunútgjöldum hverrar fjölskyldu',
+    description: 'Inngangur fyrir ofan önnur mánaðarleg útgjöld',
+  },
+  houseRentLabel: {
+    id: 'web.UmsCostOfLivingCalculator:houseRentLabel',
+    defaultMessage: 'Húsaleiga',
+    description: 'Húsaleiga',
+  },
+  electricityLabel: {
+    id: 'web.UmsCostOfLivingCalculator:electricityLabel',
+    defaultMessage: 'Rafmagn, hiti og hússjóður',
+    description: 'Rafmagn, hiti og hússjóður',
+  },
+  propertyTaxesLabel: {
+    id: 'web.UmsCostOfLivingCalculator:propertyTaxesLabel',
+    defaultMessage: 'Fasteigna-,vatns-,fráveitugjöld',
+    description: 'Fasteigna-,vatns-,fráveitugjöld',
+  },
+  propertyInsurancesLabel: {
+    id: 'web.UmsCostOfLivingCalculator:propertyInsurancesLabel',
+    defaultMessage: 'Tryggingar, aðrar en bílatryggingar',
+    description: 'Tryggingar, aðrar en bílatryggingar',
+  },
+  schoolAndDayCareLabel: {
+    id: 'web.UmsCostOfLivingCalculator:schoolAndDayCareLabel',
+    defaultMessage: 'Skóli og dagvistun',
+    description: 'Skóli og dagvistun',
+  },
+  otherExpensesLabel: {
+    id: 'web.UmsCostOfLivingCalculator:otherExpensesLabel',
+    defaultMessage: 'Önnur útgjöld',
+    description: 'Önnur útgjöld',
+  },
+  totalText: {
+    id: 'web.UmsCostOfLivingCalculator:totalText',
+    defaultMessage: 'Samtals',
+    description: 'Titill og label fyrir útreikning',
+  },
+  currencyText: {
+    id: 'web.UmsCostOfLivingCalculator:currencyText',
+    defaultMessage: 'krónur',
+    description: 'Gjaldmiðils viðskeyti á samanlögðum útreikning',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/SelectedShip/SelectedShip.tsx b/apps/web/components/connected/fiskistofa/SelectedShip/SelectedShip.tsx
index f45f39811f03..8799026b56b4 100644
--- a/apps/web/components/connected/fiskistofa/SelectedShip/SelectedShip.tsx
+++ b/apps/web/components/connected/fiskistofa/SelectedShip/SelectedShip.tsx
@@ -1,24 +1,22 @@
 import { useEffect, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
 import { useLazyQuery } from '@apollo/client'
+
 import { Box, Inline, LoadingDots, Text } from '@island.is/island-ui/core'
-import { useNamespace } from '@island.is/web/hooks'
 import { GET_SINGLE_SHIP } from '@island.is/web/screens/queries/Fiskistofa'
 
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './SelectedShip.css'
 
-interface SelectedShipProps {
-  namespace?: Record<string, string>
-}
-
-const SelectedShip = ({ namespace }: SelectedShipProps) => {
+const SelectedShip = () => {
   const [shipNumber, setShipNumber] = useState<number | null>(null)
   const router = useRouter()
 
   // TODO: figure out how to not call endpoint when nothing is selected
   const [getSingleShip, { data, error, loading }] =
     useLazyQuery(GET_SINGLE_SHIP)
-  const n = useNamespace(namespace)
+  const { formatMessage } = useIntl()
 
   useEffect(() => {
     if (router.query.nr && !isNaN(Number(router.query.nr))) {
@@ -47,7 +45,7 @@ const SelectedShip = ({ namespace }: SelectedShipProps) => {
   if (!data || error) {
     return (
       <Box className={styles.container}>
-        <Text>{n('noShipSelected', 'Ekkert skip valið')}</Text>
+        <Text>{formatMessage(translationStrings.noShipSelected)}</Text>
       </Box>
     )
   }
@@ -58,7 +56,7 @@ const SelectedShip = ({ namespace }: SelectedShipProps) => {
         {ship?.name ? (
           <Text variant="h2">{ship?.name}</Text>
         ) : (
-          <Text>{n('shipCouldNotBeFetched', 'Ekki tókst að sækja skip')}</Text>
+          <Text>{formatMessage(translationStrings.shipCouldNotBeFetched)}</Text>
         )}
 
         <Box className={styles.shipNumber}>
diff --git a/apps/web/components/connected/fiskistofa/SelectedShip/translation.strings.ts b/apps/web/components/connected/fiskistofa/SelectedShip/translation.strings.ts
new file mode 100644
index 000000000000..45f2b495aa31
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/SelectedShip/translation.strings.ts
@@ -0,0 +1,14 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  noShipSelected: {
+    id: 'web.fiskistofaSelectedShip:noShipSelected',
+    defaultMessage: 'Ekkert skip valið',
+    description: 'Ekkert skip valið',
+  },
+  shipCouldNotBeFetched: {
+    id: 'web.fiskistofaSelectedShip:shipCouldNotBeFetched',
+    defaultMessage: 'Ekki tókst að sækja skip',
+    description: 'Ekki tókst að sækja skip',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/ShipSearch/ShipSearch.tsx b/apps/web/components/connected/fiskistofa/ShipSearch/ShipSearch.tsx
index 0d0caff9fe0c..1b0b913f9bd7 100644
--- a/apps/web/components/connected/fiskistofa/ShipSearch/ShipSearch.tsx
+++ b/apps/web/components/connected/fiskistofa/ShipSearch/ShipSearch.tsx
@@ -1,6 +1,13 @@
 import { useEffect, useState } from 'react'
-import { useLazyQuery } from '@apollo/client'
+import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
+import { useLazyQuery } from '@apollo/client'
+
+import {
+  FiskistofaShipBasicInfo as ShipBasicInfo,
+  FiskistofaShipBasicInfoResponse,
+  QueryFiskistofaGetShipsArgs as QueryGetShipsArgs,
+} from '@island.is/api/schema'
 import {
   Box,
   Button,
@@ -9,34 +16,13 @@ import {
   Table as T,
   Text,
 } from '@island.is/island-ui/core'
-import {
-  QueryFiskistofaGetShipsArgs as QueryGetShipsArgs,
-  FiskistofaShipBasicInfo as ShipBasicInfo,
-  FiskistofaShipBasicInfoResponse,
-} from '@island.is/api/schema'
-import { GET_SHIPS_QUERY } from './queries'
-import { useNamespace } from '@island.is/web/hooks'
 import { shouldLinkOpenInNewWindow } from '@island.is/shared/utils'
 
-interface ShipSearchProps {
-  namespace: {
-    shipDetailsHref?: string
-    searchStringIsTooShort?: string
-    resultsFound?: string
-    search?: string
-    noResultsFound?: string
-    errorOccuredWhileFetchingShips?: string
-    shipNumber?: string
-    shipName?: string
-    operator?: string
-    typeOfVessel?: string
-    homePort?: string
-    shipSearchInputLabel?: string
-  }
-}
+import { GET_SHIPS_QUERY } from './queries'
+import { translation as translationStrings } from './translation.strings'
 
-const ShipSearch = ({ namespace }: ShipSearchProps) => {
-  const n = useNamespace(namespace)
+const ShipSearch = () => {
+  const { formatMessage } = useIntl()
 
   const [nameInput, setNameInput] = useState('')
   const [nameInputDuringLastSearch, setNameInputDuringLastSearch] = useState('')
@@ -45,15 +31,15 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
   const router = useRouter()
 
   const getShipDetailsHref = (id: number) => {
-    const href = n(
-      'shipDetailsHref',
-      '/v/gagnasidur-fiskistofu?selectedTab=skip',
-    ) as string
+    const href = formatMessage(translationStrings.shipDetailsHref)
 
     const [pathname, params] = href.split('?')
 
     const queryParams = new URLSearchParams(params)
-    queryParams.append(n('shipDetailsNumberQueryParam', 'nr'), String(id))
+    queryParams.append(
+      formatMessage(translationStrings.shipDetailsNumberQueryParam),
+      String(id),
+    )
     return `${pathname}?${queryParams.toString()}`
   }
 
@@ -75,12 +61,7 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
   const handleShipSearch = (nameInput: string) => {
     const nameInputIsNumber = !isNaN(Number(nameInput)) && nameInput.length > 0
     if (!nameInputIsNumber && nameInput.length < 2) {
-      setInputError(
-        n(
-          'searchStringIsTooShort',
-          'Leitarstrengur þarf að vera a.m.k. 2 stafir',
-        ),
-      )
+      setInputError(formatMessage(translationStrings.searchStringIsTooShort))
       return
     } else {
       setInputError('')
@@ -108,7 +89,7 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
     <Box>
       <Input
         name="ship-search"
-        label={n('shipSearchInputLabel', 'Skipaskrárnúmer eða nafn skips')}
+        label={formatMessage(translationStrings.shipSearchInputLabel)}
         value={nameInput}
         onChange={(ev) => setNameInput(ev.target.value)}
         hasError={inputError.length > 0}
@@ -126,7 +107,7 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
           }
           onClick={() => handleShipSearch(nameInput)}
         >
-          {n('search', 'Leita')}
+          {formatMessage(translationStrings.search)}
         </Button>
       </Box>
 
@@ -141,17 +122,14 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
       </Box>
       {ships.length === 0 && called && !loading && !error && (
         <Box display="flex" justifyContent="center">
-          <Text>{n('noResultsFound', 'Engar niðurstöður fundust')}</Text>
+          <Text>{formatMessage(translationStrings.noResultsFound)}</Text>
         </Box>
       )}
 
       {error && (
         <Box display="flex" justifyContent="center">
           <Text>
-            {n(
-              'errorOccuredWhileFetchingShips',
-              'Villa kom upp við að leita eftir skipi',
-            )}
+            {formatMessage(translationStrings.errorOccuredWhileFetchingShips)}
           </Text>
         </Box>
       )}
@@ -159,16 +137,26 @@ const ShipSearch = ({ namespace }: ShipSearchProps) => {
       {ships.length > 0 && (
         <>
           <Text color="blue600">
-            {n('resultsFound', 'Fjöldi skipa:')} {ships.length}
+            {formatMessage(translationStrings.resultsFound)} {ships.length}
           </Text>
           <T.Table>
             <T.Head>
               <T.Row>
-                <T.HeadData>{n('shipNumber', 'Skipnr.')}</T.HeadData>
-                <T.HeadData>{n('shipName', 'Nafn')}</T.HeadData>
-                <T.HeadData>{n('typeOfVessel', 'Útgerðarflokkur')}</T.HeadData>
-                <T.HeadData>{n('operator', 'Útgerð')}</T.HeadData>
-                <T.HeadData>{n('homePort', 'Heimahöfn')}</T.HeadData>
+                <T.HeadData>
+                  {formatMessage(translationStrings.shipNumber)}
+                </T.HeadData>
+                <T.HeadData>
+                  {formatMessage(translationStrings.shipName)}
+                </T.HeadData>
+                <T.HeadData>
+                  {formatMessage(translationStrings.typeOfVessel)}
+                </T.HeadData>
+                <T.HeadData>
+                  {formatMessage(translationStrings.operator)}
+                </T.HeadData>
+                <T.HeadData>
+                  {formatMessage(translationStrings.homePort)}
+                </T.HeadData>
               </T.Row>
             </T.Head>
             <T.Body>
diff --git a/apps/web/components/connected/fiskistofa/ShipSearch/translation.strings.ts b/apps/web/components/connected/fiskistofa/ShipSearch/translation.strings.ts
new file mode 100644
index 000000000000..fc5c041fe9d1
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/ShipSearch/translation.strings.ts
@@ -0,0 +1,69 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  shipDetailsHref: {
+    id: 'web.fiskistofaShipSearch:shipDetailsHref',
+    defaultMessage: '/v/gagnasidur-fiskistofu?selectedTab=skip',
+    description: 'Slóða á valið skip',
+  },
+  shipDetailsNumberQueryParam: {
+    id: 'web.fiskistofaShipSearch:shipDetailsNumberQueryParam',
+    defaultMessage: 'nr',
+    description: 'nr',
+  },
+  searchStringIsTooShort: {
+    id: 'web.fiskistofaShipSearch:searchStringIsTooShort',
+    defaultMessage: 'Leitarstrengur þarf að vera a.m.k. 2 stafir',
+    description: 'Leitarstrengur þarf að vera a.m.k. 2 stafir',
+  },
+  shipSearchInputLabel: {
+    id: 'web.fiskistofaShipSearch:shipSearchInputLabel',
+    defaultMessage: 'Skipaskrárnúmer eða nafn skips',
+    description: 'Skipaskrárnúmer eða nafn skips',
+  },
+  search: {
+    id: 'web.fiskistofaShipSearch:search',
+    defaultMessage: 'Leita',
+    description: 'Leita',
+  },
+  noResultsFound: {
+    id: 'web.fiskistofaShipSearch:noResultsFound',
+    defaultMessage: 'Engar niðurstöður fundust',
+    description: 'Engar niðurstöður fundust',
+  },
+  errorOccuredWhileFetchingShips: {
+    id: 'web.fiskistofaShipSearch:errorOccuredWhileFetchingShips',
+    defaultMessage: 'Villa kom upp við að leita eftir skipi',
+    description: 'Texti fyrir villu skilaboð þegar ekki tekst að sækja gögn',
+  },
+  resultsFound: {
+    id: 'web.fiskistofaShipSearch:resultsFound',
+    defaultMessage: 'Fjöldi skipa:',
+    description: 'Fjöldi skipa:',
+  },
+  shipNumber: {
+    id: 'web.fiskistofaShipSearch:shipNumber',
+    defaultMessage: 'Skipnr.',
+    description: 'Skipa númer',
+  },
+  shipName: {
+    id: 'web.fiskistofaShipSearch:shipName',
+    defaultMessage: 'Nafn',
+    description: 'Nafn',
+  },
+  typeOfVessel: {
+    id: 'web.fiskistofaShipSearch:typeOfVessel',
+    defaultMessage: 'Útgerðarflokkur',
+    description: 'Útgerðarflokkur',
+  },
+  operator: {
+    id: 'web.fiskistofaShipSearch:operator',
+    defaultMessage: 'Útgerð',
+    description: 'Útgerð',
+  },
+  homePort: {
+    id: 'web.fiskistofaShipSearch:homePort',
+    defaultMessage: 'Heimahöfn',
+    description: 'Heimahöfn',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/ShipSearchBoxedInput.tsx b/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/ShipSearchBoxedInput.tsx
index 2df70f0d2343..c2ed7667216f 100644
--- a/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/ShipSearchBoxedInput.tsx
+++ b/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/ShipSearchBoxedInput.tsx
@@ -1,5 +1,7 @@
 import { useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
+
 import {
   Box,
   BoxProps,
@@ -11,11 +13,12 @@ import {
   Stack,
   Text,
 } from '@island.is/island-ui/core'
-import { useNamespace } from '@island.is/web/hooks'
+import { SpanType } from '@island.is/island-ui/core/types'
+import { theme } from '@island.is/island-ui/theme'
 import { shouldLinkOpenInNewWindow } from '@island.is/shared/utils'
 import { useWindowSize } from '@island.is/web/hooks/useViewport'
-import { theme } from '@island.is/island-ui/theme'
-import { SpanType } from '@island.is/island-ui/core/types'
+
+import { translation as translationStrings } from './translation.strings'
 
 const INPUT_COLUMN_SPAN: SpanType = [
   '12/12',
@@ -40,20 +43,9 @@ const SEARCH_BUTTON_JUSTIFY_CONTENT: BoxProps['justifyContent'] = [
 ]
 const SEARCH_BUTTON_MARGIN_TOP: ResponsiveSpace = [3, 3, 3, 3, 0]
 
-interface ShipSearchBoxedInputProps {
-  namespace: {
-    shipDetailsHref?: string
-    shipSearchHref?: string
-    placeholder?: string
-    label?: string
-    title?: string
-    description?: string
-  }
-}
-
-const ShipSearchBoxedInput = ({ namespace }: ShipSearchBoxedInputProps) => {
+const ShipSearchBoxedInput = () => {
   const { width } = useWindowSize()
-  const n = useNamespace(namespace)
+  const { formatMessage } = useIntl()
   const [searchValue, setSearchValue] = useState('')
   const router = useRouter()
 
@@ -61,10 +53,11 @@ const ShipSearchBoxedInput = ({ namespace }: ShipSearchBoxedInputProps) => {
     const searchValueIsNumber =
       !isNaN(Number(searchValue)) && searchValue.length > 0
     if (searchValueIsNumber) {
-      const pathname = n('shipDetailsHref', '/v/gagnasidur-fiskistofu')
+      const pathname = formatMessage(translationStrings.shipDetailsHref)
       const query = {
         ...router.query,
-        [n('shipDetailsNumberQueryParam', 'nr')]: searchValue,
+        [formatMessage(translationStrings.shipDetailsNumberQueryParam)]:
+          searchValue,
         selectedTab: router.query?.selectedTab ?? 'skip',
       }
 
@@ -84,20 +77,17 @@ const ShipSearchBoxedInput = ({ namespace }: ShipSearchBoxedInputProps) => {
     } else {
       const query = { ...router.query, name: searchValue }
       router.push({
-        pathname: n('shipSearchHref', '/s/fiskistofa/skipaleit'),
+        pathname: formatMessage(translationStrings.shipSearchHref),
         query,
       })
     }
   }
 
-  const label = n('label', 'Skipaskrárnúmer eða nafn skips')
-  const placeholder = n('placeholder', '')
-  const title = n('title', 'Skipaleit')
-  const description = n(
-    'description',
-    'Upplýsingar um skip, veiðiheimildir, landanir og fleira',
-  )
-  const searchButtonText = n('searcButtonText', 'Leita')
+  const label = formatMessage(translationStrings.label)
+  const placeholder = formatMessage(translationStrings.placeholder)
+  const title = formatMessage(translationStrings.title)
+  const description = formatMessage(translationStrings.description)
+  const searchButtonText = formatMessage(translationStrings.searcButtonText)
 
   return (
     <Box background="blue100" padding="containerGutter" borderRadius="large">
diff --git a/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/translation.strings.ts b/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/translation.strings.ts
new file mode 100644
index 000000000000..7387a303d62b
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/ShipSearchBoxedInput/translation.strings.ts
@@ -0,0 +1,44 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  shipDetailsHref: {
+    id: 'web.fiskistofaShipSearchBoxedInput:shipDetailsHref',
+    defaultMessage: '/v/gagnasidur-fiskistofu',
+    description: '/v/gagnasidur-fiskistofu',
+  },
+  shipDetailsNumberQueryParam: {
+    id: 'web.fiskistofaShipSearchBoxedInput:shipDetailsNumberQueryParam',
+    defaultMessage: 'nr',
+    description: 'nr',
+  },
+  shipSearchHref: {
+    id: 'web.fiskistofaShipSearchBoxedInput:shipSearchHref',
+    defaultMessage: '/s/fiskistofa/skipaleit',
+    description: '/s/fiskistofa/skipaleit',
+  },
+  label: {
+    id: 'web.fiskistofaShipSearchBoxedInput:label',
+    defaultMessage: 'Skipaskrárnúmer eða nafn skips',
+    description: 'Skipaskrárnúmer eða nafn skips',
+  },
+  placeholder: {
+    id: 'web.fiskistofaShipSearchBoxedInput:placeholder',
+    defaultMessage: '',
+    description: 'Placeholder',
+  },
+  title: {
+    id: 'web.fiskistofaShipSearchBoxedInput:title',
+    defaultMessage: 'Skipaleit',
+    description: 'Skipaleit',
+  },
+  description: {
+    id: 'web.fiskistofaShipSearchBoxedInput:description',
+    defaultMessage: 'Upplýsingar um skip, veiðiheimildir, landanir og fleira',
+    description: 'Upplýsingar um skip, veiðiheimildir, landanir og fleira',
+  },
+  searcButtonText: {
+    id: 'web.fiskistofaShipSearchBoxedInput:searcButtonText',
+    defaultMessage: 'Leita',
+    description: 'Leita',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/SidebarShipSearchInput.tsx b/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/SidebarShipSearchInput.tsx
index 51cc8559a804..a9ac05bfe9c8 100644
--- a/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/SidebarShipSearchInput.tsx
+++ b/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/SidebarShipSearchInput.tsx
@@ -1,20 +1,14 @@
 import { useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
+
 import { AsyncSearchInput, Box, Text } from '@island.is/island-ui/core'
-import { useNamespace } from '@island.is/web/hooks'
 import { shouldLinkOpenInNewWindow } from '@island.is/shared/utils'
 
-interface SidebarShipSearchInputProps {
-  namespace: {
-    shipDetailsHref?: string
-    shipSearchHref?: string
-    placeholder?: string
-    label?: string
-  }
-}
+import { translation as translationStrings } from './translation.strings'
 
-const SidebarShipSearchInput = ({ namespace }: SidebarShipSearchInputProps) => {
-  const n = useNamespace(namespace)
+const SidebarShipSearchInput = () => {
+  const { formatMessage } = useIntl()
   const [searchValue, setSearchValue] = useState('')
   const router = useRouter()
   const [hasFocus, setHasFocus] = useState(false)
@@ -23,10 +17,11 @@ const SidebarShipSearchInput = ({ namespace }: SidebarShipSearchInputProps) => {
     const searchValueIsNumber =
       !isNaN(Number(searchValue)) && searchValue.length > 0
     if (searchValueIsNumber) {
-      const pathname = n('shipDetailsHref', '/v/gagnasidur-fiskistofu')
+      const pathname = formatMessage(translationStrings.shipDetailsHref)
       const query = {
         ...router.query,
-        [n('shipDetailsNumberQueryParam', 'nr')]: searchValue,
+        [formatMessage(translationStrings.shipDetailsNumberQueryParam)]:
+          searchValue,
         selectedTab: router.query?.selectedTab ?? 'skip',
       }
 
@@ -46,14 +41,14 @@ const SidebarShipSearchInput = ({ namespace }: SidebarShipSearchInputProps) => {
     } else {
       const query = { ...router.query, name: searchValue }
       router.push({
-        pathname: n('shipSearchHref', '/s/fiskistofa/skipaleit'),
+        pathname: formatMessage(translationStrings.shipSearchHref),
         query,
       })
     }
   }
 
-  const label = n('label', 'Skoða skip')
-  const placeholder = n('placeholder', 'Skipaskrárnúmer eða nafn')
+  const label = formatMessage(translationStrings.label)
+  const placeholder = formatMessage(translationStrings.placeholder)
 
   return (
     <Box>
diff --git a/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/translation.strings.ts b/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/translation.strings.ts
new file mode 100644
index 000000000000..b08d248ab489
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/SidebarShipSearchInput/translation.strings.ts
@@ -0,0 +1,29 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  shipDetailsHref: {
+    id: 'web.fiskistofaSidebarShipSearchInput:shipDetailsHref',
+    defaultMessage: '/v/gagnasidur-fiskistofu',
+    description: '/v/gagnasidur-fiskistofu',
+  },
+  shipDetailsNumberQueryParam: {
+    id: 'web.fiskistofaSidebarShipSearchInput:shipDetailsNumberQueryParam',
+    defaultMessage: 'nr',
+    description: 'nr',
+  },
+  shipSearchHref: {
+    id: 'web.fiskistofaSidebarShipSearchInput:shipSearchHref',
+    defaultMessage: '/s/fiskistofa/skipaleit',
+    description: '/s/fiskistofa/skipaleit',
+  },
+  label: {
+    id: 'web.fiskistofaSidebarShipSearchInput:label',
+    defaultMessage: 'Skoða skip',
+    description: 'Skoða skip',
+  },
+  placeholder: {
+    id: 'web.fiskistofaSidebarShipSearchInput:placeholder',
+    defaultMessage: 'Skipaskrárnúmer eða nafn',
+    description: 'Skipaskrárnúmer eða nafn',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/CatchQuotaCalculator.tsx b/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/CatchQuotaCalculator.tsx
index 63b0bbbaf866..9908a6482890 100644
--- a/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/CatchQuotaCalculator.tsx
+++ b/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/CatchQuotaCalculator.tsx
@@ -1,7 +1,10 @@
-import { useRouter } from 'next/router'
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { useMachine } from '@xstate/react'
+import { useIntl } from 'react-intl'
 import cn from 'classnames'
+import { useRouter } from 'next/router'
+import { useMachine } from '@xstate/react'
+
+import { FiskistofaExtendedCatchQuotaCategory as ExtendedCatchQuotaCategory } from '@island.is/api/schema'
 import {
   Box,
   Button,
@@ -11,18 +14,17 @@ import {
   Tag,
   Text,
 } from '@island.is/island-ui/core'
-import { useNamespace } from '@island.is/web/hooks'
-import { FiskistofaExtendedCatchQuotaCategory as ExtendedCatchQuotaCategory } from '@island.is/api/schema'
+
 import {
   formattedNumberStringToNumber,
   generateTimePeriodOptions,
+  isNumberBelowZero,
+  numberFormatter,
   sevenFractionDigitNumberFormatter,
   TimePeriodOption,
-  numberFormatter,
-  isNumberBelowZero,
 } from '../utils'
-import { Context, machine, Event as EventType } from './machine'
-
+import { Context, Event as EventType, machine } from './machine'
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './CatchQuotaCalculator.css'
 
 const QUOTA_CHANGE_DEBOUNCE_TIME = 1000
@@ -81,13 +83,10 @@ interface QuotaStateChangeMetadata {
   timerId: number | null
 }
 
-interface CatchQuotaCalculatorProps {
-  namespace: Record<string, string>
-}
-
-const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
+const CatchQuotaCalculator = () => {
   const timePeriodOptions = useMemo(() => generateTimePeriodOptions(), [])
-  const n = useNamespace(namespace)
+  const { formatMessage } = useIntl()
+
   const [selectedTimePeriod, setSelectedTimePeriod] = useState(
     timePeriodOptions[0],
   )
@@ -357,7 +356,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
             <Select
               isDisabled={loading}
               size="sm"
-              label={n('timeperiod', 'Tímabil')}
+              label={formatMessage(translationStrings.timeperiod)}
               name="time-period-select"
               options={timePeriodOptions}
               value={selectedTimePeriod}
@@ -373,7 +372,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               isDisabled={loading}
               value={emptyValue}
               size="sm"
-              label={n('addType', 'Bæta við tegund')}
+              label={formatMessage(translationStrings.addType)}
               name="tegund-fiskur-select"
               options={quotaTypes}
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -401,7 +400,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               size="small"
               disabled={loading}
             >
-              {n('reset', 'Frumstilla')}
+              {formatMessage(translationStrings.reset)}
             </Button>
             <Button
               onClick={calculate}
@@ -413,14 +412,18 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                   JSON.stringify(prevChangesRef.current)
               }
             >
-              {loading ? <LoadingDots /> : n('calculate', 'Reikna')}
+              {loading ? (
+                <LoadingDots />
+              ) : (
+                formatMessage(translationStrings.calculate)
+              )}
             </Button>
           </Inline>
         </Box>
       </Box>
 
       <Text variant="small">
-        {n('fishingTimePeriod', 'Fiskveiðiárið')} 01.09.
+        {formatMessage(translationStrings.fishingTimePeriod)} 01.09.
         {selectedTimePeriod.startYear} - 31.08.
         {selectedTimePeriod.endYear}
       </Text>
@@ -450,7 +453,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               size="small"
               colorScheme="default"
             >
-              {n('clearAll', 'Hreinsa allt')}
+              {formatMessage(translationStrings.clearAll)}
             </Button>
           )}
         </Inline>
@@ -458,7 +461,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
 
       <Box width="full" textAlign="center">
         {state.matches('error') && (
-          <Text>{n('aflamarkError', 'Villa kom upp við að sækja gögn')}</Text>
+          <Text>{formatMessage(translationStrings.aflamarkError)}</Text>
         )}
       </Box>
 
@@ -467,7 +470,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
           <table className={styles.tableContainer}>
             <thead className={styles.tableHead}>
               <tr>
-                <th>{n('kvotategund', 'Kvótategund')}</th>
+                <th>{formatMessage(translationStrings.kvotategund)}</th>
                 {state.context.data.catchQuotaCategories.map((category) => {
                   return <th key={category.name}>{category.name}</th>
                 })}
@@ -475,7 +478,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
             </thead>
             <tbody>
               <tr>
-                <td>{n('codEquivalentRatio', 'Þorskígildisstuðull')}</td>
+                <td>{formatMessage(translationStrings.codEquivalentRatio)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td key={category.name}>
                     {category.codEquivalent
@@ -485,7 +488,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('uthlutun', 'Úthlutun')}</td>
+                <td>{formatMessage(translationStrings.uthlutun)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -498,7 +501,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('serstokUthlutun', 'Sérst. úthl.')}</td>
+                <td>{formatMessage(translationStrings.serstokUthlutun)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -515,7 +518,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('milliAra', 'Milli ára')}</td>
+                <td>{formatMessage(translationStrings.milliAra)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -530,7 +533,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('milliSkipa', 'Milli skipa')}</td>
+                <td>{formatMessage(translationStrings.milliSkipa)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -545,7 +548,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('aflamarksbreyting', 'Aflamarksbr.')}</td>
+                <td>{formatMessage(translationStrings.aflamarksbreyting)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td key={category.name}>
                     {category.id === 0 ? (
@@ -585,7 +588,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('aflamark', 'Aflamark')}</td>
+                <td>{formatMessage(translationStrings.aflamark)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -598,7 +601,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('afli', 'Afli')}</td>
+                <td>{formatMessage(translationStrings.afli)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -611,7 +614,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('aflabreyting', 'Aflabreyting')}</td>
+                <td>{formatMessage(translationStrings.aflabreyting)}</td>
 
                 {state.context.data.catchQuotaCategories.map((category) => {
                   return (
@@ -653,7 +656,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 })}
               </tr>
               <tr>
-                <td>{n('stada', 'Staða')}</td>
+                <td>{formatMessage(translationStrings.stada)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -666,7 +669,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('tilfaersla', 'Tilfærsla')}</td>
+                <td>{formatMessage(translationStrings.tilfaersla)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -681,7 +684,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('nyStada', 'Ný staða')}</td>
+                <td>{formatMessage(translationStrings.nyStada)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -694,7 +697,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('aNaestaAr', 'Á næsta ár')}</td>
+                <td>{formatMessage(translationStrings.aNaestaAr)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -707,7 +710,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('umframafli', 'Umframafli')}</td>
+                <td>{formatMessage(translationStrings.umframafli)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -718,7 +721,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
                 ))}
               </tr>
               <tr>
-                <td>{n('onotad', 'Ónotað')}</td>
+                <td>{formatMessage(translationStrings.onotad)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -733,7 +736,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
 
               <tr>
                 <td className={styles.visualSeparationLine}>
-                  {n('heildaraflamark', 'Heildaraflamark')}
+                  {formatMessage(translationStrings.heildaraflamark)}
                 </td>
                 {state.context.quotaData.map((category) => (
                   <td
@@ -750,7 +753,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               </tr>
 
               <tr>
-                <td>{n('aaetladAflamark', 'Áætlað aflamark')}</td>
+                <td>{formatMessage(translationStrings.aaetladAflamark)}</td>
                 {state.context.quotaData.map((category) => (
                   <td key={category.id}>
                     {category.id === 0 ? (
@@ -782,7 +785,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               </tr>
 
               <tr>
-                <td>{n('hlutdeild', 'Hlutdeild')}</td>
+                <td>{formatMessage(translationStrings.hlutdeild)}</td>
                 {state.context.quotaData.map((category) => (
                   <td key={category.id}>
                     {category.id === 0 ? (
@@ -813,7 +816,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               </tr>
 
               <tr>
-                <td>{n('aNaestaArKvoti', 'Á næsta ár kvóti')}</td>
+                <td>{formatMessage(translationStrings.aNaestaArKvoti)}</td>
 
                 {state.context.quotaData.map((category) => (
                   <td key={category.id}>
@@ -844,7 +847,7 @@ const CatchQuotaCalculator = ({ namespace }: CatchQuotaCalculatorProps) => {
               </tr>
 
               <tr>
-                <td>{n('afNaestaArKvoti', 'Af næsta ári kvóti')}</td>
+                <td>{formatMessage(translationStrings.afNaestaArKvoti)}</td>
                 {state.context.quotaData.map((category) => (
                   <td key={category.id}>
                     {category.id === 0 ? (
diff --git a/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/translation.strings.ts b/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/translation.strings.ts
new file mode 100644
index 000000000000..ceb98e4a062f
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/calculators/CatchQuotaCalculator/translation.strings.ts
@@ -0,0 +1,144 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  timeperiod: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:timeperiod',
+    defaultMessage: 'Tímabil',
+    description: 'Tímabil',
+  },
+  addType: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:addType',
+    defaultMessage: 'Bæta við tegund',
+    description: 'Bæta við tegund',
+  },
+  reset: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:reset',
+    defaultMessage: 'Frumstilla',
+    description: 'Frumstilla',
+  },
+  calculate: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Reikna',
+  },
+  fishingTimePeriod: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:fishingTimePeriod',
+    defaultMessage: 'Fiskveiðiárið',
+    description: 'Fiskveiðiárið',
+  },
+  clearAll: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:clearAll',
+    defaultMessage: 'Hreinsa allt',
+    description: 'Hreinsa allt',
+  },
+  aflamarkError: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aflamarkError',
+    defaultMessage: 'Villa kom upp við að sækja gögn',
+    description: 'Texti sem birtist þegar villa kemur upp við að sækja gögn',
+  },
+  kvotategund: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:kvotategund',
+    defaultMessage: 'Kvótategund',
+    description: 'Kvótategund',
+  },
+  codEquivalentRatio: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:codEquivalentRatio',
+    defaultMessage: 'Þorskígildisstuðull',
+    description: 'Þorskígildisstuðull',
+  },
+  uthlutun: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:uthlutun',
+    defaultMessage: 'Úthlutun',
+    description: 'Úthlutun',
+  },
+  serstokUthlutun: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:serstokUthlutun',
+    defaultMessage: 'Sérst. úthl.',
+    description: 'Sérstök úthlutun',
+  },
+  milliAra: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:milliAra',
+    defaultMessage: 'Milli ára',
+    description: 'Milli ára',
+  },
+  milliSkipa: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:milliSkipa',
+    defaultMessage: 'Milli skipa',
+    description: 'Milli skipa',
+  },
+  aflamarksbreyting: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aflamarksbreyting',
+    defaultMessage: 'Aflamarksbr.',
+    description: 'Aflamarksbreyting',
+  },
+  aflamark: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aflamark',
+    defaultMessage: 'Aflamark',
+    description: 'Aflamark',
+  },
+  afli: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:afli',
+    defaultMessage: 'Afli',
+    description: 'Afli',
+  },
+  aflabreyting: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aflabreyting',
+    defaultMessage: 'Aflabreyting',
+    description: 'Aflabreyting',
+  },
+  stada: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:stada',
+    defaultMessage: 'Staða',
+    description: 'Staða',
+  },
+  tilfaersla: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:tilfaersla',
+    defaultMessage: 'Tilfærsla',
+    description: 'Tilfærsla',
+  },
+  nyStada: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:nyStada',
+    defaultMessage: 'Ný staða',
+    description: 'Ný staða',
+  },
+  aNaestaAr: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aNaestaAr',
+    defaultMessage: 'Á næsta ár',
+    description: 'Á næsta ár',
+  },
+  umframafli: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:umframafli',
+    defaultMessage: 'Umframafli',
+    description: 'Umframafli',
+  },
+  onotad: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:onotad',
+    defaultMessage: 'Ónotað',
+    description: 'Ónotað',
+  },
+  heildaraflamark: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:heildaraflamark',
+    defaultMessage: 'Heildaraflamark',
+    description: 'Heildaraflamark',
+  },
+  aaetladAflamark: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aaetladAflamark',
+    defaultMessage: 'Áætlað aflamark',
+    description: 'Áætlað aflamark',
+  },
+  hlutdeild: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:hlutdeild',
+    defaultMessage: 'Hlutdeild',
+    description: 'Hlutdeild',
+  },
+  aNaestaArKvoti: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:aNaestaArKvoti',
+    defaultMessage: 'Á næsta ár kvóti',
+    description: 'Á næsta ár kvóti',
+  },
+  afNaestaArKvoti: {
+    id: 'web.fiskistofaCalculatorsCatchQuotaCalculator:afNaestaArKvoti',
+    defaultMessage: 'Af næsta ári kvóti',
+    description: 'Af næsta ári kvóti',
+  },
+})
diff --git a/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/StraddlingStockCalculator.tsx b/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/StraddlingStockCalculator.tsx
index 118283164280..c9645a528052 100644
--- a/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/StraddlingStockCalculator.tsx
+++ b/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/StraddlingStockCalculator.tsx
@@ -1,7 +1,10 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { useRouter } from 'next/router'
+import { useIntl } from 'react-intl'
 import cn from 'classnames'
+import { useRouter } from 'next/router'
 import { useMachine } from '@xstate/react'
+
+import { FiskistofaCatchQuotaCategory as CatchQuotaCategory } from '@island.is/api/schema'
 import {
   Box,
   Button,
@@ -11,16 +14,15 @@ import {
   Tag,
   Text,
 } from '@island.is/island-ui/core'
-import { FiskistofaCatchQuotaCategory as CatchQuotaCategory } from '@island.is/api/schema'
-import { useNamespace } from '@island.is/web/hooks'
+
 import {
   getYearOptions,
-  YearOption,
-  numberFormatter,
   isNumberBelowZero,
+  numberFormatter,
+  YearOption,
 } from '../utils'
-import { machine, Context, Event as EventType } from './machine'
-
+import { Context, Event as EventType, machine } from './machine'
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './StraddlingStockCalculator.css'
 
 const emptyValue = { value: -1, label: '' }
@@ -43,18 +45,12 @@ type ChangeErrors = Record<
   }
 >
 
-interface StraddlingStockCalculatorProps {
-  namespace: Record<string, string>
-}
-
-const StraddlingStockCalculator = ({
-  namespace,
-}: StraddlingStockCalculatorProps) => {
+const StraddlingStockCalculator = () => {
   const yearOptions = useMemo(() => getYearOptions(), [])
   const [selectedYear, setSelectedYear] = useState<YearOption>(yearOptions[0])
   const [changes, setChanges] = useState<Changes>({})
   const [changeErrors, setChangeErrors] = useState<ChangeErrors>({})
-  const n = useNamespace(namespace)
+  const { formatMessage } = useIntl()
   const prevChangesRef = useRef<Changes | null>(null)
 
   const [shipNumber, setShipNumber] = useState<number | null>(null)
@@ -214,7 +210,7 @@ const StraddlingStockCalculator = ({
             <Select
               isDisabled={loading}
               size="sm"
-              label={n('year', 'Ár')}
+              label={formatMessage(translationStrings.year)}
               name="year-select"
               options={yearOptions}
               value={selectedYear}
@@ -230,7 +226,7 @@ const StraddlingStockCalculator = ({
               isDisabled={loading}
               value={emptyValue}
               size="sm"
-              label={n('addType', 'Bæta við tegund')}
+              label={formatMessage(translationStrings.addType)}
               name="tegund-fiskur-select"
               options={quotaTypes}
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -258,7 +254,7 @@ const StraddlingStockCalculator = ({
               size="small"
               disabled={loading}
             >
-              {n('reset', 'Frumstilla')}
+              {formatMessage(translationStrings.reset)}
             </Button>
             <Button
               onClick={calculate}
@@ -270,14 +266,19 @@ const StraddlingStockCalculator = ({
                   JSON.stringify(prevChangesRef.current)
               }
             >
-              {loading ? <LoadingDots /> : n('calculate', 'Reikna')}
+              {loading ? (
+                <LoadingDots />
+              ) : (
+                formatMessage(translationStrings.calculate)
+              )}
             </Button>
           </Inline>
         </Box>
       </Box>
 
       <Text variant="small">
-        {n('calendarYear', 'Almanaksárið')} 01.01.{selectedYear.label} - 31.12.
+        {formatMessage(translationStrings.calendarYear)} 01.01.
+        {selectedYear.label} - 31.12.
         {selectedYear.label}
       </Text>
 
@@ -306,7 +307,7 @@ const StraddlingStockCalculator = ({
               size="small"
               colorScheme="default"
             >
-              {n('clearAll', 'Hreinsa allt')}
+              {formatMessage(translationStrings.clearAll)}
             </Button>
           )}
         </Inline>
@@ -314,9 +315,7 @@ const StraddlingStockCalculator = ({
 
       <Box width="full" textAlign="center">
         {state.matches('error') && (
-          <Text>
-            {n('deilistofnaError', 'Villa kom upp við að sækja gögn')}
-          </Text>
+          <Text>{formatMessage(translationStrings.deilistofnaError)}</Text>
         )}
       </Box>
 
@@ -325,7 +324,7 @@ const StraddlingStockCalculator = ({
           <table className={styles.tableContainer}>
             <thead className={styles.tableHead}>
               <tr>
-                <th>{n('kvotategund', 'Kvótategund')}</th>
+                <th>{formatMessage(translationStrings.kvotategund)}</th>
                 {state.context.data.catchQuotaCategories.map((category) => {
                   return <th key={category.name}>{category.name}</th>
                 })}
@@ -333,7 +332,7 @@ const StraddlingStockCalculator = ({
             </thead>
             <tbody>
               <tr>
-                <td>{n('codEquivalentRatio', 'Þorskígildisstuðull')}</td>
+                <td>{formatMessage(translationStrings.codEquivalentRatio)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -349,7 +348,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('uthlutun', 'Úthlutun')}</td>
+                <td>{formatMessage(translationStrings.uthlutun)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -362,7 +361,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('serstokUthlutun', 'Sérst. úthl.')}</td>
+                <td>{formatMessage(translationStrings.serstokUthlutun)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -379,7 +378,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('milliAra', 'Milli ára')}</td>
+                <td>{formatMessage(translationStrings.milliAra)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -394,7 +393,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('milliSkipa', 'Milli skipa')}</td>
+                <td>{formatMessage(translationStrings.milliSkipa)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -409,7 +408,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('aflamarksbreyting', 'Aflamarksbr.')}</td>
+                <td>{formatMessage(translationStrings.aflamarksbreyting)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td key={category.name}>
                     {category.id === 0 ? (
@@ -449,7 +448,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('aflamark', 'Aflamark')}</td>
+                <td>{formatMessage(translationStrings.aflamark)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -462,7 +461,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('afli', 'Afli')}</td>
+                <td>{formatMessage(translationStrings.afli)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -475,7 +474,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('aflabreyting', 'Aflabreyting')}</td>
+                <td>{formatMessage(translationStrings.aflabreyting)}</td>
 
                 {state.context.data.catchQuotaCategories.map((category) => {
                   return (
@@ -517,7 +516,7 @@ const StraddlingStockCalculator = ({
                 })}
               </tr>
               <tr>
-                <td>{n('stada', 'Staða')}</td>
+                <td>{formatMessage(translationStrings.stada)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -530,7 +529,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('tilfaersla', 'Tilfærsla')}</td>
+                <td>{formatMessage(translationStrings.tilfaersla)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -545,7 +544,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('nyStada', 'Ný staða')}</td>
+                <td>{formatMessage(translationStrings.nyStada)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -558,7 +557,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('aNaestaAr', 'Á næsta ár')}</td>
+                <td>{formatMessage(translationStrings.aNaestaAr)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -571,7 +570,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('umframafli', 'Umframafli')}</td>
+                <td>{formatMessage(translationStrings.umframafli)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
@@ -582,7 +581,7 @@ const StraddlingStockCalculator = ({
                 ))}
               </tr>
               <tr>
-                <td>{n('onotad', 'Ónotað')}</td>
+                <td>{formatMessage(translationStrings.onotad)}</td>
                 {state.context.data.catchQuotaCategories.map((category) => (
                   <td
                     key={category.name}
diff --git a/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/translation.strings.ts b/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/translation.strings.ts
new file mode 100644
index 000000000000..b9f651b11ad5
--- /dev/null
+++ b/apps/web/components/connected/fiskistofa/calculators/StraddlingStockCalculator/translation.strings.ts
@@ -0,0 +1,120 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  year: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:year',
+    defaultMessage: 'Ár',
+    description: 'Ár',
+  },
+  addType: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:addType',
+    defaultMessage: 'Bæta við tegund',
+    description: 'Bæta við tegund',
+  },
+  reset: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:reset',
+    defaultMessage: 'Frumstilla',
+    description: 'Frumstilla',
+  },
+  calculate: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Reikna',
+  },
+  calendarYear: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:calendarYear',
+    defaultMessage: 'Almanaksárið',
+    description: 'Almanaksárið',
+  },
+  clearAll: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:clearAll',
+    defaultMessage: 'Hreinsa allt',
+    description: 'Hreinsa allt',
+  },
+  deilistofnaError: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:deilistofnaError',
+    defaultMessage: 'Villa kom upp við að sækja gögn',
+    description:
+      'Texti fyrir villu skilaboð sem birtast þegar ekki tekst að sækja gögn',
+  },
+  kvotategund: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:kvotategund',
+    defaultMessage: 'Kvótategund',
+    description: 'Kvótategund',
+  },
+  codEquivalentRatio: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:codEquivalentRatio',
+    defaultMessage: 'Þorskígildisstuðull',
+    description: 'Þorskígildisstuðull',
+  },
+  uthlutun: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:uthlutun',
+    defaultMessage: 'Úthlutun',
+    description: 'Úthlutun',
+  },
+  serstokUthlutun: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:serstokUthlutun',
+    defaultMessage: 'Sérst. úthl.',
+    description: 'Sérstök úthlutun',
+  },
+  milliAra: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:milliAra',
+    defaultMessage: 'Milli ára',
+    description: 'Milli ára',
+  },
+  milliSkipa: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:milliSkipa',
+    defaultMessage: 'Milli skipa',
+    description: 'Milli skipa',
+  },
+  aflamarksbreyting: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:aflamarksbreyting',
+    defaultMessage: 'Aflamarksbr',
+    description: 'Aflamarksbreyting',
+  },
+  aflamark: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:aflamark',
+    defaultMessage: 'Aflamark',
+    description: 'Aflamark',
+  },
+  afli: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:afli',
+    defaultMessage: 'Afli',
+    description: 'Afli',
+  },
+  aflabreyting: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:aflabreyting',
+    defaultMessage: 'Aflabreyting',
+    description: 'Aflabreyting',
+  },
+  stada: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:stada',
+    defaultMessage: 'Staða',
+    description: 'Staða',
+  },
+  tilfaersla: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:tilfaersla',
+    defaultMessage: 'Tilfærsla',
+    description: 'Tilfærsla',
+  },
+  nyStada: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:nyStada',
+    defaultMessage: 'Ný staða',
+    description: 'Ný staða',
+  },
+  aNaestaAr: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:aNaestaAr',
+    defaultMessage: 'Á næsta ár',
+    description: 'Á næsta ár',
+  },
+  umframafli: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:umframafli',
+    defaultMessage: 'Umframafli',
+    description: 'Umframafli',
+  },
+  onotad: {
+    id: 'web.fiskistofaCalculatorsStraddlingStockCalculator:onotad',
+    defaultMessage: 'Ónotað',
+    description: 'Ónotað',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/AlcoholLicencesList.tsx b/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/AlcoholLicencesList.tsx
index 9a7bcb0ae61f..0f0ccb5074ae 100644
--- a/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/AlcoholLicencesList.tsx
+++ b/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/AlcoholLicencesList.tsx
@@ -1,33 +1,36 @@
 import { FC, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQuery } from '@apollo/client/react'
-import { GET_ALCOHOL_LICENCES_QUERY } from './queries'
+
+import {
+  AlertMessage,
+  Box,
+  Button,
+  GridColumn,
+  GridContainer,
+  GridRow,
+  Input,
+  LoadingDots,
+  Select,
+  Tag,
+  Text,
+} from '@island.is/island-ui/core'
+import { SyslumennListCsvExport } from '@island.is/web/components'
 import {
   AlcoholLicence,
   ConnectedComponent,
   Query,
 } from '@island.is/web/graphql/schema'
+import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
+
 import {
-  prepareCsvString,
-  textSearch,
   getNormalizedSearchTerms,
   getValidPeriodRepresentation,
+  prepareCsvString,
+  textSearch,
 } from '../../utils'
-import {
-  Box,
-  Button,
-  Tag,
-  LoadingDots,
-  Text,
-  Input,
-  AlertMessage,
-  Select,
-  GridContainer,
-  GridRow,
-  GridColumn,
-} from '@island.is/island-ui/core'
-import { SyslumennListCsvExport } from '@island.is/web/components'
-import { useNamespace } from '@island.is/web/hooks'
-import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
+import { GET_ALCOHOL_LICENCES_QUERY } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 10
 
@@ -40,10 +43,10 @@ type ListState = 'loading' | 'loaded' | 'error'
 const AlcoholLicencesList: FC<
   React.PropsWithChildren<AlcoholLicencesListProps>
 > = ({ slice }) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const { format } = useDateUtils()
   const PAGE_SIZE = slice?.configJson?.pageSize ?? DEFAULT_PAGE_SIZE
-  const DATE_FORMAT = n('dateFormat', 'd. MMMM yyyy')
+  const DATE_FORMAT = formatMessage(t.dateFormat)
 
   const [listState, setListState] = useState<ListState>('loading')
   const [showCount, setShowCount] = useState(PAGE_SIZE)
@@ -88,15 +91,15 @@ const AlcoholLicencesList: FC<
     return new Promise<string>((resolve, reject) => {
       if (alcoholLicences) {
         const headerRow = [
-          n('csvHeaderLicenceType', 'Tegund'),
-          n('csvHeaderLicenceSubType', 'Tegund leyfis'),
-          n('csvHeaderLicenseNumber', 'Leyfisnúmer'),
-          n('csvHeaderLicenseHolder', 'Leyfishafi'),
-          n('csvHeaderLicenseResponsible', 'Ábyrgðarmaður'),
-          n('csvHeaderValidFrom', 'Gildir frá'),
-          n('csvHeaderValidTo', 'Gildir til'),
-          n('csvHeaderOffice', 'Embætti'),
-          n('csvHeaderLocation', 'Starfsstöð embættis'),
+          formatMessage(t.csvHeaderLicenceType),
+          formatMessage(t.csvHeaderLicenceSubType),
+          formatMessage(t.csvHeaderLicenseNumber),
+          formatMessage(t.csvHeaderLicenseHolder),
+          formatMessage(t.csvHeaderLicenseResponsible),
+          formatMessage(t.csvHeaderValidFrom),
+          formatMessage(t.csvHeaderValidTo),
+          formatMessage(t.csvHeaderOffice),
+          formatMessage(t.csvHeaderLocation),
         ]
         const dataRows = []
         for (const alcoholLicence of alcoholLicences) {
@@ -121,7 +124,7 @@ const AlcoholLicencesList: FC<
   }
 
   // Filter - Office
-  const allOfficesOption = n('filterOfficeAll', 'Öll embætti')
+  const allOfficesOption = formatMessage(t.filterOfficeAll)
   const avaibleOfficesOptions = [
     allOfficesOption,
     ...Array.from(
@@ -135,7 +138,7 @@ const AlcoholLicencesList: FC<
   )
 
   // Filter - Type
-  const allLicenceTypeOption = n('filterLicenceTypeAll', 'Allar tegundir')
+  const allLicenceTypeOption = formatMessage(t.filterLicenceTypeAll)
   const avaibleLicenceTypeOptions = [
     allLicenceTypeOption,
     ...Array.from(
@@ -191,8 +194,8 @@ const AlcoholLicencesList: FC<
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n('errorMessage', 'Ekki tókst að sækja áfengisleyfi.')}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -210,7 +213,7 @@ const AlcoholLicencesList: FC<
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('alcoholLicencesFilterLicenceType', 'Tegund')}
+                  label={formatMessage(t.alcoholLicencesFilterLicenceType)}
                   name="licenceTypeSelect"
                   options={avaibleLicenceTypeOptions.map((x) => ({
                     label: x,
@@ -238,7 +241,7 @@ const AlcoholLicencesList: FC<
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('alcoholLicencesFilterOffice', 'Embætti')}
+                  label={formatMessage(t.alcoholLicencesFilterOffice)}
                   name="officeSelect"
                   options={avaibleOfficesOptions.map((x) => ({
                     label: x,
@@ -262,7 +265,7 @@ const AlcoholLicencesList: FC<
               <GridColumn paddingBottom={[1, 1, 1]} span={'12/12'}>
                 <Input
                   name="alcoholLicencesSearchInput"
-                  placeholder={n('searchPlaceholder', 'Leita')}
+                  placeholder={formatMessage(t.searchPlaceholder)}
                   backgroundColor={['blue', 'blue', 'white']}
                   size="sm"
                   icon={{
@@ -273,19 +276,10 @@ const AlcoholLicencesList: FC<
                 />
                 <Box textAlign="right" marginRight={1} marginTop={1}>
                   <SyslumennListCsvExport
-                    defaultLabel={n(
-                      'csvButtonLabelDefault',
-                      'Sækja öll leyfi (CSV)',
-                    )}
-                    loadingLabel={n(
-                      'csvButtonLabelLoading',
-                      'Sæki öll leyfi...',
-                    )}
-                    errorLabel={n(
-                      'csvButtonLabelError',
-                      'Ekki tókst að sækja leyfi, reyndu aftur',
-                    )}
-                    csvFilenamePrefix={n('csvFileTitlePrefix', 'Áfengisleyfi')}
+                    defaultLabel={formatMessage(t.csvButtonLabelDefault)}
+                    loadingLabel={formatMessage(t.csvButtonLabelLoading)}
+                    errorLabel={formatMessage(t.csvButtonLabelError)}
+                    csvFilenamePrefix={formatMessage(t.csvFileTitlePrefix)}
                     csvStringProvider={csvStringProvider}
                   />
                 </Box>
@@ -296,7 +290,7 @@ const AlcoholLicencesList: FC<
       )}
       {listState === 'loaded' && filteredAlcoholLicences.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">{n('noResults', 'Engin leyfi fundust.')}</Text>
+          <Text variant="h3">{formatMessage(t.noResults)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredAlcoholLicences.length > 0 && (
@@ -341,12 +335,12 @@ const AlcoholLicencesList: FC<
                       <Text variant="h3">{alcoholLicence.licenseHolder}</Text>
 
                       <Text paddingBottom={2}>
-                        {n('licenseNumber', 'Leyfisnúmer')}:{' '}
+                        {formatMessage(t.licenseNumber)}:{' '}
                         {alcoholLicence.licenseNumber}
                       </Text>
 
                       <Text>
-                        {n('validPeriodLabel', 'Gildistími')}:{' '}
+                        {formatMessage(t.validPeriodLabel)}:{' '}
                         {getValidPeriodRepresentation(
                           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                           // @ts-ignore make web strict
@@ -354,18 +348,15 @@ const AlcoholLicencesList: FC<
                           alcoholLicence.validTo,
                           DATE_FORMAT,
                           format,
-                          n('validPeriodUntil', 'Til'),
-                          n('validPeriodIndefinite', 'Ótímabundið'),
+                          formatMessage(t.validPeriodUntil),
+                          formatMessage(t.validPeriodIndefinite),
                         )}
                       </Text>
 
                       <Text>
-                        {n('licenseResponsible', 'Ábyrgðarmaður')}:{' '}
+                        {formatMessage(t.licenseResponsible)}:{' '}
                         {alcoholLicence.licenseResponsible ||
-                          n(
-                            'licenseResponsibleNotRegistered',
-                            'Enginn skráður',
-                          )}
+                          formatMessage(t.licenseResponsibleNotRegistered)}
                       </Text>
                     </Box>
                   </Box>
@@ -380,7 +371,7 @@ const AlcoholLicencesList: FC<
           >
             {showCount < filteredAlcoholLicences.length && (
               <Button onClick={() => setShowCount(showCount + PAGE_SIZE)}>
-                {n('loadMore', 'Sjá fleiri')} (
+                {formatMessage(t.loadMore)} (
                 {filteredAlcoholLicences.length - showCount})
               </Button>
             )}
diff --git a/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/translation.strings.ts b/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/translation.strings.ts
new file mode 100644
index 000000000000..a376883ec819
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/CardLists/AlcoholLicencesList/translation.strings.ts
@@ -0,0 +1,149 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  dateFormat: {
+    id: 'web.syslumenn.alcoholLicencesList:dateFormat',
+    defaultMessage: 'd. MMMM yyyy',
+    description: 'Hvernig dagsetningin birtist',
+  },
+  csvHeaderLicenceType: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLicenceType',
+    defaultMessage: 'Tegund',
+    description: 'Tegund (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenceSubType: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLicenceSubType',
+    defaultMessage: 'Tegund leyfis',
+    description: 'Tegund leyfis (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseNumber: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLicenseNumber',
+    defaultMessage: 'Leyfisnúmer',
+    description: 'Leyfisnúmer (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseHolder: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLicenseHolder',
+    defaultMessage: 'Leyfishafi',
+    description: 'Leyfishafi (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseResponsible: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLicenseResponsible',
+    defaultMessage: 'Ábyrgðarmaður',
+    description: 'Ábyrgðarmaður (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderValidFrom: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderValidFrom',
+    defaultMessage: 'Gildir frá',
+    description: 'Gildir frá (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderValidTo: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderValidTo',
+    defaultMessage: 'Gildir til',
+    description: 'Gildir til (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderOffice: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderOffice',
+    defaultMessage: 'Embætti',
+    description: 'Embætti (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLocation: {
+    id: 'web.syslumenn.alcoholLicencesList:csvHeaderLocation',
+    defaultMessage: 'Starfsstöð embættis',
+    description: 'Starfsstöð embættis (texti fyrir dálk í CSV skrá)',
+  },
+  filterOfficeAll: {
+    id: 'web.syslumenn.alcoholLicencesList:filterOfficeAll',
+    defaultMessage: 'Öll embætti',
+    description: 'Öll embætti',
+  },
+  filterLicenceTypeAll: {
+    id: 'web.syslumenn.alcoholLicencesList:filterLicenceTypeAll',
+    defaultMessage: 'Allar tegundir',
+    description: 'Allar tegundir',
+  },
+  errorTitle: {
+    id: 'web.syslumenn.alcoholLicencesList:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Titill á villuskilaboðum ef ekki tókst að sækja áfengisleyfi',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.alcoholLicencesList:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja áfengisleyfi.',
+    description: 'Villuskilaboð ef ekki tókst að sækja áfengisleyfi',
+  },
+  alcoholLicencesFilterLicenceType: {
+    id: 'web.syslumenn.alcoholLicencesList:alcoholLicencesFilterLicenceType',
+    defaultMessage: 'Tegund',
+    description: 'Label á tegund filter',
+  },
+  alcoholLicencesFilterOffice: {
+    id: 'web.syslumenn.alcoholLicencesList:alcoholLicencesFilterOffice',
+    defaultMessage: 'Embætti',
+    description: 'Label á embættis filter',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.alcoholLicencesList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Placeholder texti í leitarboxi',
+  },
+  csvButtonLabelDefault: {
+    id: 'web.syslumenn.alcoholLicencesList:csvButtonLabelDefault',
+    defaultMessage: 'Sækja öll leyfi (CSV).',
+    description: 'Texti fyrir CSV hnapp',
+  },
+  csvButtonLabelLoading: {
+    id: 'web.syslumenn.alcoholLicencesList:csvButtonLabelLoading',
+    defaultMessage: 'Sæki öll leyfi...',
+    description: 'Texti þegar smellt er á CSV hnapp',
+  },
+  csvButtonLabelError: {
+    id: 'web.syslumenn.alcoholLicencesList:csvButtonLabelError',
+    defaultMessage: 'Ekki tókst að sækja leyfi, reyndu aftur.',
+    description: 'Texti fyrir CSV hnapp ef ekki tókst að sækja skrá',
+  },
+  csvFileTitlePrefix: {
+    id: 'web.syslumenn.alcoholLicencesList:csvFileTitlePrefix',
+    defaultMessage: 'Áfengisleyfi',
+    description: 'Titill á CSV skrá',
+  },
+  noResults: {
+    id: 'web.syslumenn.alcoholLicencesList:noResults',
+    defaultMessage: 'Engin leyfi fundust',
+    description: 'Texti sem birtist ef engin leyfi fundust',
+  },
+  licenseNumber: {
+    id: 'web.syslumenn.alcoholLicencesList:licenseNumber',
+    defaultMessage: 'Leyfisnúmer',
+    description: 'Leyfisnúmer',
+  },
+  validPeriodLabel: {
+    id: 'web.syslumenn.alcoholLicencesList:validPeriodLabel',
+    defaultMessage: 'Gildistími',
+    description: 'Gildistími',
+  },
+  validPeriodUntil: {
+    id: 'web.syslumenn.alcoholLicencesList:validPeriodUntil',
+    defaultMessage: 'Til',
+    description: 'Til',
+  },
+  validPeriodIndefinite: {
+    id: 'web.syslumenn.alcoholLicencesList:validPeriodIndefinite',
+    defaultMessage: 'Ótímabundið',
+    description: 'Ótímabundið',
+  },
+  licenseResponsible: {
+    id: 'web.syslumenn.alcoholLicencesList:licenseResponsible',
+    defaultMessage: 'Ábyrgðarmaður',
+    description: 'Ábyrgðarmaður',
+  },
+  licenseResponsibleNotRegistered: {
+    id: 'web.syslumenn.alcoholLicencesList:licenseResponsibleNotRegistered',
+    defaultMessage: 'Enginn skráður',
+    description: 'Enginn skráður',
+  },
+  loadMore: {
+    id: 'web.syslumenn.alcoholLicencesList:loadMore',
+    defaultMessage: 'Sjá fleiri',
+    description: 'Sjá fleiri',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/TemporaryEventLicencesList.tsx b/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/TemporaryEventLicencesList.tsx
index 2f2fd298e566..0ddcc8a4a0fa 100644
--- a/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/TemporaryEventLicencesList.tsx
+++ b/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/TemporaryEventLicencesList.tsx
@@ -1,34 +1,37 @@
 import { FC, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQuery } from '@apollo/client/react'
-import { GET_TEMPORARY_EVENT_LICENCES } from './queries'
+
+import {
+  AlertMessage,
+  Box,
+  Button,
+  GridColumn,
+  GridContainer,
+  GridRow,
+  Input,
+  LoadingDots,
+  Select,
+  Tag,
+  Text,
+} from '@island.is/island-ui/core'
+import { SyslumennListCsvExport } from '@island.is/web/components'
 import {
   ConnectedComponent,
   Maybe,
   Query,
   TemporaryEventLicence,
 } from '@island.is/web/graphql/schema'
+import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
+
 import {
-  prepareCsvString,
-  textSearch,
   getNormalizedSearchTerms,
   getValidPeriodRepresentation,
+  prepareCsvString,
+  textSearch,
 } from '../../utils'
-import {
-  Box,
-  Button,
-  Tag,
-  LoadingDots,
-  Text,
-  Input,
-  AlertMessage,
-  Select,
-  GridContainer,
-  GridRow,
-  GridColumn,
-} from '@island.is/island-ui/core'
-import { SyslumennListCsvExport } from '@island.is/web/components'
-import { useNamespace } from '@island.is/web/hooks'
-import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
+import { GET_TEMPORARY_EVENT_LICENCES } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 10
 
@@ -41,10 +44,10 @@ type ListState = 'loading' | 'loaded' | 'error'
 const TemporaryEventLicencesList: FC<
   React.PropsWithChildren<TemporaryEventLicencesListProps>
 > = ({ slice }) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const { format } = useDateUtils()
   const PAGE_SIZE = slice?.configJson?.pageSize ?? DEFAULT_PAGE_SIZE
-  const DATE_FORMAT = n('dateFormat', "d. MMMM yyyy 'kl.' HH:mm")
+  const DATE_FORMAT = formatMessage(t.dateFormat)
 
   const [listState, setListState] = useState<ListState>('loading')
   const [showCount, setShowCount] = useState(PAGE_SIZE)
@@ -89,14 +92,14 @@ const TemporaryEventLicencesList: FC<
     return new Promise<string>((resolve, reject) => {
       if (temporaryEventLicences) {
         const headerRow = [
-          n('csvHeaderLicenceType', 'Tegund'),
-          n('csvHeaderLicenceSubType', 'Tegund leyfis'),
-          n('csvHeaderLicenseNumber', 'Leyfisnúmer'),
-          n('csvHeaderLicenseHolder', 'Leyfishafi'),
-          n('csvHeaderLicenseResponsible', 'Ábyrgðarmaður'),
-          n('csvHeaderValidFrom', 'Gildir frá'),
-          n('csvHeaderValidTo', 'Gildir til'),
-          n('csvHeaderIssuedBy', 'Útgefið af'),
+          formatMessage(t.csvHeaderLicenceType),
+          formatMessage(t.csvHeaderLicenceSubType),
+          formatMessage(t.csvHeaderLicenseNumber),
+          formatMessage(t.csvHeaderLicenseHolder),
+          formatMessage(t.csvHeaderLicenseResponsible),
+          formatMessage(t.csvHeaderValidFrom),
+          formatMessage(t.csvHeaderValidTo),
+          formatMessage(t.csvHeaderIssuedBy),
         ]
         const dataRows = []
         for (const temporaryEventLicence of temporaryEventLicences) {
@@ -118,7 +121,7 @@ const TemporaryEventLicencesList: FC<
   }
 
   // Filter - Office
-  const allOfficesOption = n('filterOfficeAll', 'Öll embætti')
+  const allOfficesOption = formatMessage(t.filterOfficeAll)
   const avaibleOfficesOptions = [
     allOfficesOption,
     ...Array.from(
@@ -132,7 +135,7 @@ const TemporaryEventLicencesList: FC<
   )
 
   // Filter - SubType
-  const allLicenceSubTypeOption = n('filterLicenceSubTypeAll', 'Allar tegundir')
+  const allLicenceSubTypeOption = formatMessage(t.filterLicenceSubTypeAll)
   const avaibleLicenceSubTypeOptions = [
     allLicenceSubTypeOption,
     ...Array.from(
@@ -192,8 +195,8 @@ const TemporaryEventLicencesList: FC<
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n('errorMessage', 'Ekki tókst að sækja tækifærisleyfi.')}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -211,7 +214,7 @@ const TemporaryEventLicencesList: FC<
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('alcoholLicencesFilterLicenceSubType', 'Tegund')}
+                  label={formatMessage(t.alcoholLicencesFilterLicenceSubType)}
                   name="licenceSubTypeSelect"
                   options={avaibleLicenceSubTypeOptions.map((x) => ({
                     label: x,
@@ -239,7 +242,7 @@ const TemporaryEventLicencesList: FC<
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('alcoholLicencesFilterOffice', 'Embætti')}
+                  label={formatMessage(t.alcoholLicencesFilterOffice)}
                   name="officeSelect"
                   options={avaibleOfficesOptions.map((x) => ({
                     label: x,
@@ -263,7 +266,7 @@ const TemporaryEventLicencesList: FC<
               <GridColumn paddingBottom={[1, 1, 1]} span={'12/12'}>
                 <Input
                   name="temporaryEventLicencesSearchInput"
-                  placeholder={n('searchPlaceholder', 'Leita')}
+                  placeholder={formatMessage(t.searchPlaceholder)}
                   backgroundColor={['blue', 'blue', 'white']}
                   size="sm"
                   icon={{
@@ -274,22 +277,10 @@ const TemporaryEventLicencesList: FC<
                 />
                 <Box textAlign="right" marginRight={1} marginTop={1}>
                   <SyslumennListCsvExport
-                    defaultLabel={n(
-                      'csvButtonLabelDefault',
-                      'Sækja öll leyfi (CSV)',
-                    )}
-                    loadingLabel={n(
-                      'csvButtonLabelLoading',
-                      'Sæki öll leyfi...',
-                    )}
-                    errorLabel={n(
-                      'csvButtonLabelError',
-                      'Ekki tókst að sækja leyfi, reyndu aftur',
-                    )}
-                    csvFilenamePrefix={n(
-                      'csvFileTitlePrefix',
-                      'Tækifærisleyfi',
-                    )}
+                    defaultLabel={formatMessage(t.csvButtonLabelDefault)}
+                    loadingLabel={formatMessage(t.csvButtonLabelLoading)}
+                    errorLabel={formatMessage(t.csvButtonLabelError)}
+                    csvFilenamePrefix={formatMessage(t.csvFileTitlePrefix)}
                     csvStringProvider={csvStringProvider}
                   />
                 </Box>
@@ -300,7 +291,7 @@ const TemporaryEventLicencesList: FC<
       )}
       {listState === 'loaded' && filteredTemporaryEventLicences.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">{n('noResults', 'Engin leyfi fundust.')}</Text>
+          <Text variant="h3">{formatMessage(t.noResults)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredTemporaryEventLicences.length > 0 && (
@@ -343,12 +334,12 @@ const TemporaryEventLicencesList: FC<
                       </Text>
 
                       <Text paddingBottom={2}>
-                        {n('licenseNumber', 'Leyfisnúmer')}:{' '}
+                        {formatMessage(t.licenseNumber)}:{' '}
                         {temporaryEventLicence.licenseNumber}
                       </Text>
 
                       <Text>
-                        {n('validPeriodLabel', 'Gildistími')}:{' '}
+                        {formatMessage(t.validPeriodLabel)}:{' '}
                         {getValidPeriodRepresentation(
                           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                           // @ts-ignore make web strict
@@ -356,47 +347,28 @@ const TemporaryEventLicencesList: FC<
                           temporaryEventLicence.validTo,
                           DATE_FORMAT,
                           format,
-                          n('validPeriodUntil', 'Til'),
-                          n('validPeriodIndefinite', 'Ótímabundið'),
+                          formatMessage(t.validPeriodUntil),
+                          formatMessage(t.validPeriodIndefinite),
                         )}
                       </Text>
 
                       <Text>
-                        {n('licenseResponsible', 'Ábyrgðarmaður')}:{' '}
+                        {formatMessage(t.licenseResponsible)}:{' '}
                         {temporaryEventLicence.licenseResponsible ||
-                          n(
-                            'licenseResponsibleNotRegistered',
-                            'Enginn skráður',
-                          )}
+                          formatMessage(t.licenseResponsibleNotRegistered)}
                       </Text>
 
-                      {typeof temporaryEventLicence.estimatedNumberOfGuests ===
-                        'number' &&
-                        temporaryEventLicence.estimatedNumberOfGuests > 0 && (
-                          <Text>
-                            {n(
-                              'licenseEstimatedNumberOfGuests',
-                              'Áætlaður fjöldi gesta',
-                            )}
-                            : {temporaryEventLicence.estimatedNumberOfGuests}
-                          </Text>
-                        )}
+                      {temporaryEventLicence.estimatedNumberOfGuests && (
+                        <Text>
+                          {formatMessage(t.licenseEstimatedNumberOfGuests)}:{' '}
+                          {temporaryEventLicence.estimatedNumberOfGuests}
+                        </Text>
+                      )}
 
-                      {typeof temporaryEventLicence.maximumNumberOfGuests ===
-                        'number' &&
-                        temporaryEventLicence.maximumNumberOfGuests > 0 && (
-                          <Text>
-                            {n(
-                              'licenseMaximumNumberOfGuests',
-                              'Hámarksfjöldi gesta',
-                            )}
-                            : {temporaryEventLicence.maximumNumberOfGuests}
-                          </Text>
-                        )}
-                      {temporaryEventLicence.location && (
+                      {temporaryEventLicence.maximumNumberOfGuests && (
                         <Text>
-                          {n('licenceLocationPrefix', 'Staðsetning')}:{' '}
-                          {temporaryEventLicence.location}
+                          {formatMessage(t.licenseMaximumNumberOfGuests)}:{' '}
+                          {temporaryEventLicence.maximumNumberOfGuests}
                         </Text>
                       )}
                     </Box>
@@ -412,7 +384,7 @@ const TemporaryEventLicencesList: FC<
           >
             {showCount < filteredTemporaryEventLicences.length && (
               <Button onClick={() => setShowCount(showCount + PAGE_SIZE)}>
-                {n('loadMore', 'Sjá fleiri')} (
+                {formatMessage(t.loadMore)} (
                 {filteredTemporaryEventLicences.length - showCount})
               </Button>
             )}
diff --git a/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/translation.strings.ts b/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/translation.strings.ts
new file mode 100644
index 000000000000..9f7cc20c27b4
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/CardLists/TemporaryEventLicencesList/translation.strings.ts
@@ -0,0 +1,155 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  dateFormat: {
+    id: 'web.syslumenn.temporaryEventLicencesList:dateFormat',
+    defaultMessage: "d. MMMM yyyy 'kl.' HH:mm",
+    description: 'Hvernig dagsetningin birtist',
+  },
+  csvHeaderLicenceType: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderLicenceType',
+    defaultMessage: 'Tegund',
+    description: 'Tegund (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenceSubType: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderLicenceSubType',
+    defaultMessage: "'Tegund leyfis",
+    description: 'Tegund leyfis (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseNumber: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderLicenseNumber',
+    defaultMessage: 'Leyfisnúmer',
+    description: 'Leyfisnúmer (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseHolder: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderLicenseHolder',
+    defaultMessage: 'Leyfishafi',
+    description: 'Leyfishafi (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderLicenseResponsible: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderLicenseResponsible',
+    defaultMessage: 'Ábyrgðarmaður',
+    description: 'Ábyrgðarmaður (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderValidFrom: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderValidFrom',
+    defaultMessage: 'Gildir frá',
+    description: 'Gildir frá (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderValidTo: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderValidTo',
+    defaultMessage: 'Gildir til',
+    description: 'Gildir til (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderIssuedBy: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvHeaderIssuedBy',
+    defaultMessage: 'Útgefið af',
+    description: 'Útgefið af (texti fyrir dálk í CSV skrá)',
+  },
+  filterOfficeAll: {
+    id: 'web.syslumenn.temporaryEventLicencesList:filterOfficeAll',
+    defaultMessage: 'Öll embætti',
+    description: 'Öll embætti',
+  },
+  filterLicenceSubTypeAll: {
+    id: 'web.syslumenn.temporaryEventLicencesList:filterLicenceSubTypeAll',
+    defaultMessage: 'Allar tegundir',
+    description: 'Allar tegundir',
+  },
+  errorTitle: {
+    id: 'web.syslumenn.temporaryEventLicencesList:errorTitle',
+    defaultMessage: 'Villa',
+    description:
+      'Titill á villuskilaboðum ef ekki tókst að sækja tækifærisleyfi',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.temporaryEventLicencesList:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja tækifærisleyfi.',
+    description: 'Villutexti sem birtist ef ekki tókst að sækja tækifærisleyfi',
+  },
+  alcoholLicencesFilterLicenceSubType: {
+    id: 'web.syslumenn.temporaryEventLicencesList:alcoholLicencesFilterLicenceSubType',
+    defaultMessage: 'Tegund',
+    description: 'Label fyrir tegund filter',
+  },
+  alcoholLicencesFilterOffice: {
+    id: 'web.syslumenn.temporaryEventLicencesList:alcoholLicencesFilterOffice',
+    defaultMessage: 'Embætti',
+    description: 'Label fyrir embættis filter',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.temporaryEventLicencesList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Placeholder texti fyrir leitarbox',
+  },
+  noResults: {
+    id: 'web.syslumenn.temporaryEventLicencesList:noResults',
+    defaultMessage: 'Engin leyfi fundust',
+    description: 'Texti sem birtist ef engin leyfi fundust',
+  },
+  licenseNumber: {
+    id: 'web.syslumenn.temporaryEventLicencesList:licenseNumber',
+    defaultMessage: 'Leyfisnúmer',
+    description: 'Leyfisnúmer',
+  },
+  validPeriodLabel: {
+    id: 'web.syslumenn.temporaryEventLicencesList:validPeriodLabel',
+    defaultMessage: 'Gildistími',
+    description: 'Gildistími',
+  },
+  validPeriodUntil: {
+    id: 'web.syslumenn.temporaryEventLicencesList:validPeriodUntil',
+    defaultMessage: 'Til',
+    description: 'Til',
+  },
+  validPeriodIndefinite: {
+    id: 'web.syslumenn.temporaryEventLicencesList:validPeriodIndefinite',
+    defaultMessage: 'Ótímabundið',
+    description: 'Ótímabundið',
+  },
+  licenseResponsible: {
+    id: 'web.syslumenn.temporaryEventLicencesList:licenseResponsible',
+    defaultMessage: 'Ábyrgðarmaður',
+    description: 'Ábyrgðarmaður',
+  },
+  licenseResponsibleNotRegistered: {
+    id: 'web.syslumenn.temporaryEventLicencesList:licenseResponsibleNotRegistered',
+    defaultMessage: 'Enginn skráður',
+    description: 'Enginn skráður',
+  },
+  licenseEstimatedNumberOfGuests: {
+    id: 'web.syslumenn.temporaryEventLicencesList:licenseEstimatedNumberOfGuests',
+    defaultMessage: 'Áætlaður fjöldi gesta',
+    description: 'Áætlaður fjöldi gesta',
+  },
+  licenseMaximumNumberOfGuests: {
+    id: 'web.syslumenn.temporaryEventLicencesList:licenseMaximumNumberOfGuests',
+    defaultMessage: 'Hámarksfjöldi gesta',
+    description: 'Hámarksfjöldi gesta',
+  },
+  loadMore: {
+    id: 'web.syslumenn.temporaryEventLicencesList:loadMore',
+    defaultMessage: 'Sjá fleiri',
+    description: 'Sjá fleiri',
+  },
+  csvButtonLabelDefault: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvButtonLabelDefault',
+    defaultMessage: 'Sækja öll leyfi (CSV).',
+    description: 'Texti fyrir CSV hnapp',
+  },
+  csvButtonLabelLoading: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvButtonLabelLoading',
+    defaultMessage: 'Sæki öll leyfi...',
+    description: 'Texti þegar smellt er á CSV hnapp',
+  },
+  csvButtonLabelError: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvButtonLabelError',
+    defaultMessage: 'Ekki tókst að sækja leyfi, reyndu aftur.',
+    description: 'Texti fyrir CSV hnapp ef ekki tókst að sækja skrá',
+  },
+  csvFileTitlePrefix: {
+    id: 'web.syslumenn.temporaryEventLicencesList:csvFileTitlePrefix',
+    defaultMessage: 'Tækifærisleyfi',
+    description: 'Titill á CSV skrá',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/TableLists/BrokersList/BrokersList.tsx b/apps/web/components/connected/syslumenn/TableLists/BrokersList/BrokersList.tsx
index 4782b2c0691a..e8a12bb7bc0f 100644
--- a/apps/web/components/connected/syslumenn/TableLists/BrokersList/BrokersList.tsx
+++ b/apps/web/components/connected/syslumenn/TableLists/BrokersList/BrokersList.tsx
@@ -1,18 +1,21 @@
 import { CSSProperties, FC, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQuery } from '@apollo/client/react'
-import { GET_BROKERS_QUERY } from './queries'
+
 import { ConnectedComponent, Query } from '@island.is/api/schema'
-import { sortAlpha } from '@island.is/shared/utils'
 import {
+  AlertMessage,
   Box,
+  Input,
   LoadingDots,
   Pagination,
   Table as T,
   Text,
-  Input,
-  AlertMessage,
 } from '@island.is/island-ui/core'
-import { useNamespace } from '@island.is/web/hooks'
+import { sortAlpha } from '@island.is/shared/utils'
+
+import { GET_BROKERS_QUERY } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 5
 const DEFAULT_TABLE_MIN_HEIGHT = '800px'
@@ -66,7 +69,7 @@ const getSortedAndFilteredBrokers = (
 const BrokersList: FC<React.PropsWithChildren<BrokersListProps>> = ({
   slice,
 }) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
 
   const [listState, setListState] = useState<ListState>('loading')
   const [brokers, setBrokers] = useState<Query['getBrokers']>([])
@@ -138,11 +141,8 @@ const BrokersList: FC<React.PropsWithChildren<BrokersListProps>> = ({
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n(
-            'errorMessage',
-            'Ekki tókst að sækja lista yfir verðbréfamiðlara.',
-          )}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -150,7 +150,7 @@ const BrokersList: FC<React.PropsWithChildren<BrokersListProps>> = ({
         <Box marginBottom={4}>
           <Input
             name="brokersSearchInput"
-            placeholder={n('searchPlaceholder', 'Leita')}
+            placeholder={formatMessage(t.searchPlaceholder)}
             backgroundColor={['blue', 'blue', 'white']}
             size="sm"
             icon={{
@@ -163,9 +163,7 @@ const BrokersList: FC<React.PropsWithChildren<BrokersListProps>> = ({
       )}
       {listState === 'loaded' && filteredBrokers.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">
-            {n('noBrokersFound', 'Engir verðbréfamiðlarar fundust.')}
-          </Text>
+          <Text variant="h3">{formatMessage(t.noBrokersFound)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredBrokers.length > 0 && (
@@ -174,8 +172,8 @@ const BrokersList: FC<React.PropsWithChildren<BrokersListProps>> = ({
             <T.Table>
               <T.Head>
                 <T.Row>
-                  <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
-                  <T.HeadData>{n('nationalId', 'Kennitala')}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.name)}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.nationalId)}</T.HeadData>
                 </T.Row>
               </T.Head>
               <T.Body>
diff --git a/apps/web/components/connected/syslumenn/TableLists/BrokersList/translation.strings.ts b/apps/web/components/connected/syslumenn/TableLists/BrokersList/translation.strings.ts
new file mode 100644
index 000000000000..f163e0e62a95
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/TableLists/BrokersList/translation.strings.ts
@@ -0,0 +1,36 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  errorTitle: {
+    id: 'web.syslumenn.brokersList:errorTitle',
+    defaultMessage: 'Villa',
+    description:
+      'Villa (titill á villuskilaboðum ef ekki tókst að sækja lista yfir verðbréfamiðlara)',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.brokersList:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja lista yfir verðbréfamiðlara.',
+    description:
+      'Ekki tókst að sækja lista yfir verðbréfamiðlara (villutexti ef ekki tókst að sækja lista yfir verðbréfamiðlara)',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.brokersList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Placeholder texti fyrir leitarbox',
+  },
+  noBrokersFound: {
+    id: 'web.syslumenn.brokersList:noBrokersFound',
+    defaultMessage: 'Engir verðbréfamiðlarar fundust.',
+    description: 'Texti sem birtist ef engir verðbréfamiðlarar fundust.',
+  },
+  name: {
+    id: 'web.syslumenn.brokersList:name',
+    defaultMessage: 'Nafn',
+    description: 'Nafn (texti á dálk í töflu)',
+  },
+  nationalId: {
+    id: 'web.syslumenn.brokersList:nationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala (texti á dálk í töflu)',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx
index 53a2af36f2e1..23162b629e9b 100644
--- a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx
+++ b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx
@@ -1,4 +1,5 @@
 import { CSSProperties, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQueryState } from 'next-usequerystate'
 import { useQuery } from '@apollo/client/react'
 
@@ -19,7 +20,6 @@ import {
 import { sortAlpha } from '@island.is/shared/utils'
 import { SyslumennListCsvExport } from '@island.is/web/components'
 import { JourneymanLicence } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
 
 import {
@@ -28,6 +28,7 @@ import {
   prepareCsvString,
 } from '../../utils'
 import { GET_JOURNEYMAN_LICENCES_QUERY } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 20
 const DEFAULT_TABLE_MIN_HEIGHT = '800px'
@@ -44,7 +45,7 @@ interface JourneymanListProps {
 type ListState = 'loading' | 'loaded' | 'error'
 
 const JourneymanList = ({ slice }: JourneymanListProps) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const [listState, setListState] = useState<ListState>('loading')
   const [licences, setLicences] = useState<
     Query['getJourneymanLicences']['licences']
@@ -114,10 +115,10 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
     return new Promise<string>((resolve, reject) => {
       if (licences) {
         const headerRow = [
-          n('csvHeaderName', 'Nafn') as string,
-          n('csvHeaderProfession', 'Iðngrein') as string,
-          n('csvHeaderDateOfPublication', 'Útgáfuár') as string,
-          n('csvHeaderNationalId', 'Kennitala') as string,
+          formatMessage(t.csvHeaderName),
+          formatMessage(t.csvHeaderProfession),
+          formatMessage(t.csvHeaderDateOfPublication),
+          formatMessage(t.csvHeaderNationaId),
         ]
         const dataRows = []
         for (const licence of licences) {
@@ -137,10 +138,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
   }
 
   // Filter - Profession
-  const allLicenceProfessionOption = n(
-    'filterLicenceProfessionAll',
-    'Allar tegundir',
-  ) as string
+  const allLicenceProfessionOption = formatMessage(t.filterLicenceProfessionAll)
 
   // Filter
   const filteredLicences = getSortedAndFilteredList(
@@ -183,11 +181,8 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n(
-            'errorMessage',
-            'Ekki tókst að sækja lista yfir sveinsbréfin.',
-          )}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -205,7 +200,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('licencesFilterLicenceProfession', 'Iðngrein')}
+                  label={formatMessage(t.licencesFilterLicenceProfession)}
                   name="licenceProfessionSelect"
                   options={availableLicenceProfessionOptions}
                   value={filterLicenceProfession}
@@ -221,7 +216,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
               <GridColumn paddingBottom={[1, 1, 1]} span={'12/12'}>
                 <Input
                   name="licencesSearchInput"
-                  placeholder={n('searchPlaceholder', 'Leita')}
+                  placeholder={formatMessage(t.searchPlaceholder)}
                   backgroundColor={['blue', 'blue', 'white']}
                   size="sm"
                   icon={{
@@ -232,19 +227,10 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                 />
                 <Box textAlign="right" marginRight={1} marginTop={1}>
                   <SyslumennListCsvExport
-                    defaultLabel={n(
-                      'csvButtonLabelDefault',
-                      'Sækja öll leyfi (CSV)',
-                    )}
-                    loadingLabel={n(
-                      'csvButtonLabelLoading',
-                      'Sæki öll leyfi...',
-                    )}
-                    errorLabel={n(
-                      'csvButtonLabelError',
-                      'Ekki tókst að sækja leyfi, reyndu aftur',
-                    )}
-                    csvFilenamePrefix={n('csvFileTitlePrefix', 'Sveinslisti')}
+                    defaultLabel={formatMessage(t.csvButtonLabelDefault)}
+                    loadingLabel={formatMessage(t.csvButtonLabelLoading)}
+                    errorLabel={formatMessage(t.csvButtonLabelError)}
+                    csvFilenamePrefix={formatMessage(t.csvFileTitlePrefix)}
                     csvStringProvider={csvStringProvider}
                   />
                 </Box>
@@ -255,9 +241,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
       )}
       {listState === 'loaded' && filteredLicences.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">
-            {n('noLicencesFound', 'Engar niðurstöður fundust.')}
-          </Text>
+          <Text variant="h3">{formatMessage(t.noLicencesFound)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredLicences.length > 0 && (
@@ -266,11 +250,12 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
             <T.Table>
               <T.Head>
                 <T.Row>
-                  <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
-                  <T.HeadData>{n('profession', 'Iðngrein')}</T.HeadData>
-                  <T.HeadData>{n('dateOfPublication', 'Útgáfuár')}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.name)}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.profession)}</T.HeadData>
+
+                  <T.HeadData>{formatMessage(t.dateOfPublication)}</T.HeadData>
                   <T.HeadData align="right">
-                    {n('nationalId', 'Kennitala')}
+                    {formatMessage(t.nationalId)}
                   </T.HeadData>
                 </T.Row>
               </T.Head>
diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/translation.strings.ts b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/translation.strings.ts
new file mode 100644
index 000000000000..d5ba5f6fd757
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/translation.strings.ts
@@ -0,0 +1,94 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  csvHeaderName: {
+    id: 'web.syslumenn.journeymanList:csvHeaderName',
+    defaultMessage: 'Nafn',
+    description: 'Nafn (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderProfession: {
+    id: 'web.syslumenn.journeymanList:csvHeaderProfession',
+    defaultMessage: 'Iðngrein',
+    description: 'Iðngrein (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderDateOfPublication: {
+    id: 'web.syslumenn.journeymanList:csvHeaderDateOfPublication',
+    defaultMessage: 'Útgáfuár',
+    description: 'Útgáfuár (texti fyrir dálk í CSV skrá)',
+  },
+  licencesFilterLicenceProfession: {
+    id: 'web.syslumenn.journeymanList:licencesFilterLicenceProfession',
+    defaultMessage: 'Iðngrein',
+    description: 'Label fyrir iðngrein filter',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.journeymanList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Placeholder texti fyrir leitarbox',
+  },
+  csvFileTitlePrefix: {
+    id: 'web.syslumenn.journeymanList:csvFileTitlePrefix',
+    defaultMessage: 'Sveinslisti',
+    description: 'Titill á CSV skrá',
+  },
+  noLicencesFound: {
+    id: 'web.syslumenn.journeymanList:noLicencesFound',
+    defaultMessage: 'Engar niðurstöður fundust',
+    description: 'Texti sem birtist ef engar niðurstöður fundust',
+  },
+  name: {
+    id: 'web.syslumenn.journeymanList:name',
+    defaultMessage: 'Nafn',
+    description: 'Nafn',
+  },
+  profession: {
+    id: 'web.syslumenn.journeymanList:profession',
+    defaultMessage: 'Iðngrein',
+    description: 'Iðngrein',
+  },
+  dateOfPublication: {
+    id: 'web.syslumenn.journeymanList:dateOfPublication',
+    defaultMessage: 'Útgáfuár',
+    description: 'Útgáfuár',
+  },
+  filterLicenceProfessionAll: {
+    id: 'web.syslumenn.journeymanList:filterLicenceProfessionAll',
+    defaultMessage: 'Allar tegundir',
+    description: 'Allar tegundir',
+  },
+  errorTitle: {
+    id: 'web.syslumenn.journeymanList:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Villa',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.journeymanList:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja lista yfir sveinsbréfin.',
+    description: 'Ekki tókst að sækja lista yfir sveinsbréfin.',
+  },
+  csvButtonLabelDefault: {
+    id: 'web.syslumenn.journeymanList:csvButtonLabelDefault',
+    defaultMessage: 'Sækja öll leyfi (CSV)',
+    description: 'Titill á CSV takka',
+  },
+  csvButtonLabelLoading: {
+    id: 'web.syslumenn.journeymanList:csvButtonLabelLoading',
+    defaultMessage: 'Sæki öll leyfi...',
+    description: 'Titill á CSV takka eftir smell',
+  },
+  csvButtonLabelError: {
+    id: 'web.syslumenn.journeymanList:csvButtonLabelError',
+    defaultMessage: 'Ekki tókst að sækja leyfi, reyndu aftur',
+    description: 'Texti þegar ekki tekst að sækja CSV skrá',
+  },
+  csvHeaderNationaId: {
+    id: 'web.syslumenn.journeymanList:csvHeaderNationaId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala (texti fyrir dálk í CSV skrá)',
+  },
+  nationalId: {
+    id: 'web.syslumenn.journeymanList:nationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/TableLists/MasterList/MasterList.tsx b/apps/web/components/connected/syslumenn/TableLists/MasterList/MasterList.tsx
index 5f576dd0ba04..6977134bfa54 100644
--- a/apps/web/components/connected/syslumenn/TableLists/MasterList/MasterList.tsx
+++ b/apps/web/components/connected/syslumenn/TableLists/MasterList/MasterList.tsx
@@ -1,4 +1,5 @@
 import { CSSProperties, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQueryState } from 'next-usequerystate'
 import { useQuery } from '@apollo/client/react'
 
@@ -19,7 +20,6 @@ import {
 import { sortAlpha } from '@island.is/shared/utils'
 import { SyslumennListCsvExport } from '@island.is/web/components'
 import { MasterLicence } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
 
 import {
@@ -28,6 +28,7 @@ import {
   prepareCsvString,
 } from '../../utils'
 import { GET_MASTER_LICENCES_QUERY } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 20
 const DEFAULT_TABLE_MIN_HEIGHT = '800px'
@@ -44,7 +45,7 @@ interface MasterListProps {
 type ListState = 'loading' | 'loaded' | 'error'
 
 const MasterList = ({ slice }: MasterListProps) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const [listState, setListState] = useState<ListState>('loading')
   const [licences, setLicences] = useState<
     Query['getMasterLicences']['licences']
@@ -116,10 +117,10 @@ const MasterList = ({ slice }: MasterListProps) => {
     return new Promise<string>((resolve, reject) => {
       if (licences) {
         const headerRow = [
-          n('csvHeaderMasterLicenceName', 'Nafn') as string,
-          n('csvHeaderMasterLicenseProfession', 'Iðngrein') as string,
-          n('csvHeaderMasterLicenceDateOfPublication', 'Útgáfuár') as string,
-          n('csvHeaderMasterLicenceNationalId', 'Kennitala') as string,
+          formatMessage(t.csvHeaderMasterLicenceName),
+          formatMessage(t.csvHeaderMasterLicenseProfession),
+          formatMessage(t.csvHeaderMasterLicenceDateOfPublication),
+          formatMessage(t.csvHeaderMasterLicenceNationalId),
         ]
         const dataRows = []
         for (const licence of licences) {
@@ -139,10 +140,7 @@ const MasterList = ({ slice }: MasterListProps) => {
   }
 
   // Filter - Profession
-  const allLicenceProfessionOption = n(
-    'filterLicenceProfessionAll',
-    'Allar tegundir',
-  ) as string
+  const allLicenceProfessionOption = formatMessage(t.filterLicenceProfessionAll)
 
   // Filter
   const filteredMasterLicences = getSortedAndFilteredList(
@@ -185,11 +183,8 @@ const MasterList = ({ slice }: MasterListProps) => {
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n(
-            'errorMessage',
-            'Ekki tókst að sækja lista yfir meistarabréfin.',
-          )}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -207,9 +202,8 @@ const MasterList = ({ slice }: MasterListProps) => {
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n(
-                    'alcoholLicencesFilterLicenceProfession',
-                    'Iðngrein',
+                  label={formatMessage(
+                    t.alcoholLicencesFilterLicenceProfession,
                   )}
                   name="licenceProfessionSelect"
                   options={availableLicenceProfessionOptions}
@@ -226,7 +220,7 @@ const MasterList = ({ slice }: MasterListProps) => {
               <GridColumn paddingBottom={[1, 1, 1]} span={'12/12'}>
                 <Input
                   name="licencesSearchInput"
-                  placeholder={n('searchPlaceholder', 'Leita')}
+                  placeholder={formatMessage(t.searchPlaceholder)}
                   backgroundColor={['blue', 'blue', 'white']}
                   size="sm"
                   icon={{
@@ -237,19 +231,10 @@ const MasterList = ({ slice }: MasterListProps) => {
                 />
                 <Box textAlign="right" marginRight={1} marginTop={1}>
                   <SyslumennListCsvExport
-                    defaultLabel={n(
-                      'csvButtonLabelDefault',
-                      'Sækja öll leyfi (CSV)',
-                    )}
-                    loadingLabel={n(
-                      'csvButtonLabelLoading',
-                      'Sæki öll leyfi...',
-                    )}
-                    errorLabel={n(
-                      'csvButtonLabelError',
-                      'Ekki tókst að sækja leyfi, reyndu aftur',
-                    )}
-                    csvFilenamePrefix={n('csvFileTitlePrefix', 'Meistarabréf')}
+                    defaultLabel={formatMessage(t.csvButtonLabelDefault)}
+                    loadingLabel={formatMessage(t.csvButtonLabelLoading)}
+                    errorLabel={formatMessage(t.csvButtonLabelError)}
+                    csvFilenamePrefix={formatMessage(t.csvFileTitlePrefix)}
                     csvStringProvider={csvStringProvider}
                   />
                 </Box>
@@ -260,9 +245,7 @@ const MasterList = ({ slice }: MasterListProps) => {
       )}
       {listState === 'loaded' && filteredMasterLicences.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">
-            {n('noLicencesFound', 'Engar niðurstöður fundust.')}
-          </Text>
+          <Text variant="h3">{formatMessage(t.noLicencesFound)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredMasterLicences.length > 0 && (
@@ -271,11 +254,11 @@ const MasterList = ({ slice }: MasterListProps) => {
             <T.Table>
               <T.Head>
                 <T.Row>
-                  <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
-                  <T.HeadData>{n('profession', 'Iðngrein')}</T.HeadData>
-                  <T.HeadData>{n('dateOfPublication', 'Útgáfuár')}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.name)}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.profession)}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.dateOfPublication)}</T.HeadData>
                   <T.HeadData align="right">
-                    {n('nationalId', 'Kennitala')}
+                    {formatMessage(t.nationalId)}
                   </T.HeadData>
                 </T.Row>
               </T.Head>
diff --git a/apps/web/components/connected/syslumenn/TableLists/MasterList/translation.strings.ts b/apps/web/components/connected/syslumenn/TableLists/MasterList/translation.strings.ts
new file mode 100644
index 000000000000..8c43c96c78c6
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/TableLists/MasterList/translation.strings.ts
@@ -0,0 +1,95 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  csvHeaderMasterLicenceName: {
+    id: 'web.syslumenn.masterList:csvHeaderMasterLicenceName',
+    defaultMessage: 'Nafn',
+    description: 'Nafn (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderMasterLicenseProfession: {
+    id: 'web.syslumenn.masterList:csvHeaderMasterLicenseProfession',
+    defaultMessage: 'Iðngrein',
+    description: 'Iðngrein (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderMasterLicenceDateOfPublication: {
+    id: 'web.syslumenn.masterList:csvHeaderMasterLicenceDateOfPublication',
+    defaultMessage: 'Útgáfuár',
+    description: 'Útgáfuár (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderMasterLicenceNationalId: {
+    id: 'web.syslumenn.masterList:csvHeaderMasterLicenceNationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala (texti fyrir dálk í CSV skrá)',
+  },
+  filterLicenceProfessionAll: {
+    id: 'web.syslumenn.masterList:filterLicenceProfessionAll',
+    defaultMessage: 'Allar tegundir',
+    description: 'Allar tegundir',
+  },
+  errorTitle: {
+    id: 'web.syslumenn.masterList:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Villa',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.masterList:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja lista yfir meistarabréfin.',
+    description: 'Ekki tókst að sækja lista yfir meistarabréfin.',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.masterList:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Placeholder texti fyrir leitarbox',
+  },
+  csvButtonLabelDefault: {
+    id: 'web.syslumenn.masterList:csvButtonLabelDefault',
+    defaultMessage: 'Sækja öll leyfi (CSV)',
+    description: '(Texti fyrir CSV hnapp) Sækja öll leyfi (CSV)',
+  },
+  csvButtonLabelLoading: {
+    id: 'web.syslumenn.masterList:csvButtonLabelLoading',
+    defaultMessage: 'Sæki öll leyfi...',
+    description: '(Loading texti fyrir CSV hnapp) Sæki öll leyfi...',
+  },
+  csvButtonLabelError: {
+    id: 'web.syslumenn.masterList:csvButtonLabelError',
+    defaultMessage: 'Ekki tókst að sækja leyfi, reyndu aftur',
+    description:
+      '(Villu texti fyrir CSV hnapp) Ekki tókst að sækja leyfi, reyndu aftur',
+  },
+  csvFileTitlePrefix: {
+    id: 'web.syslumenn.masterList:csvFileTitlePrefix',
+    defaultMessage: 'Meistarabréf',
+    description: 'Titill á CSV skrá',
+  },
+  noLicencesFound: {
+    id: 'web.syslumenn.masterList:noLicencesFound',
+    defaultMessage: 'Engar niðurstöður fundust.',
+    description: 'Texti sem birtist ef engar niðurstöður fundust.',
+  },
+  name: {
+    id: 'web.syslumenn.masterList:name',
+    defaultMessage: 'Nafn',
+    description: 'Nafn (titill á dálk í töflu)',
+  },
+  profession: {
+    id: 'web.syslumenn.masterList:profession',
+    defaultMessage: 'Iðngrein',
+    description: 'Iðngrein (titill á dálk í töflu)',
+  },
+  dateOfPublication: {
+    id: 'web.syslumenn.masterList:dateOfPublication',
+    defaultMessage: 'Útgáfuár',
+    description: 'Útgáfuár (titill á dálk í töflu)',
+  },
+  nationalId: {
+    id: 'web.syslumenn.masterList:nationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala (titill á dálk í töflu)',
+  },
+  alcoholLicencesFilterLicenceProfession: {
+    id: 'web.syslumenn.masterList:alcoholLicencesFilterLicenceProfession',
+    defaultMessage: 'Iðngrein',
+    description: 'Iðngrein (label á iðngrein filter)',
+  },
+})
diff --git a/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/ProfessionRights.tsx b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/ProfessionRights.tsx
index 37746d7cd934..867fefd2eded 100644
--- a/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/ProfessionRights.tsx
+++ b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/ProfessionRights.tsx
@@ -1,4 +1,5 @@
 import { CSSProperties, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useQueryState } from 'next-usequerystate'
 import { useQuery } from '@apollo/client/react'
 
@@ -17,12 +18,7 @@ import {
 } from '@island.is/island-ui/core'
 import { sortAlpha } from '@island.is/shared/utils'
 import { SyslumennListCsvExport } from '@island.is/web/components'
-import type {
-  ConnectedComponent,
-  ProfessionRight,
-  Query,
-} from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
+import type { ConnectedComponent, Query } from '@island.is/web/graphql/schema'
 
 import {
   getNormalizedSearchTerms,
@@ -30,10 +26,11 @@ import {
   prepareCsvString,
 } from '../../utils'
 import { GET_PROFESSION_RIGHTS_QUERY } from './queries'
+import { translation as t } from './translation.strings'
 
 const DEFAULT_PAGE_SIZE = 20
 const DEFAULT_TABLE_MIN_HEIGHT = '800px'
-const SEARCH_KEYS: (keyof ProfessionRight)[] = ['name']
+const SEARCH_KEYS = ['name', 'nationalId']
 
 interface ProfessionRightsProps {
   slice: ConnectedComponent
@@ -42,7 +39,7 @@ interface ProfessionRightsProps {
 type ListState = 'loading' | 'loaded' | 'error'
 
 const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
-  const n = useNamespace(slice.json ?? {})
+  const { formatMessage } = useIntl()
   const [listState, setListState] = useState<ListState>('loading')
   const [list, setList] = useState<Query['getProfessionRights']['list']>([])
   const [currentPageNumber, setCurrentPageNumber] = useState(1)
@@ -108,14 +105,17 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
     return new Promise<string>((resolve, reject) => {
       if (list) {
         const headerRow = [
-          n('csvHeaderName', 'Nafn') as string,
-          n('csvHeaderProfession', 'Starf') as string,
+          formatMessage(t.csvHeaderName),
+          formatMessage(t.csvHeaderProfession),
+          formatMessage(t.csvHeaderNationalId),
         ]
         const dataRows = []
         for (const item of list) {
           dataRows.push([
             item.name ?? '', // Nafn
             item.profession ?? '', // Starf
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (item as any).nationalId ?? '', // Kennitala
           ])
         }
         return resolve(prepareCsvString(headerRow, dataRows))
@@ -125,10 +125,7 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
   }
 
   // Filter - Profession
-  const allProfessionOption = n(
-    'filterProfessionAll',
-    'Allar tegundir',
-  ) as string
+  const allProfessionOption = formatMessage(t.filterProfessionAll)
 
   // Filter
   const filteredList = getSortedAndFilteredList(
@@ -138,7 +135,8 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
         : item.profession === filterProfession?.value,
     ),
     searchTerms,
-    SEARCH_KEYS,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    SEARCH_KEYS as any,
   )
 
   const pageSize = slice?.configJson?.pageSize ?? DEFAULT_PAGE_SIZE
@@ -171,11 +169,8 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
       )}
       {listState === 'error' && (
         <AlertMessage
-          title={n('errorTitle', 'Villa')}
-          message={n(
-            'errorMessage',
-            'Ekki tókst að sækja lista yfir starfsréttindi.',
-          )}
+          title={formatMessage(t.errorTitle)}
+          message={formatMessage(t.errorMessage)}
           type="error"
         />
       )}
@@ -193,7 +188,7 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
                   icon="chevronDown"
                   size="sm"
                   isSearchable
-                  label={n('filterProfession', 'Starf')}
+                  label={formatMessage(t.filterProfession)}
                   name="professionSelect"
                   options={availableProfessionOptions}
                   value={filterProfession}
@@ -209,7 +204,7 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
               <GridColumn paddingBottom={[1, 1, 1]} span={'12/12'}>
                 <Input
                   name="searchInput"
-                  placeholder={n('searchPlaceholder', 'Leita')}
+                  placeholder={formatMessage(t.searchPlaceholder)}
                   backgroundColor={['blue', 'blue', 'white']}
                   size="sm"
                   icon={{
@@ -220,22 +215,10 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
                 />
                 <Box textAlign="right" marginRight={1} marginTop={1}>
                   <SyslumennListCsvExport
-                    defaultLabel={n(
-                      'csvButtonLabelDefault',
-                      'Sækja öll starfsréttindi (CSV)',
-                    )}
-                    loadingLabel={n(
-                      'csvButtonLabelLoading',
-                      'Sæki öll starfsréttindi...',
-                    )}
-                    errorLabel={n(
-                      'csvButtonLabelError',
-                      'Ekki tókst að sækja starfsréttindi, reyndu aftur',
-                    )}
-                    csvFilenamePrefix={n(
-                      'csvFileTitlePrefix',
-                      'Starfsréttindi',
-                    )}
+                    defaultLabel={formatMessage(t.csvButtonLabelDefault)}
+                    loadingLabel={formatMessage(t.csvButtonLabelLoading)}
+                    errorLabel={formatMessage(t.csvButtonLabelError)}
+                    csvFilenamePrefix={formatMessage(t.csvFileTitlePrefix)}
                     csvStringProvider={csvStringProvider}
                   />
                 </Box>
@@ -246,9 +229,7 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
       )}
       {listState === 'loaded' && filteredList.length === 0 && (
         <Box display="flex" marginTop={4} justifyContent="center">
-          <Text variant="h3">
-            {n('noResultsFound', 'Engar niðurstöður fundust.')}
-          </Text>
+          <Text variant="h3">{formatMessage(t.noResultsFound)}</Text>
         </Box>
       )}
       {listState === 'loaded' && filteredList.length > 0 && (
@@ -257,8 +238,11 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
             <T.Table>
               <T.Head>
                 <T.Row>
-                  <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
-                  <T.HeadData>{n('profession', 'Starf')}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.name)}</T.HeadData>
+                  <T.HeadData>{formatMessage(t.profession)}</T.HeadData>
+                  <T.HeadData align="right">
+                    {formatMessage(t.nationalId)}
+                  </T.HeadData>
                 </T.Row>
               </T.Head>
               <T.Body>
@@ -278,6 +262,14 @@ const ProfessionRights = ({ slice }: ProfessionRightsProps) => {
                             <Text variant="small">{item.profession}</Text>
                           </Box>
                         </T.Data>
+                        <T.Data>
+                          <Box>
+                            <Text variant="small" textAlign="right">
+                              {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
+                              {(item as any).nationalId}
+                            </Text>
+                          </Box>
+                        </T.Data>
                       </T.Row>
                     )
                   })}
diff --git a/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/queries.ts b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/queries.ts
index 1c4cb7246c09..7658a46be709 100644
--- a/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/queries.ts
+++ b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/queries.ts
@@ -6,6 +6,7 @@ export const GET_PROFESSION_RIGHTS_QUERY = gql`
       list {
         name
         profession
+        nationalId
       }
     }
   }
diff --git a/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/translation.strings.ts b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/translation.strings.ts
new file mode 100644
index 000000000000..9637772fc9aa
--- /dev/null
+++ b/apps/web/components/connected/syslumenn/TableLists/ProfessionRights/translation.strings.ts
@@ -0,0 +1,84 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  csvHeaderName: {
+    id: 'web.syslumenn.professionRights:csvHeaderName',
+    defaultMessage: 'Nafn',
+    description: 'Nafn (texti fyrir dálk í CSV skrá)',
+  },
+  csvHeaderProfession: {
+    id: 'web.syslumenn.professionRights:csvHeaderProfession',
+    defaultMessage: 'Starf',
+    description: 'Starf (texti fyrir dálk í CSV skrá)',
+  },
+  filterProfessionAll: {
+    id: 'web.syslumenn.professionRights:filterProfessionAll',
+    defaultMessage: 'Allar tegundir',
+    description: 'Allar tegundir',
+  },
+  errorTitle: {
+    id: 'web.syslumenn.professionRights:errorTitle',
+    defaultMessage: 'Villa',
+    description: 'Villa (Titill á villuskilaboðum ef ekki tekst ap sækja gögn)',
+  },
+  errorMessage: {
+    id: 'web.syslumenn.professionRights:errorMessage',
+    defaultMessage: 'Ekki tókst að sækja lista yfir starfsréttindi.',
+    description: 'Villutexti ef ekki tókst að sækja lista yfir starfsréttindi.',
+  },
+  filterProfession: {
+    id: 'web.syslumenn.professionRights:filterProfession',
+    defaultMessage: 'Starf',
+    description: 'Starf',
+  },
+  searchPlaceholder: {
+    id: 'web.syslumenn.professionRights:searchPlaceholder',
+    defaultMessage: 'Leita',
+    description: 'Leita',
+  },
+  csvButtonLabelDefault: {
+    id: 'web.syslumenn.professionRights:csvButtonLabelDefault',
+    defaultMessage: 'Sækja öll starfsréttindi (CSV)',
+    description: 'Texti á CSV hnapp',
+  },
+  csvButtonLabelLoading: {
+    id: 'web.syslumenn.professionRights:csvButtonLabelLoading',
+    defaultMessage: 'Sæki öll starfsréttindi...',
+    description: 'Texti þegar smellt er á CSV hnapp',
+  },
+  csvButtonLabelError: {
+    id: 'web.syslumenn.professionRights:csvButtonLabelError',
+    defaultMessage: 'Ekki tókst að sækja starfsréttindi, reyndu aftur',
+    description: 'Texti ef ekki tókst að sækja CSV skrá',
+  },
+  csvFileTitlePrefix: {
+    id: 'web.syslumenn.professionRights:csvFileTitlePrefix',
+    defaultMessage: 'Starfsréttindi',
+    description: 'Starfsréttindi',
+  },
+  noResultsFound: {
+    id: 'web.syslumenn.professionRights:noResultsFound',
+    defaultMessage: 'Engar niðurstöður fundust.',
+    description: 'Engar niðurstöður fundust.',
+  },
+  name: {
+    id: 'web.syslumenn.professionRights:name',
+    defaultMessage: 'Nafn',
+    description: 'Nafn',
+  },
+  profession: {
+    id: 'web.syslumenn.professionRights:profession',
+    defaultMessage: 'Starf',
+    description: 'Starf',
+  },
+  csvHeaderNationalId: {
+    id: 'web.syslumenn.professionRights:csvHeaderNationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala (texti fyrir dálk í CSV skrá)',
+  },
+  nationalId: {
+    id: 'web.syslumenn.professionRights:nationalId',
+    defaultMessage: 'Kennitala',
+    description: 'Kennitala',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/AircraftSearch.tsx b/apps/web/components/connected/vehicles/AircraftSearch/AircraftSearch.tsx
similarity index 83%
rename from apps/web/components/connected/vehicles/AircraftSearch.tsx
rename to apps/web/components/connected/vehicles/AircraftSearch/AircraftSearch.tsx
index 29c60fd1d18f..4119a8a05ab8 100644
--- a/apps/web/components/connected/vehicles/AircraftSearch.tsx
+++ b/apps/web/components/connected/vehicles/AircraftSearch/AircraftSearch.tsx
@@ -1,13 +1,8 @@
-import { useState, useEffect, CSSProperties } from 'react'
+import { CSSProperties, useEffect, useState } from 'react'
+import { useIntl } from 'react-intl'
 import { useRouter } from 'next/router'
-import {
-  ConnectedComponent,
-  AircraftRegistryAircraft,
-  GetAllAircraftsQuery,
-  GetAllAircraftsQueryVariables,
-  AircraftRegistryPerson,
-} from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
+import { useLazyQuery } from '@apollo/client'
+
 import {
   AlertMessage,
   AsyncSearchInput,
@@ -17,9 +12,17 @@ import {
   Table as T,
   Text,
 } from '@island.is/island-ui/core'
-import { useLazyQuery } from '@apollo/client'
+import {
+  AircraftRegistryAircraft,
+  AircraftRegistryPerson,
+  ConnectedComponent,
+  GetAllAircraftsQuery,
+  GetAllAircraftsQueryVariables,
+} from '@island.is/web/graphql/schema'
 import { GET_ALL_AIRCRAFTS_QUERY } from '@island.is/web/screens/queries/AircraftSearch'
 
+import { translation as translationStrings } from './translation.strings'
+
 const DEFAULT_PAGE_SIZE = 10
 
 const getDisplayedOwner = (aircraft: AircraftRegistryAircraft) => {
@@ -49,8 +52,8 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
   const router = useRouter()
   const [searchInputHasFocus, setSearchInputHasFocus] = useState(false)
   const [searchTerm, setSearchTerm] = useState('')
-  const namespace = slice?.json ?? {}
-  const n = useNamespace(namespace)
+
+  const { formatMessage } = useIntl()
 
   const handleSearch = (page = 1, searchValue?: string) => {
     let searchString = searchTerm
@@ -148,7 +151,7 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
   const totalAircrafts = latestAircraftListResponse?.totalCount ?? 0
   const displayedAircraftList = latestAircraftListResponse?.aircrafts ?? []
 
-  const resetSearchText = n('resetSearch', 'Núllstilla leit')
+  const resetSearchText = formatMessage(translationStrings.resetSearch)
   const shouldDisplayResetButton = !!router?.query?.aq
 
   const minHeightFromConfig = slice?.configJson?.minHeight
@@ -178,7 +181,7 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
             onBlur: () => setSearchInputHasFocus(false),
             name: 'public-vehicle-search',
             inputSize: 'medium',
-            placeholder: n('inputPlaceholder', 'Númer eða eigandi'),
+            placeholder: formatMessage(translationStrings.inputPlaceholder),
             colored: true,
             onChange: (ev) => setSearchTerm(ev.target.value),
             value: searchTerm,
@@ -209,8 +212,8 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
       {!loading && errorOccurred && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja loftför')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
 
@@ -218,17 +221,14 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
         !loading &&
         displayedAircraftList.length === 1 &&
         selectedPage === 1 && (
-          <AircraftDetails
-            namespace={namespace}
-            aircraft={displayedAircraftList[0]}
-          />
+          <AircraftDetails aircraft={displayedAircraftList[0]} />
         )}
 
       {called &&
         !loading &&
         !errorOccurred &&
         displayedAircraftList.length === 0 && (
-          <Text>{n('noResultFound', 'Ekkert loftfar fannst')}</Text>
+          <Text>{formatMessage(translationStrings.noResultFound)}</Text>
         )}
 
       {!errorOccurred &&
@@ -236,7 +236,6 @@ const AircraftSearch = ({ slice }: AircraftSearchProps) => {
           <Box>
             <Box style={tableContainerStyles}>
               <AircraftTable
-                namespace={namespace}
                 aircrafts={displayedAircraftList}
                 onAircraftClick={(identifier) => handleSearch(1, identifier)}
               />
@@ -280,17 +279,15 @@ const AircraftPerson = ({ person }: AircraftPersonProps) => {
 }
 
 interface AircraftDetailsProps {
-  namespace: Record<string, string>
   aircraft: AircraftRegistryAircraft
 }
 
-const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
-  const n = useNamespace(namespace)
-
+const AircraftDetails = ({ aircraft }: AircraftDetailsProps) => {
+  const { formatMessage } = useIntl()
   const displayedOwner = getDisplayedOwner(aircraft)
   const displayedOwnerName = getDisplayedOwnerName(
     aircraft,
-    n('andMore', 'ofl.'),
+    formatMessage(translationStrings.andMore),
   )
 
   return (
@@ -301,7 +298,7 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             <T.Row>
               <T.Data>
                 <Text fontWeight="semiBold">
-                  {n('identifier', 'Einkennisstafir')}:
+                  {formatMessage(translationStrings.identifier)}:
                 </Text>
               </T.Data>
               <T.Data>
@@ -311,7 +308,7 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             <T.Row>
               <T.Data>
                 <Text fontWeight="semiBold">
-                  {n('registrationNumber', 'Skráningarnúmer')}:
+                  {formatMessage(translationStrings.registrationNumber)}:
                 </Text>
               </T.Data>
               <T.Data>
@@ -320,7 +317,9 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             </T.Row>
             <T.Row>
               <T.Data>
-                <Text fontWeight="semiBold">{n('type', 'Tegund')}:</Text>
+                <Text fontWeight="semiBold">
+                  {formatMessage(translationStrings.type)}:
+                </Text>
               </T.Data>
               <T.Data>
                 <Text>{aircraft.type}</Text>
@@ -329,7 +328,7 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             <T.Row>
               <T.Data>
                 <Text fontWeight="semiBold">
-                  {n('productionYear', 'Framleiðsluár')}:
+                  {formatMessage(translationStrings.productionYear)}:
                 </Text>
               </T.Data>
               <T.Data>
@@ -339,7 +338,7 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             <T.Row>
               <T.Data>
                 <Text fontWeight="semiBold">
-                  {n('serialNumber', 'Raðnúmer')}:
+                  {formatMessage(translationStrings.serialNumber)}:
                 </Text>
               </T.Data>
               <T.Data>
@@ -349,7 +348,7 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             <T.Row>
               <T.Data>
                 <Text fontWeight="semiBold">
-                  {n('maxWeight', 'Hámarksþungi')}:
+                  {formatMessage(translationStrings.maxWeight)}:
                 </Text>
               </T.Data>
               <T.Data>
@@ -358,7 +357,9 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             </T.Row>
             <T.Row>
               <T.Data>
-                <Text fontWeight="semiBold">{n('owner', 'Eigandi')}:</Text>
+                <Text fontWeight="semiBold">
+                  {formatMessage(translationStrings.owner)}:
+                </Text>
               </T.Data>
               <T.Data>
                 <AircraftPerson
@@ -368,7 +369,9 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
             </T.Row>
             <T.Row>
               <T.Data>
-                <Text fontWeight="semiBold">{n('operator', 'Umráðandi')}:</Text>
+                <Text fontWeight="semiBold">
+                  {formatMessage(translationStrings.operator)}:
+                </Text>
               </T.Data>
               <T.Data>
                 <AircraftPerson
@@ -386,42 +389,44 @@ const AircraftDetails = ({ namespace, aircraft }: AircraftDetailsProps) => {
 }
 
 interface AircraftTableProps {
-  namespace: Record<string, string>
   aircrafts: AircraftRegistryAircraft[]
   onAircraftClick: (identifier: string) => void
 }
-const AircraftTable = ({
-  aircrafts,
-  namespace,
-  onAircraftClick,
-}: AircraftTableProps) => {
-  const n = useNamespace(namespace)
-
+const AircraftTable = ({ aircrafts, onAircraftClick }: AircraftTableProps) => {
+  const { formatMessage } = useIntl()
   return (
     <T.Table>
       <T.Head>
         <T.Row>
           <T.HeadData>
             <Text fontWeight="semiBold">
-              {n('identifier', 'Einkennisstafir')}
+              {formatMessage(translationStrings.identifier)}
             </Text>
           </T.HeadData>
           <T.HeadData>
             <Text fontWeight="semiBold">
-              {n('registrationNumber', 'Skráningarnúmer')}
+              {formatMessage(translationStrings.registrationNumber)}
             </Text>
           </T.HeadData>
           <T.HeadData>
-            <Text fontWeight="semiBold">{n('serialNumber', 'Raðnúmer')}</Text>
+            <Text fontWeight="semiBold">
+              {formatMessage(translationStrings.serialNumber)}
+            </Text>
           </T.HeadData>
           <T.HeadData>
-            <Text fontWeight="semiBold">{n('type', 'Tegund')}</Text>
+            <Text fontWeight="semiBold">
+              {formatMessage(translationStrings.type)}
+            </Text>
           </T.HeadData>
           <T.HeadData>
-            <Text fontWeight="semiBold">{n('owner', 'Eigandi')}</Text>
+            <Text fontWeight="semiBold">
+              {formatMessage(translationStrings.owner)}
+            </Text>
           </T.HeadData>
           <T.HeadData>
-            <Text fontWeight="semiBold">{n('operator', 'Umráðandi')}</Text>
+            <Text fontWeight="semiBold">
+              {formatMessage(translationStrings.operator)}
+            </Text>
           </T.HeadData>
         </T.Row>
       </T.Head>
@@ -429,7 +434,7 @@ const AircraftTable = ({
         {aircrafts.map((aircraft) => {
           const displayedOwnerName = getDisplayedOwnerName(
             aircraft,
-            n('andMore', 'ofl.'),
+            formatMessage(translationStrings.andMore),
           )
           return (
             <T.Row key={aircraft?.identifiers}>
diff --git a/apps/web/components/connected/vehicles/AircraftSearch/translation.strings.ts b/apps/web/components/connected/vehicles/AircraftSearch/translation.strings.ts
new file mode 100644
index 000000000000..0701863e8240
--- /dev/null
+++ b/apps/web/components/connected/vehicles/AircraftSearch/translation.strings.ts
@@ -0,0 +1,74 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  resetSearch: {
+    id: 'web.aircraftSearch:resetSearch',
+    defaultMessage: 'Núllstilla leit',
+    description: 'Núllstilla leit',
+  },
+  inputPlaceholder: {
+    id: 'web.aircraftSearch:inputPlaceholder',
+    defaultMessage: 'Númer eða eigandi',
+    description: 'Placeholder texti á leit',
+  },
+  errorOccurredTitle: {
+    id: 'web.aircraftSearch:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill á villuskilaboðum',
+  },
+  errorOccurredMessage: {
+    id: 'web.aircraftSearch:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja loftför',
+    description: 'Skilaboð þegar villa kemur upp við að sækja gögn',
+  },
+  noResultFound: {
+    id: 'web.aircraftSearch:noResultFound',
+    defaultMessage: 'Ekkert loftfar fannst',
+    description: 'Texti þegar engar niðurstöður finnast',
+  },
+  andMore: {
+    id: 'web.aircraftSearch:andMore',
+    defaultMessage: 'ofl.',
+    description: 'ofl.',
+  },
+  identifier: {
+    id: 'web.aircraftSearch:identifier',
+    defaultMessage: 'Einkennisstafir',
+    description: 'Einkennisstafir',
+  },
+  registrationNumber: {
+    id: 'web.aircraftSearch:registrationNumber',
+    defaultMessage: 'Skráningarnúmer',
+    description: 'Skráningarnúmer',
+  },
+  type: {
+    id: 'web.aircraftSearch:type',
+    defaultMessage: 'Tegund',
+    description: 'Tegund',
+  },
+  productionYear: {
+    id: 'web.aircraftSearch:productionYear',
+    defaultMessage: 'Framleiðsluár',
+    description: 'Framleiðsluár',
+  },
+  serialNumber: {
+    id: 'web.aircraftSearch:serialNumber',
+    defaultMessage: 'Raðnúmer',
+    description: 'Raðnúmer',
+  },
+  maxWeight: {
+    id: 'web.aircraftSearch:maxWeight',
+    defaultMessage: 'Hámarksþungi',
+    description: 'Hámarksþungi',
+  },
+  owner: {
+    id: 'web.aircraftSearch:owner',
+    defaultMessage: 'Eigandi',
+    description: 'Eigandi',
+  },
+  operator: {
+    id: 'web.aircraftSearch:operator',
+    defaultMessage: 'Umráðandi',
+    description: 'Umráðandi',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/KilometerFee.tsx b/apps/web/components/connected/vehicles/KilometerFee/KilometerFee.tsx
similarity index 75%
rename from apps/web/components/connected/vehicles/KilometerFee.tsx
rename to apps/web/components/connected/vehicles/KilometerFee/KilometerFee.tsx
index 41f7fd7c03fb..273d987b01ec 100644
--- a/apps/web/components/connected/vehicles/KilometerFee.tsx
+++ b/apps/web/components/connected/vehicles/KilometerFee/KilometerFee.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState } from 'react'
+import { useIntl } from 'react-intl'
 
 import {
   Box,
@@ -11,10 +12,11 @@ import {
   Text,
 } from '@island.is/island-ui/core'
 import { ConnectedComponent } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { useI18n } from '@island.is/web/i18n'
 import { formatCurrency } from '@island.is/web/utils/currency'
 
+import { translation as translationStrings } from './translation.strings'
+
 const MAX_KILOMETER_INPUT_LENGTH = 10
 
 const calculate = (inputState: InputState, slice: ConnectedComponent) => {
@@ -56,7 +58,7 @@ const initialInputState: InputState = {
 }
 
 const KilometerFee = ({ slice }: KilometerFeeProps) => {
-  const n = useNamespace(slice?.json ?? {})
+  const { formatMessage } = useIntl()
   const { activeLocale } = useI18n()
   const [result, setResult] = useState(0)
   const [inputState, setInputState] = useState(initialInputState)
@@ -64,24 +66,15 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
   const timelineOptions = useMemo(() => {
     return [
       {
-        label: n(
-          'perYear',
-          activeLocale === 'is' ? 'á ári' : 'per year',
-        ) as string,
+        label: formatMessage(translationStrings.perYear),
         value: 'perYear',
       },
       {
-        label: n(
-          'perMonth',
-          activeLocale === 'is' ? 'á mánuði' : 'per month',
-        ) as string,
+        label: formatMessage(translationStrings.perMonth),
         value: 'perMonth',
       },
       {
-        label: n(
-          'perDay',
-          activeLocale === 'is' ? 'á dag' : 'per day',
-        ) as string,
+        label: formatMessage(translationStrings.perDay),
         value: 'perDay',
       },
     ]
@@ -113,20 +106,12 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
       <Stack space={5}>
         <Stack space={2}>
           <Text variant="medium" fontWeight="light">
-            {n(
-              'energySource',
-              activeLocale === 'is'
-                ? 'Orkugjafi ökutækis'
-                : 'Energy source of vehicle',
-            )}
+            {formatMessage(translationStrings.energySource)}
           </Text>
 
           <Inline space={[3, 3, 5]} collapseBelow="sm">
             <RadioButton
-              label={n(
-                'electric',
-                activeLocale === 'is' ? 'Rafmagn' : 'Electric',
-              )}
+              label={formatMessage(translationStrings.electric)}
               name="electric"
               onChange={() => {
                 updateInputState('energySource', 'electric')
@@ -134,10 +119,7 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
               checked={inputState.energySource === 'electric'}
             />
             <RadioButton
-              label={n(
-                'hydrogen',
-                activeLocale === 'is' ? 'Vetni' : 'Hydrogen',
-              )}
+              label={formatMessage(translationStrings.hydrogen)}
               name="hydrogen"
               onChange={() => {
                 updateInputState('energySource', 'hydrogen')
@@ -145,10 +127,7 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
               checked={inputState.energySource === 'hydrogen'}
             />
             <RadioButton
-              label={n(
-                'hybrid',
-                activeLocale === 'is' ? 'Tengiltvinn' : 'Hybrid',
-              )}
+              label={formatMessage(translationStrings.hybrid)}
               name="hybrid"
               onChange={() => {
                 updateInputState('energySource', 'hybrid')
@@ -160,12 +139,7 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
 
         <Stack space={2}>
           <Text variant="medium" fontWeight="light">
-            {n(
-              'kilometerInputLabel',
-              activeLocale === 'is'
-                ? 'Áætlaður akstur í kílómetrum'
-                : 'Estimated driving in kilometers',
-            )}
+            {formatMessage(translationStrings.kilometerInputLabel)}
           </Text>
 
           <Inline space={1} alignY="bottom">
@@ -176,7 +150,9 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
               inputMode="numeric"
               size="xs"
               value={inputState.kilometers}
-              placeholder={n('kilometerInputPlaceholder', 'km')}
+              placeholder={formatMessage(
+                translationStrings.kilometerInputPlaceholder,
+              )}
               onChange={(ev) => {
                 if (
                   ev.target.value.length > maxKilometerInputLength ||
@@ -212,25 +188,17 @@ const KilometerFee = ({ slice }: KilometerFeeProps) => {
         </Stack>
 
         <Button onClick={updateResult} disabled={!canCalculate}>
-          {n('calculate', activeLocale === 'is' ? 'Reikna' : 'Calculate')}
+          {formatMessage(translationStrings.calculate)}
         </Button>
 
         {result > 0 && (
           <Stack space={1}>
             <Text variant="medium" fontWeight="light">
-              {n(
-                'resultPrefix',
-                activeLocale === 'is'
-                  ? 'Áætlað kílómetragjald'
-                  : 'Estimated kilometer fee',
-              )}
+              {formatMessage(translationStrings.resultPrefix)}
             </Text>
             <Text variant="h4" color="blue400" fontWeight="semiBold">
               {formatCurrency(result, '')}{' '}
-              {n(
-                'resultPostfix',
-                activeLocale === 'is' ? 'krónur á mánuði' : 'isk per month',
-              )}
+              {formatMessage(translationStrings.resultPostfix)}
             </Text>
           </Stack>
         )}
diff --git a/apps/web/components/connected/vehicles/KilometerFee/translation.strings.ts b/apps/web/components/connected/vehicles/KilometerFee/translation.strings.ts
new file mode 100644
index 000000000000..d41cf452a01e
--- /dev/null
+++ b/apps/web/components/connected/vehicles/KilometerFee/translation.strings.ts
@@ -0,0 +1,64 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  perYear: {
+    id: 'web.kilometerFee:perYear',
+    defaultMessage: 'á ári',
+    description: 'á ári',
+  },
+  perMonth: {
+    id: 'web.kilometerFee:perMonth',
+    defaultMessage: 'á mánuði',
+    description: 'á mánuði',
+  },
+  perDay: {
+    id: 'web.kilometerFee:perDay',
+    defaultMessage: 'á dag',
+    description: 'á dag',
+  },
+  energySource: {
+    id: 'web.kilometerFee:energySource',
+    defaultMessage: 'Orkugjafi ökutækis',
+    description: 'Label fyrir orkugjafa ökutækis valkost',
+  },
+  electric: {
+    id: 'web.kilometerFee:electric',
+    defaultMessage: 'Rafmagn',
+    description: 'Rafmagn',
+  },
+  hydrogen: {
+    id: 'web.kilometerFee:hydrogen',
+    defaultMessage: 'Vetni',
+    description: 'Vetni',
+  },
+  hybrid: {
+    id: 'web.kilometerFee:hybrid',
+    defaultMessage: 'Tengiltvinn',
+    description: 'Tengiltvinn',
+  },
+  kilometerInputLabel: {
+    id: 'web.kilometerFee:kilometerInputLabel',
+    defaultMessage: 'Áætlaður akstur í kílómetrum',
+    description: 'Label fyrir áætlaðan akstur í kílómetrum',
+  },
+  kilometerInputPlaceholder: {
+    id: 'web.kilometerFee:kilometerInputPlaceholder',
+    defaultMessage: 'km',
+    description: 'Placeholder fyrir kílómetra input reit',
+  },
+  calculate: {
+    id: 'web.kilometerFee:calculate',
+    defaultMessage: 'Reikna',
+    description: 'Texti sem birtist á reikna takka',
+  },
+  resultPrefix: {
+    id: 'web.kilometerFee:resultPrefix',
+    defaultMessage: 'Áætlað kílómetragjald',
+    description: 'Áætlað kílómetragjald',
+  },
+  resultPostfix: {
+    id: 'web.kilometerFee:resultPostfix',
+    defaultMessage: 'krónur á mánuði',
+    description: 'krónur á mánuði',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/PlateAvailableSearch.css.ts b/apps/web/components/connected/vehicles/PlateAvailableSearch/PlateAvailableSearch.css.ts
similarity index 100%
rename from apps/web/components/connected/vehicles/PlateAvailableSearch.css.ts
rename to apps/web/components/connected/vehicles/PlateAvailableSearch/PlateAvailableSearch.css.ts
diff --git a/apps/web/components/connected/vehicles/PlateAvailableSearch.tsx b/apps/web/components/connected/vehicles/PlateAvailableSearch/PlateAvailableSearch.tsx
similarity index 71%
rename from apps/web/components/connected/vehicles/PlateAvailableSearch.tsx
rename to apps/web/components/connected/vehicles/PlateAvailableSearch/PlateAvailableSearch.tsx
index fb272f4f4a42..8267fb6fc8b9 100644
--- a/apps/web/components/connected/vehicles/PlateAvailableSearch.tsx
+++ b/apps/web/components/connected/vehicles/PlateAvailableSearch/PlateAvailableSearch.tsx
@@ -1,19 +1,17 @@
-import { useLazyQuery } from '@apollo/client'
 import { useState } from 'react'
+import { useIntl } from 'react-intl'
+import { useLazyQuery } from '@apollo/client'
+
 import {
   AlertMessage,
   AsyncSearchInput,
   Box,
   Text,
 } from '@island.is/island-ui/core'
-import {
-  ConnectedComponent,
-  Query,
-  QueryPlateAvailableArgs,
-} from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
+import { Query, QueryPlateAvailableArgs } from '@island.is/web/graphql/schema'
 import { PLATE_AVAILABLE_SEARCH_QUERY } from '@island.is/web/screens/queries/PublicVehicleSearch'
 
+import { translation as translationStrings } from './translation.strings'
 import * as styles from './PlateAvailableSearch.css'
 
 const PLATE_NUMBER_REPLACEMENT_KEY = '{{USER_INPUT}}'
@@ -45,12 +43,8 @@ const TextWithReplacedBoldValue = ({
   )
 }
 
-interface PlateAvailableSearchProps {
-  slice: ConnectedComponent
-}
-
-const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
-  const n = useNamespace(slice?.json ?? {})
+const PlateAvailableSearch = () => {
+  const { formatMessage } = useIntl()
   const [hasFocus, setHasFocus] = useState(false)
   const [searchValue, setSearchValue] = useState('')
   const [shouldDisplayValidationError, setShouldDisplayValidationError] =
@@ -72,10 +66,7 @@ const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
     })
   }
 
-  const aboveText = n(
-    'aboveText',
-    'Hér má athuga hvort tiltekið einkanúmer sé laust',
-  ) as string
+  const aboveText = formatMessage(translationStrings.aboveText)
 
   return (
     <Box>
@@ -94,7 +85,7 @@ const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
           inputProps={{
             name: 'plate-available-search',
             inputSize: 'large',
-            placeholder: n('inputPlaceholder', 'Leita að einkanúmeri'),
+            placeholder: formatMessage(translationStrings.inputPlaceholder),
             colored: true,
             onChange: (ev) => setSearchValue(ev.target.value.toUpperCase()),
             value: searchValue,
@@ -112,20 +103,16 @@ const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
       {!loading && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n(
-            'errorOccurredMessage',
-            'Ekki tókst að upplýsingar um einkanúmer',
-          )}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
       {shouldDisplayValidationError && (
         <Text variant="small">
-          <span className={styles.bold}>{n('attention', 'Athugið:')} </span>
-          {n(
-            'regnoValidationText',
-            'Einkanúmer mega vera 2-6 íslenskir stafir eða tölur, og eitt bil að auki, en mega ekki líkjast venjulegum skráningarnúmerum.',
-          )}
+          <span className={styles.bold}>
+            {formatMessage(translationStrings.attention)}{' '}
+          </span>
+          {formatMessage(translationStrings.regnoValidationText)}
         </Text>
       )}
       {!error &&
@@ -134,10 +121,9 @@ const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
         data.plateAvailable?.regno &&
         data.plateAvailable.available && (
           <TextWithReplacedBoldValue
-            text={n(
-              'plateAvailableText',
-              `Merkið ${PLATE_NUMBER_REPLACEMENT_KEY} er laust`,
-            )}
+            text={formatMessage(translationStrings.plateAvailableText, {
+              PLATE_NUMBER: PLATE_NUMBER_REPLACEMENT_KEY,
+            })}
             replacementKey={PLATE_NUMBER_REPLACEMENT_KEY}
             replacementValue={data.plateAvailable.regno}
           />
@@ -148,10 +134,9 @@ const PlateAvailableSearch = ({ slice }: PlateAvailableSearchProps) => {
         data.plateAvailable?.regno &&
         !data.plateAvailable.available && (
           <TextWithReplacedBoldValue
-            text={n(
-              'plateUnavailableText',
-              `Merkið ${PLATE_NUMBER_REPLACEMENT_KEY} er í notkun og ekki laust til úthlutunar`,
-            )}
+            text={formatMessage(translationStrings.plateUnavailableText, {
+              PLATE_NUMBER: PLATE_NUMBER_REPLACEMENT_KEY,
+            })}
             replacementKey={PLATE_NUMBER_REPLACEMENT_KEY}
             replacementValue={data.plateAvailable.regno}
           />
diff --git a/apps/web/components/connected/vehicles/PlateAvailableSearch/translation.strings.ts b/apps/web/components/connected/vehicles/PlateAvailableSearch/translation.strings.ts
new file mode 100644
index 000000000000..8dd1c8d5f913
--- /dev/null
+++ b/apps/web/components/connected/vehicles/PlateAvailableSearch/translation.strings.ts
@@ -0,0 +1,47 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  aboveText: {
+    id: 'web.plateAvailableSearch:aboveText',
+    defaultMessage: 'Hér má athuga hvort tiltekið einkanúmer sé laust',
+    description: 'Texti sem birtist fyrir ofan',
+  },
+  inputPlaceholder: {
+    id: 'web.plateAvailableSearch:inputPlaceholder',
+    defaultMessage: 'Leita að einkanúmeri',
+    description: 'Placeholder texti fyrir leit',
+  },
+  errorOccurredTitle: {
+    id: 'web.plateAvailableSearch:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill á villuskilaboðum þegar villa kemur upp',
+  },
+  errorOccurredMessage: {
+    id: 'web.plateAvailableSearch:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að upplýsingar um einkanúmer',
+    description: 'Skilboð sem birtast þegar villa kemur upp',
+  },
+  attention: {
+    id: 'web.plateAvailableSearch:attention',
+    defaultMessage: 'Athugið:',
+    description: 'Athugið',
+  },
+  regnoValidationText: {
+    id: 'web.plateAvailableSearch:regnoValidationText',
+    defaultMessage:
+      'Einkanúmer mega vera 2-6 íslenskir stafir eða tölur, og eitt bil að auki, en mega ekki líkjast venjulegum skráningarnúmerum.',
+    description:
+      'Skilaboð sem birtast þegar einkanúmer leit er ekki með rétt validation',
+  },
+  plateAvailableText: {
+    id: 'web.plateAvailableSearch:plateAvailableText',
+    defaultMessage: 'Merkið {PLATE_NUMBER} er laust',
+    description: 'Texti sem birtist þegar merkið er laust',
+  },
+  plateUnavailableText: {
+    id: 'web.plateAvailableSearch:plateUnavailableText',
+    defaultMessage:
+      'Merkið {PLATE_NUMBER} er í notkun og ekki laust til úthlutunar',
+    description: 'Texti sem birtist þegar merkið er ekki laust til úthlutunar',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/PublicShipSearch.tsx b/apps/web/components/connected/vehicles/PublicShipSearch/PublicShipSearch.tsx
similarity index 82%
rename from apps/web/components/connected/vehicles/PublicShipSearch.tsx
rename to apps/web/components/connected/vehicles/PublicShipSearch/PublicShipSearch.tsx
index 6ada10ffe6b4..4cc83ff207a1 100644
--- a/apps/web/components/connected/vehicles/PublicShipSearch.tsx
+++ b/apps/web/components/connected/vehicles/PublicShipSearch/PublicShipSearch.tsx
@@ -1,7 +1,9 @@
-import { useLazyQuery } from '@apollo/client'
 import { useEffect, useRef, useState } from 'react'
-import { useRouter } from 'next/router'
+import { useIntl } from 'react-intl'
 import isEqual from 'lodash/isEqual'
+import { useRouter } from 'next/router'
+import { useLazyQuery } from '@apollo/client'
+
 import {
   AlertMessage,
   AsyncSearchInput,
@@ -10,21 +12,17 @@ import {
   Table,
   Text,
 } from '@island.is/island-ui/core'
-import { PUBLIC_SHIP_SEARCH_QUERY } from '@island.is/web/screens/queries/PublicShipSearch'
 import {
-  ConnectedComponent,
   GetPublicShipSearchQuery,
   GetPublicShipSearchQueryVariables,
 } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
+import { PUBLIC_SHIP_SEARCH_QUERY } from '@island.is/web/screens/queries/PublicShipSearch'
 
-const numberFormatter = new Intl.NumberFormat('de-DE')
+import { translation as translationStrings } from './translation.strings'
 
-interface PublicShipSearchProps {
-  slice: ConnectedComponent
-}
+const numberFormatter = new Intl.NumberFormat('de-DE')
 
-const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
+const PublicShipSearch = () => {
   const [hasFocus, setHasFocus] = useState(false)
   const [searchValue, setSearchValue] = useState('')
   const router = useRouter()
@@ -34,7 +32,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
     GetPublicShipSearchQuery['shipRegistryShipSearch']['ships']
   >([])
 
-  const n = useNamespace(slice?.json ?? {})
+  const { formatMessage } = useIntl()
 
   const [search, { loading, error, called }] = useLazyQuery<
     GetPublicShipSearchQuery,
@@ -99,7 +97,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
           inputProps={{
             name: 'public-ship-search',
             inputSize: 'large',
-            placeholder: n('inputPlaceholder', 'Númer eða nafn skips'),
+            placeholder: formatMessage(translationStrings.inputPlaceholder),
             colored: true,
             onChange: (ev) => setSearchValue(ev.target.value),
             value: searchValue,
@@ -116,15 +114,15 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
       {called && !loading && !error && noShipWasFound && (
         <Box>
           <Text fontWeight="semiBold">
-            {n('noShipFound', 'Ekkert skip fannst')}
+            {formatMessage(translationStrings.noShipFound)}
           </Text>
         </Box>
       )}
       {called && !loading && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja skip')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
       <Box marginBottom={3} marginTop={4}>
@@ -135,9 +133,8 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                 <Table.Head>
                   <Table.HeadData>
                     <Text fontWeight="semiBold">
-                      {n(
-                        'shipInformationTableHeaderText',
-                        'Niðurstaða leitar:',
+                      {formatMessage(
+                        translationStrings.shipInformationTableHeaderText,
                       )}
                     </Text>
                   </Table.HeadData>
@@ -149,7 +146,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('shipName', 'Nafn:')}
+                        {formatMessage(translationStrings.shipName)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -161,7 +158,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('shipType', 'Gerð:')}
+                        {formatMessage(translationStrings.shipType)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -173,7 +170,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('regno', 'Skráningarnúmer:')}
+                        {formatMessage(translationStrings.regno)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -185,7 +182,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('region', 'Umdæmi:')}
+                        {formatMessage(translationStrings.region)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -197,7 +194,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('portOfRegistry', 'Heimahöfn:')}
+                        {formatMessage(translationStrings.portOfRegistry)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -209,7 +206,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('regStatus', 'Skráningar staða:')}
+                        {formatMessage(translationStrings.regStatus)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
@@ -221,13 +218,15 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('grossTonnage', 'Brúttótonn:')}{' '}
+                        {formatMessage(translationStrings.grossTonnage)}{' '}
                       </Text>
                     </Table.Data>
                     <Table.Data>
                       <Text>
                         {numberFormatter.format(shipInformation.grossTonnage)}{' '}
-                        {n('grossTonnageMeasurement', 't')}
+                        {formatMessage(
+                          translationStrings.grossTonnageMeasurement,
+                        )}
                       </Text>
                     </Table.Data>
                   </Table.Row>
@@ -236,13 +235,13 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('length', 'Skráð lengd:')}
+                        {formatMessage(translationStrings.length)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
                       <Text>
                         {numberFormatter.format(shipInformation.length)}{' '}
-                        {n('lengthMeasurement', 'm')}
+                        {formatMessage(translationStrings.lengthMeasurement)}
                       </Text>
                     </Table.Data>
                   </Table.Row>
@@ -252,14 +251,14 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                   <Table.Row>
                     <Table.Data>
                       <Text fontWeight="semiBold">
-                        {n('constructed', 'Smíðað:')}
+                        {formatMessage(translationStrings.constructed)}
                       </Text>
                     </Table.Data>
                     <Table.Data>
                       <Text>
                         {shipInformation.manufactionYear}{' '}
                         {shipInformation.manufacturer &&
-                          n('manufacturedBy', 'af')}{' '}
+                          formatMessage(translationStrings.manufacturedBy)}{' '}
                         {shipInformation.manufacturer}
                       </Text>
                     </Table.Data>
@@ -270,7 +269,7 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                     <Table.Row>
                       <Table.Data>
                         <Text fontWeight="semiBold">
-                          {n('owners', 'Eigendur:')}
+                          {formatMessage(translationStrings.owners)}
                         </Text>
                       </Table.Data>
                       <Table.Data>
@@ -280,16 +279,15 @@ const PublicShipSearch = ({ slice }: PublicShipSearchProps) => {
                               <Text>
                                 {owner?.name}{' '}
                                 {owner?.nationalId
-                                  ? `${n('nationalIdPrefix', 'kt.')} ${
-                                      owner.nationalId
-                                    }`
+                                  ? `${formatMessage(
+                                      translationStrings.nationalIdPrefix,
+                                    )} ${owner.nationalId}`
                                   : ''}
                               </Text>
                               <Text>
                                 {typeof owner?.sharePercentage === 'number'
-                                  ? `${owner.sharePercentage}% ${n(
-                                      'sharePercentageProperty',
-                                      'eign',
+                                  ? `${owner.sharePercentage}% ${formatMessage(
+                                      translationStrings.sharePercentageProperty,
                                     )}`
                                   : ''}
                               </Text>
diff --git a/apps/web/components/connected/vehicles/PublicShipSearch/translation.strings.ts b/apps/web/components/connected/vehicles/PublicShipSearch/translation.strings.ts
new file mode 100644
index 000000000000..3fcc16c996d7
--- /dev/null
+++ b/apps/web/components/connected/vehicles/PublicShipSearch/translation.strings.ts
@@ -0,0 +1,104 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  inputPlaceholder: {
+    id: 'web.publicShipSearch:inputPlaceholder',
+    defaultMessage: 'Númer eða nafn skips',
+    description: 'Placeholder texti fyrir leit',
+  },
+  noShipFound: {
+    id: 'web.publicShipSearch:noShipFound',
+    defaultMessage: 'Ekkert skip fannst',
+    description: 'Texti þegar ekkert skip fannst við leit',
+  },
+  errorOccurredTitle: {
+    id: 'web.publicShipSearch:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill þegar villa kemur upp',
+  },
+  errorOccurredMessage: {
+    id: 'web.publicShipSearch:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja skip',
+    description: 'Skilaboð sem birtast þegar villa kemur upp',
+  },
+  shipInformationTableHeaderText: {
+    id: 'web.publicShipSearch:shipInformationTableHeaderText',
+    defaultMessage: 'Niðurstaða leitar:',
+    description: 'Texti í töflu haus',
+  },
+  shipName: {
+    id: 'web.publicShipSearch:shipName',
+    defaultMessage: 'Nafn:',
+    description: 'Nafn',
+  },
+  shipType: {
+    id: 'web.publicShipSearch:shipType',
+    defaultMessage: 'Gerð:',
+    description: 'Gerð',
+  },
+  regno: {
+    id: 'web.publicShipSearch:regno',
+    defaultMessage: 'Skráningarnúmer:',
+    description: 'Skráningarnúmer',
+  },
+  region: {
+    id: 'web.publicShipSearch:region',
+    defaultMessage: 'Umdæmi:',
+    description: 'Umdæmi',
+  },
+  portOfRegistry: {
+    id: 'web.publicShipSearch:portOfRegistry',
+    defaultMessage: 'Heimahöfn:',
+    description: 'Heimahöfn',
+  },
+  regStatus: {
+    id: 'web.publicShipSearch:regStatus',
+    defaultMessage: 'Skráningar staða:',
+    description: 'Skráningar staða',
+  },
+  grossTonnage: {
+    id: 'web.publicShipSearch:grossTonnage',
+    defaultMessage: 'Brúttótonn:',
+    description: 'Brúttótonn',
+  },
+  grossTonnageMeasurement: {
+    id: 'web.publicShipSearch:grossTonnageMeasurement',
+    defaultMessage: 't',
+    description: 'Tonn mælineining',
+  },
+  length: {
+    id: 'web.publicShipSearch:length',
+    defaultMessage: 'Skráð lengd:',
+    description: 'Skráð lengd',
+  },
+  lengthMeasurement: {
+    id: 'web.publicShipSearch:lengthMeasurement',
+    defaultMessage: 'm',
+    description: 'Lengdar mælieining',
+  },
+  constructed: {
+    id: 'web.publicShipSearch:constructed',
+    defaultMessage: 'Smíðað:',
+    description: 'Smíðað',
+  },
+  manufacturedBy: {
+    id: 'web.publicShipSearch:manufacturedBy',
+    defaultMessage: 'af',
+    description: 'Smiðað af',
+  },
+  owners: {
+    id: 'web.publicShipSearch:owners',
+    defaultMessage: 'Eigendur:',
+    description: 'Eigendur',
+  },
+  nationalIdPrefix: {
+    id: 'web.publicShipSearch:nationalIdPrefix',
+    defaultMessage: 'kt.',
+    description: 'Kennitala forskeyti',
+  },
+  sharePercentageProperty: {
+    id: 'web.publicShipSearch:sharePercentageProperty',
+    defaultMessage: 'eign',
+    description: 'eign',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx b/apps/web/components/connected/vehicles/PublicVehicleSearch/PublicVehicleSearch.tsx
similarity index 84%
rename from apps/web/components/connected/vehicles/PublicVehicleSearch.tsx
rename to apps/web/components/connected/vehicles/PublicVehicleSearch/PublicVehicleSearch.tsx
index 48d8005f5c2e..7c8df97f52be 100644
--- a/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx
+++ b/apps/web/components/connected/vehicles/PublicVehicleSearch/PublicVehicleSearch.tsx
@@ -1,7 +1,9 @@
-import { useLazyQuery } from '@apollo/client'
 import { useEffect, useRef, useState } from 'react'
+import { useIntl } from 'react-intl'
 import isEqual from 'lodash/isEqual'
 import { useRouter } from 'next/router'
+import { useLazyQuery } from '@apollo/client'
+
 import {
   AlertMessage,
   AsyncSearchInput,
@@ -9,14 +11,14 @@ import {
   Table,
   Text,
 } from '@island.is/island-ui/core'
-import { PUBLIC_VEHICLE_SEARCH_QUERY } from '@island.is/web/screens/queries/PublicVehicleSearch'
 import {
-  ConnectedComponent,
   GetPublicVehicleSearchQuery,
   GetPublicVehicleSearchQueryVariables,
 } from '@island.is/web/graphql/schema'
-import { useNamespace } from '@island.is/web/hooks'
 import { useDateUtils } from '@island.is/web/i18n/useDateUtils'
+import { PUBLIC_VEHICLE_SEARCH_QUERY } from '@island.is/web/screens/queries/PublicVehicleSearch'
+
+import { translation as translationStrings } from './translation.strings'
 
 const numberFormatter = new Intl.NumberFormat('de-DE')
 
@@ -40,18 +42,14 @@ const formatVehicleType = (vehicleInformation?: {
   }`
 }
 
-interface PublicVehicleSearchProps {
-  slice: ConnectedComponent
-}
-
-const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
+const PublicVehicleSearch = () => {
   const [hasFocus, setHasFocus] = useState(false)
   const [searchValue, setSearchValue] = useState('')
   const { format } = useDateUtils()
   const router = useRouter()
   const queryParamInitialized = useRef(false)
 
-  const n = useNamespace(slice?.json ?? {})
+  const { formatMessage } = useIntl()
 
   const [search, { loading, data, error, called }] = useLazyQuery<
     GetPublicVehicleSearchQuery,
@@ -117,12 +115,6 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
 
   return (
     <Box>
-      <Text>
-        {n(
-          'inputEyebrowText',
-          'Skráningarnúmer, fastanúmer eða verksmiðjunúmer:',
-        )}
-      </Text>
       <Box marginTop={2} marginBottom={3}>
         <AsyncSearchInput
           buttonProps={{
@@ -135,7 +127,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
           inputProps={{
             name: 'public-vehicle-search',
             inputSize: 'large',
-            placeholder: n('inputPlaceholder', 'Leita í ökutækjaskrá'),
+            placeholder: formatMessage(translationStrings.inputPlaceholder),
             colored: true,
             onChange: (ev) => setSearchValue(ev.target.value.toUpperCase()),
             value: searchValue,
@@ -153,15 +145,15 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
       {called && !loading && !error && vehicleWasNotFound && (
         <Box>
           <Text fontWeight="semiBold">
-            {n('noVehicleFound', 'Ekkert ökutæki fannst')}
+            {formatMessage(translationStrings.noVehicleFound)}
           </Text>
         </Box>
       )}
       {called && !loading && error && (
         <AlertMessage
           type="error"
-          title={n('errorOccurredTitle', 'Villa kom upp')}
-          message={n('errorOccurredMessage', 'Ekki tókst að sækja ökutæki')}
+          title={formatMessage(translationStrings.errorOccurredTitle)}
+          message={formatMessage(translationStrings.errorOccurredMessage)}
         />
       )}
       {vehicleInformation && (
@@ -170,7 +162,9 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
             <Table.Head>
               <Table.HeadData>
                 <Text fontWeight="semiBold">
-                  {n('vehicleInformationTableHeaderText', 'Niðurstaða leitar:')}
+                  {formatMessage(
+                    translationStrings.vehicleInformationTableHeaderText,
+                  )}
                 </Text>
               </Table.HeadData>
               <Table.HeadData />
@@ -180,7 +174,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('vehicleCommercialName', 'Tegund:')}
+                      {formatMessage(translationStrings.vehicleCommercialName)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -192,7 +186,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('regno', 'Skráningarnúmer:')}
+                      {formatMessage(translationStrings.regno)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -204,7 +198,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('permno', 'Fastanúmer:')}
+                      {formatMessage(translationStrings.permno)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -216,7 +210,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('vin', 'Verksmiðjunúmer:')}
+                      {formatMessage(translationStrings.vin)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -228,7 +222,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('firstRegDate', 'Fyrst skráð:')}
+                      {formatMessage(translationStrings.firstRegDate)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -240,7 +234,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('co2NEDC', 'CO2-gildi (NEDC):')}
+                      {formatMessage(translationStrings.co2NEDC)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -252,7 +246,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('weightedCo2NEDC', 'Vegið CO2-gildi (NEDC):')}
+                      {formatMessage(translationStrings.weightedCo2NEDC)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -264,7 +258,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('Co2WLTP', 'CO2-gildi (WLTP):')}
+                      {formatMessage(translationStrings.Co2WLTP)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -276,7 +270,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('weightedCo2WLTP', 'Vegið CO2-gildi (WLTP):')}
+                      {formatMessage(translationStrings.weightedCo2WLTP)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -288,7 +282,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('mass', 'Eigin þyngd:')}
+                      {formatMessage(translationStrings.mass)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -302,7 +296,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('massLaden', 'Leyfð heildarþyngd:')}
+                      {formatMessage(translationStrings.massLaden)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -316,7 +310,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('vehicleStatus', 'Staða:')}
+                      {formatMessage(translationStrings.vehicleStatus)}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -328,7 +322,9 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
                 <Table.Row>
                   <Table.Data>
                     <Text fontWeight="semiBold">
-                      {n('nextVehicleMainInspection', 'Næsta skoðun:')}
+                      {formatMessage(
+                        translationStrings.nextVehicleMainInspection,
+                      )}
                     </Text>
                   </Table.Data>
                   <Table.Data>
@@ -340,14 +336,6 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => {
           </Table.Table>
         </Box>
       )}
-      <Box marginTop={2}>
-        <Text variant="small">
-          {n(
-            'moreInfoText',
-            'Hægt er að fletta upp bílnúmerum á Mínum síðum og fá þar ítarlegri upplýsingar',
-          )}
-        </Text>
-      </Box>
     </Box>
   )
 }
diff --git a/apps/web/components/connected/vehicles/PublicVehicleSearch/translation.strings.ts b/apps/web/components/connected/vehicles/PublicVehicleSearch/translation.strings.ts
new file mode 100644
index 000000000000..fea8582d2cdf
--- /dev/null
+++ b/apps/web/components/connected/vehicles/PublicVehicleSearch/translation.strings.ts
@@ -0,0 +1,94 @@
+import { defineMessages } from 'react-intl'
+
+export const translation = defineMessages({
+  inputPlaceholder: {
+    id: 'web.publicVehicleSearch:inputPlaceholder',
+    defaultMessage: 'Leita í ökutækjaskrá',
+    description: 'Placeholder texti á leit',
+  },
+  noVehicleFound: {
+    id: 'web.publicVehicleSearch:noVehicleFound',
+    defaultMessage: 'Ekkert ökutæki fannst',
+    description: 'Texti sem birtist þegar leit skilar engum niðurstöðum',
+  },
+  errorOccurredTitle: {
+    id: 'web.publicVehicleSearch:errorOccurredTitle',
+    defaultMessage: 'Villa kom upp',
+    description: 'Titill á skilaboðum þegar villa kemur upp',
+  },
+  errorOccurredMessage: {
+    id: 'web.publicVehicleSearch:errorOccurredMessage',
+    defaultMessage: 'Ekki tókst að sækja ökutæki',
+    description: 'Skilaboð þegar villa kemur upp',
+  },
+  vehicleInformationTableHeaderText: {
+    id: 'web.publicVehicleSearch:vehicleInformationTableHeaderText',
+    defaultMessage: 'Niðurstaða leitar:',
+    description: 'Texti í töflu haus á niðurstöðum',
+  },
+  vehicleCommercialName: {
+    id: 'web.publicVehicleSearch:vehicleCommercialName',
+    defaultMessage: 'Tegund:',
+    description: 'Tegund',
+  },
+  regno: {
+    id: 'web.publicVehicleSearch:regno',
+    defaultMessage: 'Skráningarnúmer:',
+    description: 'Skráningarnúmer',
+  },
+  permno: {
+    id: 'web.publicVehicleSearch:permno',
+    defaultMessage: 'Fastanúmer:',
+    description: 'Fastanúmer',
+  },
+  vin: {
+    id: 'web.publicVehicleSearch:vin',
+    defaultMessage: 'Verksmiðjunúmer:',
+    description: 'Verksmiðjunúmer',
+  },
+  firstRegDate: {
+    id: 'web.publicVehicleSearch:firstRegDate',
+    defaultMessage: 'Fyrst skráð:',
+    description: 'Fyrst skráð',
+  },
+  co2NEDC: {
+    id: 'web.publicVehicleSearch:co2NEDC',
+    defaultMessage: 'CO2-gildi (NEDC):',
+    description: 'CO2-gildi (NEDC)',
+  },
+  weightedCo2NEDC: {
+    id: 'web.publicVehicleSearch:weightedCo2NEDC',
+    defaultMessage: 'Vegið CO2-gildi (NEDC):',
+    description: 'Vegið CO2-gildi (NEDC)',
+  },
+  Co2WLTP: {
+    id: 'web.publicVehicleSearch:Co2WLTP',
+    defaultMessage: 'CO2-gildi (WLTP):',
+    description: 'CO2-gildi (WLTP)',
+  },
+  weightedCo2WLTP: {
+    id: 'web.publicVehicleSearch:weightedCo2WLTP',
+    defaultMessage: 'Vegið CO2-gildi (WLTP):',
+    description: 'Vegið CO2-gildi (WLTP)',
+  },
+  mass: {
+    id: 'web.publicVehicleSearch:mass',
+    defaultMessage: 'Eigin þyngd:',
+    description: 'Eigin þyngd',
+  },
+  massLaden: {
+    id: 'web.publicVehicleSearch:massLaden',
+    defaultMessage: 'Leyfð heildarþyngd:',
+    description: 'Leyfð heildarþyngd',
+  },
+  vehicleStatus: {
+    id: 'web.publicVehicleSearch:vehicleStatus',
+    defaultMessage: 'Staða:',
+    description: 'Staða',
+  },
+  nextVehicleMainInspection: {
+    id: 'web.publicVehicleSearch:nextVehicleMainInspection',
+    defaultMessage: 'Næsta skoðun:',
+    description: 'Næsta skoðun',
+  },
+})
diff --git a/apps/web/components/connected/vehicles/index.ts b/apps/web/components/connected/vehicles/index.ts
index a18d2541d63b..6bf01a78476d 100644
--- a/apps/web/components/connected/vehicles/index.ts
+++ b/apps/web/components/connected/vehicles/index.ts
@@ -1,22 +1,31 @@
 import dynamic from 'next/dynamic'
 
 export const PublicVehicleSearch = dynamic(
-  () => import('./PublicVehicleSearch'),
+  () => import('./PublicVehicleSearch/PublicVehicleSearch'),
   { ssr: false },
 )
 
-export const AircraftSearch = dynamic(() => import('./AircraftSearch'), {
-  ssr: true,
-})
+export const AircraftSearch = dynamic(
+  () => import('./AircraftSearch/AircraftSearch'),
+  {
+    ssr: true,
+  },
+)
 export const PlateAvailableSearch = dynamic(
-  () => import('./PlateAvailableSearch'),
+  () => import('./PlateAvailableSearch/PlateAvailableSearch'),
   { ssr: false },
 )
 
-export const PublicShipSearch = dynamic(() => import('./PublicShipSearch'), {
-  ssr: false,
-})
+export const PublicShipSearch = dynamic(
+  () => import('./PublicShipSearch/PublicShipSearch'),
+  {
+    ssr: false,
+  },
+)
 
-export const KilometerFee = dynamic(() => import('./KilometerFee'), {
-  ssr: true,
-})
+export const KilometerFee = dynamic(
+  () => import('./KilometerFee/KilometerFee'),
+  {
+    ssr: true,
+  },
+)
diff --git a/apps/web/components/real.ts b/apps/web/components/real.ts
index 0f63a858efdf..53c38bb58324 100644
--- a/apps/web/components/real.ts
+++ b/apps/web/components/real.ts
@@ -93,3 +93,4 @@ export * from './BorderAbove/BorderAbove'
 export * from './TableOfContents/TableOfContents'
 export * from './CardWithFeaturedItems/CardWithFeaturedItems'
 export * from './GenericList/GenericList'
+export * from './GenericList/LatestGenericListItems/LatestGenericListItems'
diff --git a/apps/web/project.json b/apps/web/project.json
index a1a12fdb04f5..cc84a6ffdf79 100644
--- a/apps/web/project.json
+++ b/apps/web/project.json
@@ -82,7 +82,7 @@
     "extract-strings": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'apps/web/screens/**/*.{js,ts,tsx}'"
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'apps/web/{screens,components}/**/!(*.d).{js,ts,tsx}'"
       }
     },
     "export": {
diff --git a/apps/web/screens/queries/fragments.ts b/apps/web/screens/queries/fragments.ts
index c37f8f2ac8fe..c59235111a0a 100644
--- a/apps/web/screens/queries/fragments.ts
+++ b/apps/web/screens/queries/fragments.ts
@@ -198,6 +198,7 @@ export const slices = gql`
     json
     configJson
     componentType: type
+    translationStrings
   }
 
   fragment StatisticsFields on Statistics {
@@ -883,6 +884,41 @@ export const slices = gql`
     }
   }
 
+  fragment LatestGenericListItemsFields on LatestGenericListItems {
+    title
+    genericList {
+      itemType
+    }
+    seeMorePage {
+      ... on OrganizationSubpage {
+        id
+        title
+        slug
+        organizationPage {
+          slug
+        }
+      }
+    }
+    seeMoreLinkText
+    itemResponse {
+      items {
+        id
+        date
+        title
+        cardIntro {
+          ...HtmlFields
+        }
+        filterTags {
+          id
+          title
+          slug
+        }
+        slug
+        assetUrl
+      }
+    }
+  }
+
   fragment BaseSlices on Slice {
     ...TimelineFields
     ...StoryFields
@@ -927,6 +963,7 @@ export const slices = gql`
     ...ChartNumberBoxFields
     ...FeaturedEventsFields
     ...GenericListFields
+    ...LatestGenericListItemsFields
   }
 
   fragment AllSlices on Slice {
diff --git a/apps/web/utils/richText.tsx b/apps/web/utils/richText.tsx
index 45d4e0e9432b..62f9e1bee9ca 100644
--- a/apps/web/utils/richText.tsx
+++ b/apps/web/utils/richText.tsx
@@ -1,3 +1,6 @@
+import { PropsWithChildren } from 'react'
+import { IntlConfig, IntlProvider } from 'react-intl'
+
 import {
   FaqList,
   type FaqListProps,
@@ -72,11 +75,12 @@ import {
   TeamList,
   TwoColumnText,
 } from '@island.is/web/graphql/schema'
+import { useI18n } from '@island.is/web/i18n'
 
 import AdministrationOfOccupationalSafetyAndHealthCourses from '../components/connected/AdministrationOfOccupationalSafetyAndHealthCourses/AdministrationOfOccupationalSafetyAndHealthCourses'
 import { MonthlyStatistics } from '../components/connected/electronicRegistrationStatistics'
 import { GrindavikResidentialPropertyPurchaseCalculator } from '../components/connected/GrindavikResidentialPropertyPurchaseCalculator'
-import HousingBenefitCalculator from '../components/connected/HousingBenefitCalculator/HousingBenefitCalculator'
+import HousingBenefitCalculator from '../components/connected/HousingBenefitCalculator/HousingBenefitCalculator/HousingBenefitCalculator'
 import JourneymanList from '../components/connected/syslumenn/TableLists/JourneymanList/JourneymanList'
 import ProfessionRights from '../components/connected/syslumenn/TableLists/ProfessionRights/ProfessionRights'
 import { UmsCostOfLivingCalculator } from '../components/connected/UmbodsmadurSkuldara'
@@ -84,67 +88,116 @@ import FeaturedEvents from '../components/FeaturedEvents/FeaturedEvents'
 import FeaturedSupportQNAs from '../components/FeaturedSupportQNAs/FeaturedSupportQNAs'
 import { EmbedSlice } from '../components/Organization/Slice/EmbedSlice/EmbedSlice'
 
+interface TranslationNamespaceProviderProps {
+  messages: IntlConfig['messages']
+}
+
+const TranslationNamespaceProvider = ({
+  messages,
+  children,
+}: PropsWithChildren<TranslationNamespaceProviderProps>) => {
+  const { activeLocale } = useI18n()
+
+  return (
+    <IntlProvider locale={activeLocale} messages={messages}>
+      {children}
+    </IntlProvider>
+  )
+}
+
 export const webRenderConnectedComponent = (
   slice: ConnectedComponent & { componentType?: string },
 ) => {
-  const data = slice.json ?? {}
+  let connectedComponent = null
 
   switch (slice.componentType) {
     case 'Fiskistofa/ShipSearch':
-      return <ShipSearch namespace={data} />
+      connectedComponent = <ShipSearch />
+      break
     case 'Fiskistofa/ShipSearchSidebarInput':
-      return <SidebarShipSearchInput namespace={data} />
+      connectedComponent = <SidebarShipSearchInput />
+      break
     case 'Fiskistofa/StraddlingStockCalculator':
-      return <StraddlingStockCalculator namespace={data} />
+      connectedComponent = <StraddlingStockCalculator />
+      break
     case 'Fiskistofa/CatchQuotaCalculator':
-      return <CatchQuotaCalculator namespace={data} />
+      connectedComponent = <CatchQuotaCalculator />
+      break
     case 'Fiskistofa/SelectedShip':
-      return <SelectedShip />
+      connectedComponent = <SelectedShip />
+      break
     case 'ElectronicRegistrations/MonthlyStatistics':
-      return <MonthlyStatistics slice={slice} />
+      connectedComponent = <MonthlyStatistics slice={slice} />
+      break
     case 'Fiskistofa/ShipSearchBoxedInput':
-      return <ShipSearchBoxedInput namespace={data} />
+      connectedComponent = <ShipSearchBoxedInput />
+      break
     case 'Áfengisleyfi/AlcoholLicences':
-      return <AlcoholLicencesList slice={slice} />
+      connectedComponent = <AlcoholLicencesList slice={slice} />
+      break
     case 'Tækifærisleyfi/TemporaryEventLicences':
-      return <TemporaryEventLicencesList slice={slice} />
+      connectedComponent = <TemporaryEventLicencesList slice={slice} />
+      break
     case 'Verðbréfamiðlarar/Brokers':
-      return <BrokersList slice={slice} />
+      connectedComponent = <BrokersList slice={slice} />
+      break
     case 'PublicVehicleSearch':
-      return <PublicVehicleSearch slice={slice} />
+      connectedComponent = <PublicVehicleSearch />
+      break
     case 'AircraftSearch':
-      return <AircraftSearch slice={slice} />
+      connectedComponent = <AircraftSearch slice={slice} />
+      break
     case 'DrivingInstructorList':
-      return <DrivingInstructorList slice={slice} />
+      connectedComponent = <DrivingInstructorList slice={slice} />
+      break
     case 'PlateAvailableSearch':
-      return <PlateAvailableSearch slice={slice} />
+      connectedComponent = <PlateAvailableSearch />
+      break
     case 'HousingBenefitCalculator':
-      return <HousingBenefitCalculator slice={slice} />
+      connectedComponent = <HousingBenefitCalculator slice={slice} />
+      break
     case 'PublicShipSearch':
-      return <PublicShipSearch slice={slice} />
+      connectedComponent = <PublicShipSearch />
+      break
     case 'Meistaraleyfi/MasterLicences':
-      return <MasterList slice={slice} />
+      connectedComponent = <MasterList slice={slice} />
+      break
     case 'Vinnueftirlitid/Namskeid':
-      return (
+      connectedComponent = (
         <AdministrationOfOccupationalSafetyAndHealthCourses slice={slice} />
       )
+      break
     case 'KilometerFee':
-      return <KilometerFee slice={slice} />
+      connectedComponent = <KilometerFee slice={slice} />
+      break
     case 'SpecificHousingBenefitSupportCalculator':
-      return <SpecificHousingBenefitSupportCalculator slice={slice} />
+      connectedComponent = <SpecificHousingBenefitSupportCalculator />
+      break
     case 'GrindavikResidentialPropertyPurchaseCalculator':
-      return <GrindavikResidentialPropertyPurchaseCalculator slice={slice} />
+      connectedComponent = (
+        <GrindavikResidentialPropertyPurchaseCalculator slice={slice} />
+      )
+      break
     case 'Sveinslisti/JourneymanList':
-      return <JourneymanList slice={slice} />
+      connectedComponent = <JourneymanList slice={slice} />
+      break
     case 'Starfsrettindi/ProfessionRights':
-      return <ProfessionRights slice={slice} />
+      connectedComponent = <ProfessionRights slice={slice} />
+      break
     case 'Ums/CostOfLivingCalculator':
-      return <UmsCostOfLivingCalculator slice={slice} />
-    default:
+      connectedComponent = <UmsCostOfLivingCalculator />
       break
+    default:
+      connectedComponent = renderConnectedComponent(slice)
   }
 
-  return renderConnectedComponent(slice)
+  return (
+    <TranslationNamespaceProvider
+      messages={slice.translationStrings ?? slice.json ?? {}}
+    >
+      {connectedComponent}
+    </TranslationNamespaceProvider>
+  )
 }
 
 const defaultRenderComponent = {
diff --git a/charts/identity-server/values.staging.yaml b/charts/identity-server/values.staging.yaml
index 03040f931550..235d50eef758 100644
--- a/charts/identity-server/values.staging.yaml
+++ b/charts/identity-server/values.staging.yaml
@@ -375,7 +375,7 @@ services-auth-ids-api:
     LOG_LEVEL: 'info'
     NATIONAL_REGISTRY_B2C_CLIENT_ID: '6cf94113-d326-4e4d-b97c-1fea12d2f5e1'
     NATIONAL_REGISTRY_B2C_ENDPOINT: 'https://skraidentitydev.b2clogin.com/skraidentitydev.onmicrosoft.com/b2c_1_midlun_flow/oauth2/v2.0/token'
-    NATIONAL_REGISTRY_B2C_PATH: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Midlun-v1'
+    NATIONAL_REGISTRY_B2C_PATH: 'IS-TEST/GOV/10001/SKRA-Cloud-Protected/Midlun-v1'
     NATIONAL_REGISTRY_B2C_SCOPE: 'https://skraidentitydev.onmicrosoft.com/midlun/.default'
     NODE_OPTIONS: '--max-old-space-size=691 -r dd-trace/init'
     NOVA_ACCEPT_UNAUTHORIZED: 'false'
diff --git a/charts/islandis/values.dev.yaml b/charts/islandis/values.dev.yaml
index c37074a33485..af8f99c4d36f 100644
--- a/charts/islandis/values.dev.yaml
+++ b/charts/islandis/values.dev.yaml
@@ -1285,6 +1285,7 @@ endorsement-system-api:
     EMAIL_FROM_ADDRESS: 'development@island.is'
     EMAIL_FROM_NAME: 'devland.is'
     EMAIL_REGION: 'eu-west-1'
+    ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME: 'island-is-dev-exports-endorsement-system'
     IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/endorsement'
     IDENTITY_SERVER_ISSUER_URL: 'https://identity-server.dev01.devland.is'
     LOG_LEVEL: 'info'
@@ -2957,6 +2958,8 @@ user-notification:
   env:
     AUTH_DELEGATION_API_URL: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS-DEV/GOV/10006/Skatturinn/ft-v1'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
     DB_REPLICAS_HOST: 'postgres-applications-reader.internal'
@@ -3152,6 +3155,8 @@ user-notification-worker:
   env:
     AUTH_DELEGATION_API_URL: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS-DEV/GOV/10006/Skatturinn/ft-v1'
     CONTENTFUL_HOST: 'preview.contentful.com'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
diff --git a/charts/islandis/values.prod.yaml b/charts/islandis/values.prod.yaml
index 6ccb3917b3bd..c47adc3b38ed 100644
--- a/charts/islandis/values.prod.yaml
+++ b/charts/islandis/values.prod.yaml
@@ -1280,6 +1280,7 @@ endorsement-system-api:
     EMAIL_FROM_ADDRESS: 'noreply@island.is'
     EMAIL_FROM_NAME: 'island.is'
     EMAIL_REGION: 'eu-west-1'
+    ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME: 'island-is-prod-exports-endorsement-system'
     IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/endorsement'
     IDENTITY_SERVER_ISSUER_URL: 'https://innskra.island.is'
     LOG_LEVEL: 'info'
@@ -2834,6 +2835,8 @@ user-notification:
   env:
     AUTH_DELEGATION_API_URL: 'https://auth-delegation-api.internal.innskra.island.is'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS/GOV/5402696029/Skatturinn/ft-v1'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
     DB_REPLICAS_HOST: 'postgres-applications.internal'
@@ -3029,6 +3032,8 @@ user-notification-worker:
   env:
     AUTH_DELEGATION_API_URL: 'https://auth-delegation-api.internal.innskra.island.is'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS/GOV/5402696029/Skatturinn/ft-v1'
     CONTENTFUL_HOST: 'cdn.contentful.com'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
index d779344442f4..b25e6403014a 100644
--- a/charts/islandis/values.staging.yaml
+++ b/charts/islandis/values.staging.yaml
@@ -326,82 +326,82 @@ api:
     USER_NOTIFICATION_API_URL: 'http://web-user-notification.user-notification.svc.cluster.local'
     USER_PROFILE_CLIENT_URL: 'http://web-service-portal-api.service-portal.svc.cluster.local'
     XROAD_ADR_MACHINE_LICENSE_PATH: 'IS-TEST/GOV/4201810439/Vinnueftirlitid-Protected/rettindi-token-v1'
-    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1'
-    XROAD_AIRCRAFT_REGISTRY_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Loftfaraskra-V1'
+    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10056/LBHI-Protected/brautskraning-v1'
+    XROAD_AIRCRAFT_REGISTRY_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Loftfaraskra-V1'
     XROAD_BASE_PATH: 'http://securityserver.staging01.devland.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-DEV/EDU/10057/Bifrost-Protected/brautskraning-v1'
-    XROAD_CHARGE_FJS_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2'
+    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-TEST/EDU/10057/Bifrost-Protected/brautskraning-v1'
+    XROAD_CHARGE_FJS_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2'
     XROAD_CHARGE_FJS_V2_TIMEOUT: '20000'
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
-    XROAD_COURT_BANKRUPTCY_CERT_PATH: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1'
+    XROAD_COURT_BANKRUPTCY_CERT_PATH: 'IS-TEST/GOV/10019/Domstolasyslan/JusticePortal-v1'
     XROAD_CRIMINAL_RECORD_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Sakaskra-v1'
-    XROAD_DIGITAL_TACHOGRAPH_DRIVERS_CARD_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Okuritar-V1'
-    XROAD_DIRECTORATE_OF_IMMIGRATION_PATH: 'IS-DEV/GOV/10011/UTL-Protected/Utl-Umsokn-v1'
+    XROAD_DIGITAL_TACHOGRAPH_DRIVERS_CARD_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Okuritar-V1'
+    XROAD_DIRECTORATE_OF_IMMIGRATION_PATH: 'IS-TEST/GOV/10011/UTL-Protected/Utl-Umsokn-v1'
     XROAD_DISABILITY_LICENSE_PATH: 'IS-TEST/GOV/5012130120/TR-Protected/oryrki-v1'
-    XROAD_DISTRICT_COMMISSIONERS_LICENSES_PATH: 'IS-DEV/GOV/10016/Syslumenn-Protected/RettindiIslandis'
-    XROAD_DISTRICT_COMMISSIONERS_P_CARD_PATH: 'IS-DEV/GOV/10016/Syslumenn-Protected/IslandMinarSidur'
+    XROAD_DISTRICT_COMMISSIONERS_LICENSES_PATH: 'IS-TEST/GOV/10016/Syslumenn-Protected/RettindiIslandis'
+    XROAD_DISTRICT_COMMISSIONERS_P_CARD_PATH: 'IS-TEST/GOV/10016/Syslumenn-Protected/IslandMinarSidur'
     XROAD_DRIVING_LICENSE_BOOK_TIMEOUT: '20000'
     XROAD_DRIVING_LICENSE_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/RafraentOkuskirteini-v1'
     XROAD_DRIVING_LICENSE_V2_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/RafraentOkuskirteini-v2'
     XROAD_DRIVING_LICENSE_V4_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v4'
     XROAD_DRIVING_LICENSE_V5_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v5'
-    XROAD_ENERGY_FUNDS_PATH: 'IS-DEV/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1'
-    XROAD_FINANCES_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeIsland'
+    XROAD_ENERGY_FUNDS_PATH: 'IS-TEST/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1'
+    XROAD_FINANCES_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeIsland'
     XROAD_FINANCES_TIMEOUT: '20000'
-    XROAD_FINANCES_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeServicesFJS_v2'
+    XROAD_FINANCES_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeServicesFJS_v2'
     XROAD_FINANCIAL_AID_BACKEND_PATH: 'IS-TEST/MUN/5502694739/samband-sveitarfelaga/financial-aid-backend'
     XROAD_FIREARM_LICENSE_PATH: 'IS/GOV/5309672079/Logreglan-Protected/island-api-v1'
-    XROAD_HEALTH_DIRECTORATE_PATH: 'IS-DEV/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir'
+    XROAD_HEALTH_DIRECTORATE_PATH: 'IS-TEST/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir'
     XROAD_HEALTH_INSURANCE_ID: 'IS-TEST/GOV/4804080550/SJUKRA-Protected'
     XROAD_HEALTH_INSURANCE_MY_PAGES_PATH: 'IS-TEST/GOV/4804080550/SJUKRA-Protected/minarsidur'
     XROAD_HEALTH_INSURANCE_WSDLURL: 'https://test-huld.sjukra.is/islandrg?wsdl'
     XROAD_HMS_HOUSING_BENEFITS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/husbot-v1'
     XROAD_HMS_LOANS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/libra-v1'
-    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1'
+    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1'
     XROAD_HOUSING_BENEFIT_CALCULATOR_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/calc-v1'
-    XROAD_HUNTING_LICENSE_PATH: 'IS-DEV/GOV/10009/Umhverfisstofnun-Protected/api'
-    XROAD_ICELANDIC_GOVERNMENT_INSTITUTION_VACANCIES_PATH: 'IS-DEV/GOV/10021/FJS-Protected/recruitment-v1'
-    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1'
+    XROAD_HUNTING_LICENSE_PATH: 'IS-TEST/GOV/10009/Umhverfisstofnun-Protected/api'
+    XROAD_ICELANDIC_GOVERNMENT_INSTITUTION_VACANCIES_PATH: 'IS-TEST/GOV/10021/FJS-Protected/recruitment-v1'
+    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1'
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
     XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS-TEST/GOV/6501912189/WebAPI-Public/HUG-webAPI/'
-    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-api'
+    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-api'
     XROAD_MMS_GRADE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/grade-api-v1'
     XROAD_MMS_LICENSE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/license-api-v1'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
     XROAD_NATIONAL_REGISTRY_TIMEOUT: '20000'
-    XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application'
-    XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal'
+    XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal-application'
+    XROAD_OFFICIAL_JOURNAL_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal'
     XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1'
     XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/'
     XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:'
     XROAD_PAYMENT_PROVIDER_ID: 'IS-TEST/GOV/10021/FJS-DEV-Public'
-    XROAD_PAYMENT_SCHEDULE_PATH: 'IS-DEV/GOV/10021/FJS-Public/paymentSchedule_v1'
+    XROAD_PAYMENT_SCHEDULE_PATH: 'IS-TEST/GOV/10021/FJS-Public/paymentSchedule_v1'
     XROAD_PROPERTIES_SERVICE_V2_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/Fasteignir-v1'
     XROAD_PROPERTIES_TIMEOUT: '35000'
     XROAD_RSK_PROCURING_PATH: 'IS-TEST/GOV/5402696029/Skatturinn/relationships-v1'
     XROAD_RSK_PROCURING_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     XROAD_RSK_PROCURING_SCOPE: '["@rsk.is/prokura","@rsk.is/prokura:admin"]'
-    XROAD_SHIP_REGISTRY_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/skipaskra-V1'
+    XROAD_SHIP_REGISTRY_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/skipaskra-V1'
     XROAD_SIGNATURE_COLLECTION_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Medmaeli-v1'
     XROAD_TJODSKRA_API_PATH: '/SKRA-Protected/Einstaklingar-v1'
     XROAD_TJODSKRA_MEMBER_CODE: '6503760649'
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
     XROAD_TR_PATH: 'IS-TEST/GOV/5012130120/TR-Protected/external-v1'
-    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-DEV/EDU/10054/UNAK-Protected/brautskraning-v1'
-    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10010/HI-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-TEST/EDU/10054/UNAK-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10010/HI-Protected/brautskraning-v1'
     XROAD_VEHICLES_MILEAGE_PATH: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Mileagereading-V1'
     XROAD_VEHICLES_PATH: 'IS/GOV/5405131040/Samgongustofa-Protected/Mitt-Svaedi-V1'
-    XROAD_VEHICLE_CODETABLES_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1'
-    XROAD_VEHICLE_INFOLOCKS_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1'
-    XROAD_VEHICLE_OPERATORS_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3'
-    XROAD_VEHICLE_OWNER_CHANGE_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2'
-    XROAD_VEHICLE_PLATE_ORDERING_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1'
-    XROAD_VEHICLE_PLATE_RENEWAL_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1'
-    XROAD_VEHICLE_PRINTING_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1'
-    XROAD_VEHICLE_SERVICE_FJS_V1_PATH: 'IS-DEV/GOV/10021/FJS-Public/VehicleServiceFJS_v1'
+    XROAD_VEHICLE_CODETABLES_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1'
+    XROAD_VEHICLE_INFOLOCKS_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1'
+    XROAD_VEHICLE_OPERATORS_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3'
+    XROAD_VEHICLE_OWNER_CHANGE_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2'
+    XROAD_VEHICLE_PLATE_ORDERING_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1'
+    XROAD_VEHICLE_PLATE_RENEWAL_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1'
+    XROAD_VEHICLE_PRINTING_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1'
+    XROAD_VEHICLE_SERVICE_FJS_V1_PATH: 'IS-TEST/GOV/10021/FJS-Public/VehicleServiceFJS_v1'
     XROAD_VMST_API_PATH: '/VMST-ParentalLeave-Protected/ParentalLeaveApplication-v1'
     XROAD_VMST_MEMBER_CODE: '7005942039'
     XROAD_WORK_MACHINE_LICENSE_PATH: 'IS-TEST/GOV/4201810439/Vinnueftirlitid-Protected/vinnuvelar-token'
@@ -610,46 +610,46 @@ application-system-api:
     SERVICE_DOCUMENTS_BASEPATH: 'http://web-services-documents.services-documents.svc.cluster.local'
     SERVICE_USER_PROFILE_URL: 'http://web-service-portal-api.service-portal.svc.cluster.local'
     UNIVERSITY_GATEWAY_API_URL: 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local'
-    WORKPOINT_ARBORG_SERVICE_PATH: 'IS-DEV/MUN/10036/Arborg-Protected/tengill-application-v1'
-    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1'
-    XROAD_ALTHINGI_OMBUDSMAN_SERVICE_PATH: 'IS-DEV/GOV/10047/UA-Protected/kvortun-v1/'
+    WORKPOINT_ARBORG_SERVICE_PATH: 'IS-TEST/MUN/10036/Arborg-Protected/tengill-application-v1'
+    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10056/LBHI-Protected/brautskraning-v1'
+    XROAD_ALTHINGI_OMBUDSMAN_SERVICE_PATH: 'IS-TEST/GOV/10047/UA-Protected/kvortun-v1/'
     XROAD_BASE_PATH: 'http://securityserver.staging01.devland.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-DEV/EDU/10057/Bifrost-Protected/brautskraning-v1'
-    XROAD_CHARGE_FJS_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2'
+    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-TEST/EDU/10057/Bifrost-Protected/brautskraning-v1'
+    XROAD_CHARGE_FJS_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2'
     XROAD_CHARGE_FJS_V2_TIMEOUT: '20000'
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
-    XROAD_COURT_BANKRUPTCY_CERT_PATH: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1'
+    XROAD_COURT_BANKRUPTCY_CERT_PATH: 'IS-TEST/GOV/10019/Domstolasyslan/JusticePortal-v1'
     XROAD_CRIMINAL_RECORD_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Sakaskra-v1'
-    XROAD_DIGITAL_TACHOGRAPH_DRIVERS_CARD_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Okuritar-V1'
-    XROAD_DIRECTORATE_OF_IMMIGRATION_PATH: 'IS-DEV/GOV/10011/UTL-Protected/Utl-Umsokn-v1'
+    XROAD_DIGITAL_TACHOGRAPH_DRIVERS_CARD_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Okuritar-V1'
+    XROAD_DIRECTORATE_OF_IMMIGRATION_PATH: 'IS-TEST/GOV/10011/UTL-Protected/Utl-Umsokn-v1'
     XROAD_DRIVING_LICENSE_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/RafraentOkuskirteini-v1'
     XROAD_DRIVING_LICENSE_V2_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/RafraentOkuskirteini-v2'
     XROAD_DRIVING_LICENSE_V4_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v4'
     XROAD_DRIVING_LICENSE_V5_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v5'
-    XROAD_ENERGY_FUNDS_PATH: 'IS-DEV/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1'
-    XROAD_FINANCES_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeIsland'
-    XROAD_FINANCES_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeServicesFJS_v2'
+    XROAD_ENERGY_FUNDS_PATH: 'IS-TEST/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1'
+    XROAD_FINANCES_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeIsland'
+    XROAD_FINANCES_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeServicesFJS_v2'
     XROAD_FINANCIAL_AID_BACKEND_PATH: 'IS-TEST/MUN/5502694739/samband-sveitarfelaga/financial-aid-backend'
-    XROAD_HEALTH_DIRECTORATE_PATH: 'IS-DEV/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir'
+    XROAD_HEALTH_DIRECTORATE_PATH: 'IS-TEST/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir'
     XROAD_HEALTH_INSURANCE_ID: 'IS-TEST/GOV/4804080550/SJUKRA-Protected'
     XROAD_HEALTH_INSURANCE_MY_PAGES_PATH: 'IS-TEST/GOV/4804080550/SJUKRA-Protected/minarsidur'
     XROAD_HEALTH_INSURANCE_WSDLURL: 'https://test-huld.sjukra.is/islandrg?wsdl'
     XROAD_HMS_HOUSING_BENEFITS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/husbot-v1'
     XROAD_HMS_LOANS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/libra-v1'
-    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1'
-    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1'
+    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1'
+    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1'
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
-    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-api'
+    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-api'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
-    XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application'
-    XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal'
+    XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal-application'
+    XROAD_OFFICIAL_JOURNAL_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal'
     XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1'
     XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/'
     XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:'
     XROAD_PAYMENT_PROVIDER_ID: 'IS-TEST/GOV/10021/FJS-DEV-Public'
-    XROAD_PAYMENT_SCHEDULE_PATH: 'IS-DEV/GOV/10021/FJS-Public/paymentSchedule_v1'
+    XROAD_PAYMENT_SCHEDULE_PATH: 'IS-TEST/GOV/10021/FJS-Public/paymentSchedule_v1'
     XROAD_PROPERTIES_SERVICE_V2_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/Fasteignir-v1'
     XROAD_SIGNATURE_COLLECTION_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Medmaeli-v1'
     XROAD_TJODSKRA_API_PATH: '/SKRA-Protected/Einstaklingar-v1'
@@ -657,18 +657,18 @@ application-system-api:
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
     XROAD_TR_PATH: 'IS-TEST/GOV/5012130120/TR-Protected/external-v1'
-    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-DEV/EDU/10054/UNAK-Protected/brautskraning-v1'
-    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10010/HI-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-TEST/EDU/10054/UNAK-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10010/HI-Protected/brautskraning-v1'
     XROAD_VEHICLES_MILEAGE_PATH: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Mileagereading-V1'
     XROAD_VEHICLES_PATH: 'IS/GOV/5405131040/Samgongustofa-Protected/Mitt-Svaedi-V1'
-    XROAD_VEHICLE_CODETABLES_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1'
-    XROAD_VEHICLE_INFOLOCKS_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1'
-    XROAD_VEHICLE_OPERATORS_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3'
-    XROAD_VEHICLE_OWNER_CHANGE_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2'
-    XROAD_VEHICLE_PLATE_ORDERING_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1'
-    XROAD_VEHICLE_PLATE_RENEWAL_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1'
-    XROAD_VEHICLE_PRINTING_PATH: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1'
-    XROAD_VEHICLE_SERVICE_FJS_V1_PATH: 'IS-DEV/GOV/10021/FJS-Public/VehicleServiceFJS_v1'
+    XROAD_VEHICLE_CODETABLES_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1'
+    XROAD_VEHICLE_INFOLOCKS_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1'
+    XROAD_VEHICLE_OPERATORS_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3'
+    XROAD_VEHICLE_OWNER_CHANGE_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2'
+    XROAD_VEHICLE_PLATE_ORDERING_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1'
+    XROAD_VEHICLE_PLATE_RENEWAL_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1'
+    XROAD_VEHICLE_PRINTING_PATH: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1'
+    XROAD_VEHICLE_SERVICE_FJS_V1_PATH: 'IS-TEST/GOV/10021/FJS-Public/VehicleServiceFJS_v1'
     XROAD_VMST_API_PATH: '/VMST-ParentalLeave-Protected/ParentalLeaveApplication-v1'
     XROAD_VMST_MEMBER_CODE: '7005942039'
     XROAD_WORK_MACHINE_LICENSE_PATH: 'IS-TEST/GOV/4201810439/Vinnueftirlitid-Protected/vinnuvelar-token'
@@ -829,7 +829,7 @@ application-system-api-worker:
     SERVERSIDE_FEATURES_ON: ''
     XROAD_BASE_PATH: 'http://securityserver.staging01.devland.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_CHARGE_FJS_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2'
+    XROAD_CHARGE_FJS_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2'
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
     XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/'
@@ -1050,28 +1050,28 @@ download-service:
     NODE_OPTIONS: '--max-old-space-size=460 -r dd-trace/init'
     REGULATIONS_ADMIN_URL: 'http://web-regulations-admin-backend.regulations-admin.svc.cluster.local'
     SERVERSIDE_FEATURES_ON: ''
-    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1'
+    XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10056/LBHI-Protected/brautskraning-v1'
     XROAD_BASE_PATH: 'http://securityserver.staging01.devland.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-DEV/EDU/10057/Bifrost-Protected/brautskraning-v1'
+    XROAD_BIFROST_UNIVERSITY_PATH: 'IS-TEST/EDU/10057/Bifrost-Protected/brautskraning-v1'
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
-    XROAD_DISTRICT_COMMISSIONERS_LICENSES_PATH: 'IS-DEV/GOV/10016/Syslumenn-Protected/RettindiIslandis'
-    XROAD_DISTRICT_COMMISSIONERS_P_CARD_PATH: 'IS-DEV/GOV/10016/Syslumenn-Protected/IslandMinarSidur'
-    XROAD_FINANCES_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeIsland'
-    XROAD_FINANCES_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/financeServicesFJS_v2'
+    XROAD_DISTRICT_COMMISSIONERS_LICENSES_PATH: 'IS-TEST/GOV/10016/Syslumenn-Protected/RettindiIslandis'
+    XROAD_DISTRICT_COMMISSIONERS_P_CARD_PATH: 'IS-TEST/GOV/10016/Syslumenn-Protected/IslandMinarSidur'
+    XROAD_FINANCES_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeIsland'
+    XROAD_FINANCES_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/financeServicesFJS_v2'
     XROAD_HEALTH_INSURANCE_ID: 'IS-TEST/GOV/4804080550/SJUKRA-Protected'
     XROAD_HEALTH_INSURANCE_MY_PAGES_PATH: 'IS-TEST/GOV/4804080550/SJUKRA-Protected/minarsidur'
     XROAD_HEALTH_INSURANCE_WSDLURL: 'https://test-huld.sjukra.is/islandrg?wsdl'
     XROAD_HMS_HOUSING_BENEFITS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/husbot-v1'
     XROAD_HMS_LOANS_PATH: 'IS-TEST/GOV/5812191480/HMS-Protected/libra-v1'
-    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1'
-    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1'
+    XROAD_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1'
+    XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1'
     XROAD_MMS_GRADE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/grade-api-v1'
     XROAD_MMS_LICENSE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/license-api-v1'
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-DEV/EDU/10054/UNAK-Protected/brautskraning-v1'
-    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10010/HI-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-TEST/EDU/10054/UNAK-Protected/brautskraning-v1'
+    XROAD_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10010/HI-Protected/brautskraning-v1'
     XROAD_VEHICLES_PATH: 'IS/GOV/5405131040/Samgongustofa-Protected/Mitt-Svaedi-V1'
     XROAD_WORK_MACHINE_LICENSE_PATH: 'IS-TEST/GOV/4201810439/Vinnueftirlitid-Protected/vinnuvelar-token'
   grantNamespaces:
@@ -1156,6 +1156,7 @@ endorsement-system-api:
     EMAIL_FROM_ADDRESS: 'development@island.is'
     EMAIL_FROM_NAME: 'devland.is'
     EMAIL_REGION: 'eu-west-1'
+    ENDORSEMENT_SYSTEM_EXPORTS_BUCKET_NAME: 'island-is-staging-exports-endorsement-system'
     IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/endorsement'
     IDENTITY_SERVER_ISSUER_URL: 'https://identity-server.staging01.devland.is'
     LOG_LEVEL: 'info'
@@ -1427,7 +1428,7 @@ license-api:
     XROAD_DRIVING_LICENSE_V4_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v4'
     XROAD_DRIVING_LICENSE_V5_PATH: 'r1/IS/GOV/5309672079/Logreglan-Protected/Okuskirteini-v5'
     XROAD_FIREARM_LICENSE_PATH: 'IS/GOV/5309672079/Logreglan-Protected/island-api-v1'
-    XROAD_HUNTING_LICENSE_PATH: 'IS-DEV/GOV/10009/Umhverfisstofnun-Protected/api'
+    XROAD_HUNTING_LICENSE_PATH: 'IS-TEST/GOV/10009/Umhverfisstofnun-Protected/api'
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
   grantNamespaces:
@@ -2337,13 +2338,13 @@ services-university-gateway:
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_UNIVERSITY_GATEWAY_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_BIFROST_UNIVERSITY_PATH: 'IS-DEV/EDU/10057/Bifrost-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10056/LBHI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_BIFROST_UNIVERSITY_PATH: 'IS-TEST/EDU/10057/Bifrost-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/umsoknir-v1'
     XROAD_UNIVERSITY_GATEWAY_REYKJAVIK_UNIVERSITY_PATH: 'IS-TEST/EDU/5101054190/RvkUni-Hvin-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-DEV/EDU/10054/UNAK-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10010/HI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-TEST/EDU/10054/UNAK-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10010/HI-Protected/umsoknir-v1'
   grantNamespaces:
     - 'islandis'
     - 'nginx-ingress-internal'
@@ -2466,13 +2467,13 @@ services-university-gateway-worker:
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
     XROAD_TLS_BASE_PATH: 'https://securityserver.staging01.devland.is'
     XROAD_TLS_BASE_PATH_WITH_ENV: 'https://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_UNIVERSITY_GATEWAY_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_BIFROST_UNIVERSITY_PATH: 'IS-DEV/EDU/10057/Bifrost-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10056/LBHI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_BIFROST_UNIVERSITY_PATH: 'IS-TEST/EDU/10057/Bifrost-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/umsoknir-v1'
     XROAD_UNIVERSITY_GATEWAY_REYKJAVIK_UNIVERSITY_PATH: 'IS-TEST/EDU/5101054190/RvkUni-Hvin-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-DEV/EDU/10054/UNAK-Protected/umsoknir-v1'
-    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10010/HI-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_AKUREYRI_PATH: 'IS-TEST/EDU/10054/UNAK-Protected/umsoknir-v1'
+    XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_ICELAND_PATH: 'IS-TEST/EDU/10010/HI-Protected/umsoknir-v1'
   grantNamespaces:
     - 'islandis'
     - 'nginx-ingress-internal'
@@ -2700,6 +2701,8 @@ user-notification:
   env:
     AUTH_DELEGATION_API_URL: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS-TEST/GOV/5402696029/Skatturinn/ft-v1'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
     DB_REPLICAS_HOST: 'postgres-applications.internal'
@@ -2895,6 +2898,8 @@ user-notification-worker:
   env:
     AUTH_DELEGATION_API_URL: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local'
     AUTH_DELEGATION_MACHINE_CLIENT_SCOPE: '["@island.is/auth/delegations/index:system"]'
+    COMPANY_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
+    COMPANY_REGISTRY_XROAD_PROVIDER_ID: 'IS-TEST/GOV/5402696029/Skatturinn/ft-v1'
     CONTENTFUL_HOST: 'cdn.contentful.com'
     DB_HOST: 'postgres-applications.internal'
     DB_NAME: 'user_notification'
diff --git a/infra/package.json b/infra/package.json
index 1342647c11bc..db86f28487b8 100644
--- a/infra/package.json
+++ b/infra/package.json
@@ -31,7 +31,7 @@
     "glob": "10.3.3",
     "js-yaml": "4.0.0",
     "lodash": "4.17.21",
-    "yargs": "17.2.1"
+    "yargs": "17.7.2"
   },
   "volta": {
     "node": "18.12.1"
diff --git a/infra/src/dsl/xroad.ts b/infra/src/dsl/xroad.ts
index 6bc6fc0750ac..a61c0e718b27 100644
--- a/infra/src/dsl/xroad.ts
+++ b/infra/src/dsl/xroad.ts
@@ -194,12 +194,12 @@ export const Finance = new XroadConf({
   env: {
     XROAD_FINANCES_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/financeIsland',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/financeIsland',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/financeIsland',
       prod: 'IS/GOV/5402697509/FJS-Public/financeIsland',
     },
     XROAD_FINANCES_V2_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/financeServicesFJS_v2',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/financeServicesFJS_v2',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/financeServicesFJS_v2',
       prod: 'IS/GOV/5402697509/FJS-Public/financeServicesFJS_v2',
     },
     XROAD_HMS_LOANS_PATH: {
@@ -255,7 +255,7 @@ export const JudicialAdministration = new XroadConf({
   env: {
     XROAD_COURT_BANKRUPTCY_CERT_PATH: {
       dev: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1',
-      staging: 'IS-DEV/GOV/10019/Domstolasyslan/JusticePortal-v1',
+      staging: 'IS-TEST/GOV/10019/Domstolasyslan/JusticePortal-v1',
       prod: 'IS/GOV/4707171140/Domstolasyslan/JusticePortal-v1',
     },
   },
@@ -269,7 +269,7 @@ export const OccupationalLicenses = new XroadConf({
   env: {
     XROAD_HEALTH_DIRECTORATE_PATH: {
       dev: 'IS-DEV/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir',
-      staging: 'IS-DEV/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir',
+      staging: 'IS-TEST/GOV/10015/EmbaettiLandlaeknis-Protected/landlaeknir',
       prod: 'IS/GOV/7101695009/EmbaettiLandlaeknis-Protected/landlaeknir',
     },
   },
@@ -279,7 +279,7 @@ export const DistrictCommissionersPCard = new XroadConf({
   env: {
     XROAD_DISTRICT_COMMISSIONERS_P_CARD_PATH: {
       dev: 'IS-DEV/GOV/10016/Syslumenn-Protected/IslandMinarSidur',
-      staging: 'IS-DEV/GOV/10016/Syslumenn-Protected/IslandMinarSidur',
+      staging: 'IS-TEST/GOV/10016/Syslumenn-Protected/IslandMinarSidur',
       prod: 'IS/GOV/5512201410/Syslumenn-Protected/IslandMinarSidur',
     },
   },
@@ -288,7 +288,7 @@ export const DistrictCommissionersLicenses = new XroadConf({
   env: {
     XROAD_DISTRICT_COMMISSIONERS_LICENSES_PATH: {
       dev: 'IS-DEV/GOV/10016/Syslumenn-Protected/RettindiIslandis',
-      staging: 'IS-DEV/GOV/10016/Syslumenn-Protected/RettindiIslandis',
+      staging: 'IS-TEST/GOV/10016/Syslumenn-Protected/RettindiIslandis',
       prod: 'IS/GOV/5512201410/Syslumenn-Protected/RettindiIslandis',
     },
   },
@@ -308,7 +308,7 @@ export const Hunting = new XroadConf({
   env: {
     XROAD_HUNTING_LICENSE_PATH: {
       dev: 'IS-DEV/GOV/10009/Umhverfisstofnun-Protected/api',
-      staging: 'IS-DEV/GOV/10009/Umhverfisstofnun-Protected/api',
+      staging: 'IS-TEST/GOV/10009/Umhverfisstofnun-Protected/api',
       prod: 'IS/GOV/7010022880/Umhverfisstofnun-Protected/api',
     },
   },
@@ -338,32 +338,32 @@ export const UniversityCareers = new XroadConf({
   env: {
     XROAD_UNIVERSITY_OF_AKUREYRI_PATH: {
       dev: 'IS-DEV/EDU/10054/UNAK-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10054/UNAK-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10054/UNAK-Protected/brautskraning-v1',
       prod: 'IS/EDU/5206871229/UNAK-Protected/brautskraning-v1',
     },
     XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: {
       dev: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10056/LBHI-Protected/brautskraning-v1',
       prod: 'IS/EDU/4112043590/LBHI-Protected/brautskraning-v1',
     },
     XROAD_BIFROST_UNIVERSITY_PATH: {
       dev: 'IS-DEV/EDU/10057/Bifrost-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10057/Bifrost-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10057/Bifrost-Protected/brautskraning-v1',
       prod: 'IS/EDU/5502690239/Bifrost-Protected/brautskraning-v1',
     },
     XROAD_HOLAR_UNIVERSITY_PATH: {
       dev: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1',
       prod: 'IS/EDU/5001694359/Holar-Protected/brautskraning-v1',
     },
     XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: {
       dev: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1',
       prod: 'IS/EDU/4210984099/LHI-Protected/brautskraning-v1',
     },
     XROAD_UNIVERSITY_OF_ICELAND_PATH: {
       dev: 'IS-DEV/EDU/10010/HI-Protected/brautskraning-v1',
-      staging: 'IS-DEV/EDU/10010/HI-Protected/brautskraning-v1',
+      staging: 'IS-TEST/EDU/10010/HI-Protected/brautskraning-v1',
       prod: 'IS/EDU/6001692039/HI-Protected/brautskraning-v1',
     },
   },
@@ -458,7 +458,7 @@ export const NationalRegistryAuthB2C = new XroadConf({
     },
     NATIONAL_REGISTRY_B2C_PATH: {
       dev: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Midlun-v1',
-      staging: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Midlun-v1',
+      staging: 'IS-TEST/GOV/10001/SKRA-Cloud-Protected/Midlun-v1',
       prod: 'IS/GOV/6503760649/SKRA-Cloud-Protected/Midlun-v1',
     },
   },
@@ -506,7 +506,7 @@ export const PaymentSchedule = new XroadConf({
   env: {
     XROAD_PAYMENT_SCHEDULE_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/paymentSchedule_v1',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/paymentSchedule_v1',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/paymentSchedule_v1',
       prod: 'IS/GOV/5402697509/FJS-Public/paymentSchedule_v1',
     },
   },
@@ -634,7 +634,7 @@ export const ChargeFjsV2 = new XroadConf({
   env: {
     XROAD_CHARGE_FJS_V2_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
       prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
     },
   },
@@ -644,7 +644,7 @@ export const EnergyFunds = new XroadConf({
   env: {
     XROAD_ENERGY_FUNDS_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/ElectricCarSubSidyService_v1',
       prod: 'IS/GOV/5402697509/FJS-Public/ElectricCarSubSidyService_v1',
     },
   },
@@ -654,7 +654,7 @@ export const VehicleServiceFjsV1 = new XroadConf({
   env: {
     XROAD_VEHICLE_SERVICE_FJS_V1_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Public/VehicleServiceFJS_v1',
-      staging: 'IS-DEV/GOV/10021/FJS-Public/VehicleServiceFJS_v1',
+      staging: 'IS-TEST/GOV/10021/FJS-Public/VehicleServiceFJS_v1',
       prod: 'IS/GOV/5402697509/FJS-Public/VehicleServiceFJS_v1',
     },
   },
@@ -664,45 +664,46 @@ export const TransportAuthority = new XroadConf({
   env: {
     XROAD_VEHICLE_CODETABLES_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1',
+      staging:
+        'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Codetables-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Codetables-V1',
     },
     XROAD_VEHICLE_INFOLOCKS_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Infolocks-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Infolocks-V1',
     },
     XROAD_VEHICLE_OPERATORS_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Operators-V3',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Operators-V3',
     },
     XROAD_VEHICLE_OWNER_CHANGE_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2',
       staging:
-        'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2',
+        'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Ownerchange-V2',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Ownerchange-V2',
     },
     XROAD_VEHICLE_PLATE_ORDERING_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1',
       staging:
-        'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1',
+        'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOrdering-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-PlateOrdering-V1',
     },
     XROAD_VEHICLE_PLATE_RENEWAL_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1',
       staging:
-        'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1',
+        'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-PlateOwnership-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-PlateOwnership-V1',
     },
     XROAD_VEHICLE_PRINTING_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Vehicle-Printing-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Vehicle-Printing-V1',
     },
     XROAD_DIGITAL_TACHOGRAPH_DRIVERS_CARD_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Okuritar-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Okuritar-V1',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Okuritar-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Okuritar-V1',
     },
   },
@@ -712,7 +713,7 @@ export const IcelandicGovernmentInstitutionVacancies = new XroadConf({
   env: {
     XROAD_ICELANDIC_GOVERNMENT_INSTITUTION_VACANCIES_PATH: {
       dev: 'IS-DEV/GOV/10021/FJS-Protected/recruitment-v1',
-      staging: 'IS-DEV/GOV/10021/FJS-Protected/recruitment-v1',
+      staging: 'IS-TEST/GOV/10021/FJS-Protected/recruitment-v1',
       prod: 'IS/GOV/5402697509/FJS-Protected/recruitment-v1',
     },
   },
@@ -728,7 +729,7 @@ export const AircraftRegistry = new XroadConf({
   env: {
     XROAD_AIRCRAFT_REGISTRY_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Loftfaraskra-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/Loftfaraskra-V1',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/Loftfaraskra-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/Loftfaraskra-V1',
     },
   },
@@ -754,7 +755,7 @@ export const ShipRegistry = new XroadConf({
   env: {
     XROAD_SHIP_REGISTRY_PATH: {
       dev: 'IS-DEV/GOV/10017/Samgongustofa-Protected/skipaskra-V1',
-      staging: 'IS-DEV/GOV/10017/Samgongustofa-Protected/skipaskra-V1',
+      staging: 'IS-TEST/GOV/10017/Samgongustofa-Protected/skipaskra-V1',
       prod: 'IS/GOV/5405131040/Samgongustofa-Protected/skipaskra-V1',
     },
   },
@@ -764,7 +765,7 @@ export const DirectorateOfImmigration = new XroadConf({
   env: {
     XROAD_DIRECTORATE_OF_IMMIGRATION_PATH: {
       dev: 'IS-DEV/GOV/10011/UTL-Protected/Utl-Umsokn-v1',
-      staging: 'IS-DEV/GOV/10011/UTL-Protected/Utl-Umsokn-v1',
+      staging: 'IS-TEST/GOV/10011/UTL-Protected/Utl-Umsokn-v1',
       prod: 'IS/GOV/6702696399/UTL-Protected/Utl-Umsokn-v1',
     },
   },
@@ -774,7 +775,7 @@ export const UniversityGatewayUniversityOfIceland = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_ICELAND_PATH: {
       dev: 'IS-DEV/EDU/10010/HI-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10010/HI-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10010/HI-Protected/umsoknir-v1',
       prod: 'IS/EDU/6001692039/HI-Protected/umsoknir-v1',
     },
   },
@@ -784,7 +785,7 @@ export const UniversityGatewayUniversityOfAkureyri = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_UNIVERSITY_OF_AKUREYRI_PATH: {
       dev: 'IS-DEV/EDU/10054/UNAK-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10054/UNAK-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10054/UNAK-Protected/umsoknir-v1',
       prod: 'IS/EDU/5206871229/UNAK-Protected/umsoknir-v1',
     },
   },
@@ -794,7 +795,7 @@ export const UniversityGatewayBifrostUniversity = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_BIFROST_UNIVERSITY_PATH: {
       dev: 'IS-DEV/EDU/10057/Bifrost-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10057/Bifrost-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10057/Bifrost-Protected/umsoknir-v1',
       prod: 'IS/EDU/5502690239/Bifrost-Protected/umsoknir-v1',
     },
   },
@@ -804,7 +805,7 @@ export const UniversityGatewayIcelandUniversityOfTheArts = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: {
       dev: 'IS-DEV/EDU/10049/LHI-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10049/LHI-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10049/LHI-Protected/umsoknir-v1',
       prod: 'IS/EDU/4210984099/LHI-Protected/umsoknir-v1',
     },
   },
@@ -814,7 +815,7 @@ export const UniversityGatewayAgriculturalUniversityOfIceland = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: {
       dev: 'IS-DEV/EDU/10056/LBHI-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10056/LBHI-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10056/LBHI-Protected/umsoknir-v1',
       prod: 'IS/EDU/4112043590/LBHI-Protected/umsoknir-v1',
     },
   },
@@ -824,7 +825,7 @@ export const UniversityGatewayHolarUniversity = new XroadConf({
   env: {
     XROAD_UNIVERSITY_GATEWAY_HOLAR_UNIVERSITY_PATH: {
       dev: 'IS-DEV/EDU/10055/Holar-Protected/umsoknir-v1',
-      staging: 'IS-DEV/EDU/10055/Holar-Protected/umsoknir-v1',
+      staging: 'IS-TEST/EDU/10055/Holar-Protected/umsoknir-v1',
       prod: 'IS/EDU/5001694359/Holar-Protected/umsoknir-v1',
     },
   },
@@ -854,7 +855,7 @@ export const ArborgWorkpoint = new XroadConf({
   env: {
     WORKPOINT_ARBORG_SERVICE_PATH: {
       dev: 'IS-DEV/MUN/10036/Arborg-Protected/tengill-application-v1',
-      staging: 'IS-DEV/MUN/10036/Arborg-Protected/tengill-application-v1',
+      staging: 'IS-TEST/MUN/10036/Arborg-Protected/tengill-application-v1',
       prod: 'IS/MUN/10036/Arborg-Protected/tengill-application-v1',
     },
   },
@@ -864,7 +865,7 @@ export const OfficialJournalOfIceland = new XroadConf({
   env: {
     XROAD_OFFICIAL_JOURNAL_PATH: {
       dev: 'IS-DEV/GOV/10014/DMR-Protected/official-journal',
-      staging: 'IS-DEV/GOV/10014/DMR-Protected/official-journal',
+      staging: 'IS-TEST/GOV/10014/DMR-Protected/official-journal',
       prod: 'IS/GOV/10014/DMR-Protected/official-journal',
     },
   },
@@ -874,7 +875,7 @@ export const OfficialJournalOfIcelandApplication = new XroadConf({
   env: {
     XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: {
       dev: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application',
-      staging: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application',
+      staging: 'IS-TEST/GOV/10014/DMR-Protected/official-journal-application',
       prod: 'IS/GOV/10014/DMR-Protected/official-journal-application',
     },
   },
@@ -884,7 +885,7 @@ export const Frigg = new XroadConf({
   env: {
     XROAD_MMS_FRIGG_PATH: {
       dev: 'IS-DEV/GOV/10066/MMS-Protected/frigg-api',
-      staging: 'IS-DEV/GOV/10066/MMS-Protected/frigg-api',
+      staging: 'IS-TEST/GOV/10066/MMS-Protected/frigg-api',
       prod: 'IS/GOV/10066/MMS-Protected/frigg-api',
     },
   },
diff --git a/infra/src/feature-env.ts b/infra/src/feature-env.ts
index c6e3a79f2826..8f5dfaff157a 100644
--- a/infra/src/feature-env.ts
+++ b/infra/src/feature-env.ts
@@ -1,5 +1,6 @@
 import yargs from 'yargs'
 import AWS from 'aws-sdk'
+import { Kubernetes } from './dsl/kubernetes-runtime'
 import { Envs } from './environments'
 import {
   ExcludedFeatureDeploymentServices,
@@ -39,8 +40,8 @@ interface Arguments {
 const writeToOutput = async (data: string, output?: string) => {
   if (output) {
     if (output.startsWith('s3://')) {
-      const Bucket = output.substring(5).split('/')[0]
-      const Key = output.substring(5).split(/\/(.+)/)[1]
+      const Bucket = output.substr(5).split('/')[0]
+      const Key = output.substr(5).split(/\/(.+)/)[1]
       const objectParams = {
         Bucket,
         Key,
@@ -52,16 +53,14 @@ const writeToOutput = async (data: string, output?: string) => {
       }
       const s3 = new AWS.S3(config)
       try {
-        // TODO: Migrate to AWS SDK v3.
-        // `ncc` is failing when changing to v3 😓
         await s3.putObject(objectParams).promise()
-        logger.debug(`Successfully uploaded data to ${output}`)
+        console.log(`Successfully uploaded data to ${output}`)
       } catch (err) {
-        logger.debug('Error', err)
+        console.log('Error', err)
       }
     }
   } else {
-    logger.debug(data)
+    console.log(data)
   }
 }
 
diff --git a/infra/src/secrets.ts b/infra/src/secrets.ts
index e177706161d2..abdd6d2331bb 100644
--- a/infra/src/secrets.ts
+++ b/infra/src/secrets.ts
@@ -1,4 +1,4 @@
-import { SSM } from '@aws-sdk/client-ssm'
+import AWS from 'aws-sdk'
 import yargs from 'yargs'
 import { OpsEnv } from './dsl/types/input-types'
 import { Envs } from './environments'
@@ -12,6 +12,8 @@ import {
 import { renderHelmServices } from './dsl/exports/helm'
 import { logger } from './common'
 
+const { hideBin } = require('yargs/helpers')
+
 interface GetArguments {
   key: string
 }
@@ -28,14 +30,13 @@ const config = {
   region: 'eu-west-1',
 }
 
-const ssm = new SSM(config)
-yargs(process.argv.slice(2))
+const ssm = new AWS.SSM(config)
+yargs(hideBin(process.argv))
   .command(
     'get-all-required-secrets',
     'get all required secrets from all charts',
     { env: { type: 'string', demand: true, choices: OpsEnvNames } },
     async (p) => {
-      logger.info(`Listing all secrets for env:${p.env}`)
       const services = (
         await Promise.all(
           Object.entries(Charts)
@@ -44,7 +45,6 @@ yargs(process.argv.slice(2))
               chartName: chartName as ChartName,
             }))
             .flatMap(async ({ services, chartName }) => {
-              logger.info(`Getting secrets for ${chartName} in ${p.env}`)
               return Object.values(
                 (
                   await renderHelmServices(
@@ -62,23 +62,20 @@ yargs(process.argv.slice(2))
       const secrets = services.flatMap((s) => {
         return Object.values(s.secrets)
       })
-      // Actually log to stdout
-      console.log([...new Set(secrets)].join('\n'))
+      logger.debug([...new Set(secrets)].join('\n'))
     },
   )
   .command(
     'get <key>',
     'get secret',
-    {
-      key: { type: 'string', demand: true },
-    },
+    () => {},
     async ({ key }: GetArguments) => {
       const parameterInput = {
         Name: key,
         WithDecryption: true,
       }
 
-      const { Parameter } = await ssm.getParameter(parameterInput)
+      const { Parameter } = await ssm.getParameter(parameterInput).promise()
       if (Parameter) {
         if (Parameter.Value && Parameter.Value.length > 0) {
           console.log(Parameter.Value)
@@ -93,16 +90,15 @@ yargs(process.argv.slice(2))
   .command(
     'store <key> <secret>',
     'store secret',
-    {
-      key: { type: 'string', demand: true },
-      secret: { type: 'string', demand: true },
-    },
+    () => {},
     async ({ key, secret }: StoreArguments) => {
-      await ssm.putParameter({
-        Name: key,
-        Value: secret,
-        Type: 'SecureString',
-      })
+      await ssm
+        .putParameter({
+          Name: key,
+          Value: secret,
+          Type: 'SecureString',
+        })
+        .promise()
       logger.debug('Done!')
     },
   )
@@ -110,15 +106,15 @@ yargs(process.argv.slice(2))
   .command(
     'delete <prefix>',
     'delete secrets by prefix',
-    {
-      prefix: { type: 'string', demand: true },
-    },
+    () => {},
     async ({ prefix }: DeleteArguments) => {
-      const { Parameters } = await ssm.describeParameters({
-        ParameterFilters: [
-          { Key: 'Name', Option: 'BeginsWith', Values: [prefix] },
-        ],
-      })
+      const { Parameters } = await ssm
+        .describeParameters({
+          ParameterFilters: [
+            { Key: 'Name', Option: 'BeginsWith', Values: [prefix] },
+          ],
+        })
+        .promise()
       if (Parameters && Parameters.length > 0) {
         logger.debug(
           `Parameters to destroy: ${Parameters.map(({ Name }) => Name)}`,
@@ -126,7 +122,7 @@ yargs(process.argv.slice(2))
         await Promise.all(
           Parameters.map(({ Name }) =>
             Name
-              ? ssm.deleteParameter({ Name })
+              ? ssm.deleteParameter({ Name }).promise()
               : new Promise((resolve) => resolve(true)),
           ),
         )
diff --git a/infra/yarn.lock b/infra/yarn.lock
index 5f27b58473e3..c97ff807bf19 100644
--- a/infra/yarn.lock
+++ b/infra/yarn.lock
@@ -6544,7 +6544,7 @@ __metadata:
     js-yaml: 4.0.0
     lodash: 4.17.21
     typescript: 4.6.4
-    yargs: 17.2.1
+    yargs: 17.7.2
   languageName: unknown
   linkType: soft
 
@@ -10481,18 +10481,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:17.2.1":
-  version: 17.2.1
-  resolution: "yargs@npm:17.2.1"
+"yargs@npm:17.7.2, yargs@npm:^17.6.2":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
   dependencies:
-    cliui: ^7.0.2
+    cliui: ^8.0.1
     escalade: ^3.1.1
     get-caller-file: ^2.0.5
     require-directory: ^2.1.1
-    string-width: ^4.2.0
+    string-width: ^4.2.3
     y18n: ^5.0.5
-    yargs-parser: ^20.2.2
-  checksum: 451aac46f82da776f436018feed0244bc0e7b4355f7e397bcb53d34c691b177c0d71db3dda9653760e1bc240254d8b763a252ff918ef9e235a8d202e2909c4eb
+    yargs-parser: ^21.1.1
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
   languageName: node
   linkType: hard
 
@@ -10511,21 +10511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.6.2":
-  version: 17.7.2
-  resolution: "yargs@npm:17.7.2"
-  dependencies:
-    cliui: ^8.0.1
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.1.1
-  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
-  languageName: node
-  linkType: hard
-
 "yn@npm:3.1.1":
   version: 3.1.1
   resolution: "yn@npm:3.1.1"
diff --git a/libs/api-catalogue/elastic/src/lib/elastic.service.ts b/libs/api-catalogue/elastic/src/lib/elastic.service.ts
index 7a612917b524..dd1f38c89b8b 100644
--- a/libs/api-catalogue/elastic/src/lib/elastic.service.ts
+++ b/libs/api-catalogue/elastic/src/lib/elastic.service.ts
@@ -1,37 +1,38 @@
 import { Injectable } from '@nestjs/common'
 import { Client, ApiResponse } from '@elastic/elasticsearch'
+import * as AWS from 'aws-sdk'
+import AwsConnector from 'aws-elasticsearch-connector'
 import { environment } from '../environments/environments'
 import { Service } from '@island.is/api-catalogue/types'
 import { SearchResponse } from '@island.is/shared/types'
 import { searchQuery } from './queries/search.model'
 import { logger } from '@island.is/logging'
-import {
-  createAWSConnection,
-  awsGetCredentials,
-} from '@acuris/aws-es-connection'
 
 const { elastic } = environment
 
-type RequestBodyType<T = Record<string, unknown>> = T | string | Buffer
+type RequestBodyType<T = Record<string, any>> = T | string | Buffer
 
 @Injectable()
 export class ElasticService {
-  private client?: Client
+  private client: Client
   private indexName = 'apicatalogue'
 
+  constructor() {
+    this.client = this.createEsClient()
+  }
+
   /**
    * Tries to delete the index.
    * If the index does not exists it does nothing.
    */
   async deleteIndex(): Promise<void> {
     logger.info('Deleting index', this.indexName)
-    const client = await this.getClient()
 
-    const { body } = await client.indices.exists({
+    const { body } = await this.client.indices.exists({
       index: this.indexName,
     })
     if (body) {
-      await client.indices.delete({ index: this.indexName })
+      await this.client.indices.delete({ index: this.indexName })
       logger.info(`Index ${this.indexName} deleted`)
     } else {
       logger.info('No index to delete', this.indexName)
@@ -45,19 +46,18 @@ export class ElasticService {
     logger.info('Bulk insert', services)
 
     if (services.length) {
-      const bulk: (Service | { index: { _index: string; _id: string } })[] =
-        services.flatMap((service) => [
-          {
-            index: {
-              _index: this.indexName,
-              _id: service.id,
-            },
+      const bulk: Array<any> = []
+      services.forEach((service) => {
+        bulk.push({
+          index: {
+            _index: this.indexName,
+            _id: service.id,
           },
-          service,
-        ])
+        })
+        bulk.push(service)
+      })
 
-      const client = await this.getClient()
-      await client.bulk({
+      await this.client.bulk({
         body: bulk,
         index: this.indexName,
       })
@@ -103,8 +103,7 @@ export class ElasticService {
     query: RequestBody,
   ) {
     logger.debug('Searching for', query)
-    const client = await this.getClient()
-    return await client.search<ResponseBody, RequestBody>({
+    return await this.client.search<ResponseBody, RequestBody>({
       body: query,
       index: this.indexName,
     })
@@ -116,8 +115,7 @@ export class ElasticService {
     }
 
     logger.info('Deleting based on indexes', { ids })
-    const client = await this.getClient()
-    return await client.delete_by_query({
+    return await this.client.delete_by_query({
       index: this.indexName,
       body: {
         query: {
@@ -131,8 +129,7 @@ export class ElasticService {
 
   async deleteAllExcept(excludeIds: Array<string>) {
     logger.info('Deleting everything except', { excludeIds })
-    const client = await this.getClient()
-    return await client.delete_by_query({
+    return await this.client.delete_by_query({
       index: this.indexName,
       body: {
         query: {
@@ -145,23 +142,14 @@ export class ElasticService {
   }
 
   async ping() {
-    const client = await this.getClient()
-    const result = await client.ping().catch((error) => {
+    const result = await this.client.ping().catch((error) => {
       logger.error('Error in ping', error)
     })
     logger.info('Got elasticsearch ping response')
     return result
   }
 
-  private async getClient(): Promise<Client> {
-    if (this.client) {
-      return this.client
-    }
-    this.client = await this.createEsClient()
-    return this.client
-  }
-
-  private async createEsClient(): Promise<Client> {
+  private createEsClient(): Client {
     const hasAWS =
       'AWS_WEB_IDENTITY_TOKEN_FILE' in process.env ||
       'AWS_SECRET_ACCESS_KEY' in process.env
@@ -173,7 +161,7 @@ export class ElasticService {
     }
 
     return new Client({
-      ...createAWSConnection(await awsGetCredentials()),
+      ...AwsConnector(AWS.config),
       node: elastic.node,
     })
   }
diff --git a/libs/api-catalogue/elastic/src/lib/queries/search.model.ts b/libs/api-catalogue/elastic/src/lib/queries/search.model.ts
index e9513606cbdc..03153533ffba 100644
--- a/libs/api-catalogue/elastic/src/lib/queries/search.model.ts
+++ b/libs/api-catalogue/elastic/src/lib/queries/search.model.ts
@@ -57,16 +57,7 @@ export const searchQuery = ({
     })
   }
 
-  const result: {
-    query: {
-      bool: {
-        must: Array<object>
-      }
-    }
-    sort: Array<object>
-    size: number
-    search_after?: typeof searchAfter
-  } = {
+  const result: any = {
     query: {
       bool: {
         must: [
@@ -94,7 +85,7 @@ export const searchQuery = ({
   }
 
   if (searchAfter?.length) {
-    result.search_after = searchAfter
+    result['search_after'] = searchAfter
   }
 
   return result
diff --git a/libs/api/domains/application/src/lib/application.model.ts b/libs/api/domains/application/src/lib/application.model.ts
index e62e4668e89f..80ccfe2ff36a 100644
--- a/libs/api/domains/application/src/lib/application.model.ts
+++ b/libs/api/domains/application/src/lib/application.model.ts
@@ -46,6 +46,9 @@ class PendingAction {
 
   @Field(() => String, { nullable: true })
   content?: string
+
+  @Field(() => String, { nullable: true })
+  button?: string
 }
 
 @ObjectType()
@@ -76,11 +79,15 @@ class ActionCardMetaData {
 
   @Field(() => [ApplicationHistory], { nullable: true })
   history?: ApplicationHistory[]
+
   @Field(() => Number, { nullable: true })
   draftFinishedSteps?: number
 
   @Field(() => Number, { nullable: true })
   draftTotalSteps?: number
+
+  @Field(() => String, { nullable: true })
+  historyButton?: string
 }
 
 @ObjectType()
diff --git a/libs/api/domains/application/src/lib/application.service.ts b/libs/api/domains/application/src/lib/application.service.ts
index 6e5182418f3a..fbfbab4cdc08 100644
--- a/libs/api/domains/application/src/lib/application.service.ts
+++ b/libs/api/domains/application/src/lib/application.service.ts
@@ -200,7 +200,6 @@ export class ApplicationService {
   async deleteApplication(input: DeleteApplicationInput, auth: Auth) {
     return this.applicationApiWithAuth(auth).applicationControllerDelete({
       id: input.id,
-      authorization: auth.authorization,
     })
   }
 
diff --git a/libs/api/domains/education/src/index.ts b/libs/api/domains/education/src/index.ts
index 1cd8bd060753..f26cea140246 100644
--- a/libs/api/domains/education/src/index.ts
+++ b/libs/api/domains/education/src/index.ts
@@ -1 +1,2 @@
 export * from './lib/education.module'
+export * from './lib/educationV2.module'
diff --git a/libs/api/domains/education/src/lib/education.utils.ts b/libs/api/domains/education/src/lib/education.utils.ts
index 56e42a562df0..2d4ce1743baa 100644
--- a/libs/api/domains/education/src/lib/education.utils.ts
+++ b/libs/api/domains/education/src/lib/education.utils.ts
@@ -1,3 +1,5 @@
+import getYear from 'date-fns/getYear'
+
 export const getYearInterval = (dates: string[]) => {
   const sortedDates = dates
     .map((date) => new Date(date))
@@ -6,3 +8,22 @@ export const getYearInterval = (dates: string[]) => {
   const endYear = sortedDates.slice(-1)[0].getFullYear()
   return startYear === endYear ? `${startYear}` : `${startYear} - ${endYear}`
 }
+
+export const generateExamDateSpan = (
+  firstDate?: Date,
+  lastDate?: Date,
+): string | null => {
+  if (firstDate && lastDate) {
+    return `${getYear(firstDate)} - ${getYear(lastDate)}`
+  }
+
+  if (firstDate) {
+    return `${getYear(firstDate)}`
+  }
+
+  if (lastDate) {
+    return `${getYear(lastDate)}`
+  }
+
+  return null
+}
diff --git a/libs/api/domains/education/src/lib/educationMapper.ts b/libs/api/domains/education/src/lib/educationMapper.ts
new file mode 100644
index 000000000000..80998ecac3d4
--- /dev/null
+++ b/libs/api/domains/education/src/lib/educationMapper.ts
@@ -0,0 +1,58 @@
+import { StudentAssessmentsDto } from '@island.is/clients/mms/grade'
+import { generateExamDateSpan } from './education.utils'
+import { StudentCareer } from './models/studentCareer.model'
+
+export const mapCareer = (
+  data: StudentAssessmentsDto,
+  isChildOfUser?: boolean,
+): StudentCareer | undefined => {
+  const { firstAssessmentYear, lastAssessmentYear } =
+    data.assessmentsOverview.assessmentsYearSpan
+
+  return {
+    nationalId: data?.nationalId,
+    name: data?.name,
+    isChildOfUser,
+    examDateSpan:
+      generateExamDateSpan(firstAssessmentYear, lastAssessmentYear) ?? '',
+    examResults: (data?.assessmentsOverview.assessments ?? []).map((a) => ({
+      gradeLevel: a.gradeLevel,
+      coursesExamResults: a.courses.map((c) => ({
+        label: c.title,
+        totalGrade: {
+          compulsorySchoolGrade: c.gradeHistory.compulsorySchoolGrade,
+          serialGrade: c.gradeHistory.nationalCoordinationGrade,
+        },
+        competence: {
+          competencyGrade: c.competencyGrade,
+          competencyStatus: c.competencyGradeStatus,
+        },
+        gradeCategories: [
+          ...c.grades.map((g) => ({
+            label: g.title,
+            grade: {
+              compulsorySchoolGrade: {
+                grade: g.compulsorySchoolGrade.grade,
+                weight: g.compulsorySchoolGrade.weight,
+                label: g.compulsorySchoolGrade.title,
+              },
+              serialGrade: {
+                grade: g.nationalCoordinationGrade.grade,
+                weight: g.nationalCoordinationGrade.weight,
+                label: g.nationalCoordinationGrade.title,
+              },
+            },
+          })),
+          {
+            label: c.wordsAndNumberProblemsGrade.title,
+            text: c.wordsAndNumberProblemsGrade.grade,
+          },
+          {
+            label: c.improvement.title,
+            text: c.improvement.grade,
+          },
+        ],
+      })),
+    })),
+  }
+}
diff --git a/libs/api/domains/education/src/lib/educationV2.module.ts b/libs/api/domains/education/src/lib/educationV2.module.ts
new file mode 100644
index 000000000000..a47d0cbd0d37
--- /dev/null
+++ b/libs/api/domains/education/src/lib/educationV2.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common'
+import { GradesClientModule } from '@island.is/clients/mms/grade'
+import { GradesResolver } from './graphql/grades.resolver'
+import { EducationServiceV2 } from './educationV2.service'
+
+@Module({
+  imports: [GradesClientModule],
+  providers: [GradesResolver, EducationServiceV2],
+})
+export class EducationV2Module {}
diff --git a/libs/api/domains/education/src/lib/educationV2.service.ts b/libs/api/domains/education/src/lib/educationV2.service.ts
new file mode 100644
index 000000000000..ada2e43ed00d
--- /dev/null
+++ b/libs/api/domains/education/src/lib/educationV2.service.ts
@@ -0,0 +1,40 @@
+import { Injectable, Inject } from '@nestjs/common'
+import { GradeClientService } from '@island.is/clients/mms/grade'
+import { User } from '@island.is/auth-nest-tools'
+import { FamilyCompulsorySchoolCareer } from './models/familyCareer.model'
+import { mapCareer } from './educationMapper'
+import { isDefined } from '@island.is/shared/utils'
+import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
+
+@Injectable()
+export class EducationServiceV2 {
+  constructor(
+    private readonly gradeService: GradeClientService,
+    @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
+  ) {}
+
+  async familyCareers(
+    user: User,
+  ): Promise<FamilyCompulsorySchoolCareer | null> {
+    const data = await this.gradeService.getUserFamilyStudentAssessments(user)
+
+    if (!data) {
+      return null
+    }
+
+    const userData = data.find((d) => d.nationalId === user.nationalId)
+    const familyData = data.filter((d) => d.nationalId !== user.nationalId)
+
+    if (!userData?.nationalId || !userData?.name) {
+      return null
+    }
+
+    return {
+      userCareer: mapCareer(userData, false),
+      familyMemberCareers: familyData
+        .filter((d) => d.nationalId !== user.nationalId)
+        .map((data) => mapCareer(data, true))
+        .filter(isDefined),
+    }
+  }
+}
diff --git a/libs/api/domains/education/src/lib/graphql/grades.resolver.ts b/libs/api/domains/education/src/lib/graphql/grades.resolver.ts
new file mode 100644
index 000000000000..4722039fea98
--- /dev/null
+++ b/libs/api/domains/education/src/lib/graphql/grades.resolver.ts
@@ -0,0 +1,30 @@
+import { ApiScope } from '@island.is/auth/scopes'
+import { Query, Resolver } from '@nestjs/graphql'
+import { UseGuards } from '@nestjs/common'
+
+import type { User } from '@island.is/auth-nest-tools'
+import {
+  IdsUserGuard,
+  ScopesGuard,
+  CurrentUser,
+  Scopes,
+} from '@island.is/auth-nest-tools'
+import { Audit } from '@island.is/nest/audit'
+import { EducationServiceV2 } from '../educationV2.service'
+import { FamilyCompulsorySchoolCareer } from '../models/familyCareer.model'
+
+@UseGuards(IdsUserGuard, ScopesGuard)
+@Audit({ namespace: '@island.is/api/education/grade' })
+@Resolver()
+export class GradesResolver {
+  constructor(private readonly educationService: EducationServiceV2) {}
+
+  @Query(() => FamilyCompulsorySchoolCareer)
+  @Scopes(ApiScope.education)
+  @Audit()
+  userFamilyExamResults(
+    @CurrentUser() user: User,
+  ): Promise<FamilyCompulsorySchoolCareer | null> {
+    return this.educationService.familyCareers(user)
+  }
+}
diff --git a/libs/api/domains/education/src/lib/models/competence.model.ts b/libs/api/domains/education/src/lib/models/competence.model.ts
new file mode 100644
index 000000000000..d486cedb9510
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/competence.model.ts
@@ -0,0 +1,10 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+
+@ObjectType('EducationCompulsorySchoolCourseCompetence')
+export class CourseCompetence {
+  @Field()
+  competencyGrade!: string
+
+  @Field({ nullable: true })
+  competenceStatus?: string
+}
diff --git a/libs/api/domains/education/src/lib/models/course.model.ts b/libs/api/domains/education/src/lib/models/course.model.ts
new file mode 100644
index 000000000000..3094802acc99
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/course.model.ts
@@ -0,0 +1,19 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { CourseCompetence } from './competence.model'
+import { GradeCategory } from './gradeCategory.model'
+import { Grade } from './grade.model'
+
+@ObjectType('EducationCompulsorySchoolCourse')
+export class Course {
+  @Field()
+  label!: string
+
+  @Field(() => Grade, { nullable: true })
+  totalGrade?: Grade
+
+  @Field(() => CourseCompetence)
+  competence!: CourseCompetence
+
+  @Field(() => [GradeCategory], { nullable: true })
+  gradeCategories!: Array<GradeCategory>
+}
diff --git a/libs/api/domains/education/src/lib/models/familyCareer.model.ts b/libs/api/domains/education/src/lib/models/familyCareer.model.ts
new file mode 100644
index 000000000000..9bda063bf814
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/familyCareer.model.ts
@@ -0,0 +1,11 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { StudentCareer } from './studentCareer.model'
+
+@ObjectType('EducationUserFamilyCompulsorySchoolCareer')
+export class FamilyCompulsorySchoolCareer {
+  @Field(() => StudentCareer, { nullable: true })
+  userCareer?: StudentCareer
+
+  @Field(() => [StudentCareer], { nullable: true })
+  familyMemberCareers?: Array<StudentCareer>
+}
diff --git a/libs/api/domains/education/src/lib/models/grade.model.ts b/libs/api/domains/education/src/lib/models/grade.model.ts
new file mode 100644
index 000000000000..0dbb2cd1951d
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/grade.model.ts
@@ -0,0 +1,11 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { GradeDetail } from './gradeDetail.model'
+
+@ObjectType('EducationCompulsorySchoolGrade')
+export class Grade {
+  @Field(() => GradeDetail)
+  compulsorySchoolGrade!: GradeDetail
+
+  @Field(() => GradeDetail, { description: 'National standardised test grade' })
+  serialGrade!: GradeDetail
+}
diff --git a/libs/api/domains/education/src/lib/models/gradeCategory.model.ts b/libs/api/domains/education/src/lib/models/gradeCategory.model.ts
new file mode 100644
index 000000000000..2597be8f1882
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/gradeCategory.model.ts
@@ -0,0 +1,17 @@
+import { Field, InterfaceType } from '@nestjs/graphql'
+import { GradeCategoryText } from './gradeCategoryText.model'
+import { GradeCategoryWeighted } from './gradeCategoryWeighted.model'
+
+@InterfaceType('EducationCompulsorySchoolGradeCategory', {
+  resolveType(res) {
+    if (res.text) {
+      return GradeCategoryText
+    }
+
+    return GradeCategoryWeighted
+  },
+})
+export abstract class GradeCategory {
+  @Field()
+  label!: string
+}
diff --git a/libs/api/domains/education/src/lib/models/gradeCategoryText.model.ts b/libs/api/domains/education/src/lib/models/gradeCategoryText.model.ts
new file mode 100644
index 000000000000..c120ae8fc17f
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/gradeCategoryText.model.ts
@@ -0,0 +1,13 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { GradeCategory } from './gradeCategory.model'
+
+@ObjectType('EducationCompulsorySchoolGradeCategoryText', {
+  implements: () => GradeCategory,
+})
+export class GradeCategoryText implements GradeCategory {
+  @Field()
+  label!: string
+
+  @Field()
+  text!: string
+}
diff --git a/libs/api/domains/education/src/lib/models/gradeCategoryWeighted.model.ts b/libs/api/domains/education/src/lib/models/gradeCategoryWeighted.model.ts
new file mode 100644
index 000000000000..4bd955b95066
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/gradeCategoryWeighted.model.ts
@@ -0,0 +1,14 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { GradeCategory } from './gradeCategory.model'
+import { Grade } from './grade.model'
+
+@ObjectType('EducationCompulsorySchoolGradeCategoryWeighted', {
+  implements: () => GradeCategory,
+})
+export class GradeCategoryWeighted implements GradeCategory {
+  @Field()
+  label!: string
+
+  @Field(() => Grade)
+  grade!: Grade
+}
diff --git a/libs/api/domains/education/src/lib/models/gradeDetail.model.ts b/libs/api/domains/education/src/lib/models/gradeDetail.model.ts
new file mode 100644
index 000000000000..a90dbc4e0e0f
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/gradeDetail.model.ts
@@ -0,0 +1,13 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql'
+
+@ObjectType('EducationCompulsorySchoolGradeDetail')
+export class GradeDetail {
+  @Field()
+  grade!: string
+
+  @Field(() => Int, { nullable: true })
+  weight?: number
+
+  @Field({ nullable: true })
+  label?: string
+}
diff --git a/libs/api/domains/education/src/lib/models/gradeLevelExamResults.model.ts b/libs/api/domains/education/src/lib/models/gradeLevelExamResults.model.ts
new file mode 100644
index 000000000000..534cc36ed1c1
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/gradeLevelExamResults.model.ts
@@ -0,0 +1,11 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql'
+import { Course } from './course.model'
+
+@ObjectType('EducationCompulsorySchoolGradeLevelExamResults')
+export class CompulsorySchoolGradeLevelExamResults {
+  @Field(() => Int)
+  gradeLevel!: number
+
+  @Field(() => [Course], { nullable: true })
+  coursesExamResults?: Array<Course>
+}
diff --git a/libs/api/domains/education/src/lib/models/studentCareer.model.ts b/libs/api/domains/education/src/lib/models/studentCareer.model.ts
new file mode 100644
index 000000000000..cd01a2fe12f6
--- /dev/null
+++ b/libs/api/domains/education/src/lib/models/studentCareer.model.ts
@@ -0,0 +1,20 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+import { CompulsorySchoolGradeLevelExamResults } from './gradeLevelExamResults.model'
+
+@ObjectType('EducationCompulsorySchoolStudentCareer')
+export class StudentCareer {
+  @Field()
+  nationalId!: string
+
+  @Field()
+  name!: string
+
+  @Field({ nullable: true })
+  isChildOfUser?: boolean
+
+  @Field({ nullable: true })
+  examDateSpan?: string
+
+  @Field(() => [CompulsorySchoolGradeLevelExamResults], { nullable: true })
+  examResults?: Array<CompulsorySchoolGradeLevelExamResults>
+}
diff --git a/libs/api/domains/education/src/lib/s3.service.ts b/libs/api/domains/education/src/lib/s3.service.ts
index 737789e269ff..f49a723e6c1b 100644
--- a/libs/api/domains/education/src/lib/s3.service.ts
+++ b/libs/api/domains/education/src/lib/s3.service.ts
@@ -1,64 +1,64 @@
-import { Injectable, Inject } from '@nestjs/common'
-import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3'
-import { Upload } from '@aws-sdk/lib-storage'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { Injectable } from '@nestjs/common'
+import { Inject } from '@nestjs/common'
+import { S3 } from 'aws-sdk'
 import { Response } from 'node-fetch'
-import { Readable } from 'stream'
+import stream from 'stream'
 
 import type { Logger } from '@island.is/logging'
 import { LOGGER_PROVIDER } from '@island.is/logging'
-import { CompleteMultipartUploadOutput } from '@aws-sdk/client-s3'
 
 type S3Location = {
   fileName: string
   bucket: string
 }
 
+type FileUpload = {
+  passThrough: stream.PassThrough
+  promise: Promise<S3.ManagedUpload.SendData>
+}
+
 @Injectable()
 export class S3Service {
-  private readonly s3Client: S3Client
+  private readonly s3: S3
 
   constructor(
     @Inject(LOGGER_PROVIDER)
     private readonly logger: Logger,
   ) {
-    this.s3Client = new S3Client({ apiVersion: '2006-03-01' })
+    this.s3 = new S3({ apiVersion: '2006-03-01' })
   }
 
-  private async uploadFromStream(
+  private uploadFromStream(
     fileResponse: Response,
     { fileName, bucket }: S3Location,
-  ): Promise<CompleteMultipartUploadOutput> {
-    const upload = new Upload({
-      client: this.s3Client,
-      params: {
+  ): FileUpload {
+    const passThrough = new stream.PassThrough()
+    const promise = this.s3
+      .upload({
         Bucket: bucket,
         Key: fileName,
         ContentType: 'application/pdf',
-        Body: fileResponse.body as Readable,
-      },
-    })
-
-    this.logger.debug(`Uploading to bucket`, {
-      fileName,
-      bucket,
-    })
-    return await upload.done()
+        Body: passThrough,
+      })
+      .promise()
+    return { passThrough, promise }
   }
 
   async uploadFileFromStream(
     stream: Response,
     s3Location: S3Location,
   ): Promise<string | null> {
-    return this.uploadFromStream(stream, s3Location)
-      .then(async () => {
+    const { passThrough, promise } = this.uploadFromStream(stream, s3Location)
+
+    stream.body.pipe(passThrough)
+
+    return promise
+      .then((result) => {
         const oneMinutePlus = 65 // leave extra 5 seconds for network delay
-        const command = new GetObjectCommand({
+        return this.s3.getSignedUrlPromise('getObject', {
           Bucket: s3Location.bucket,
-          Key: s3Location.fileName,
-        })
-        return getSignedUrl(this.s3Client, command, {
-          expiresIn: oneMinutePlus,
+          Key: result.Key,
+          Expires: oneMinutePlus,
         })
       })
       .catch((err) => {
diff --git a/libs/api/domains/endorsement-system/src/lib/dto/exportEndorsementList.input.ts b/libs/api/domains/endorsement-system/src/lib/dto/exportEndorsementList.input.ts
new file mode 100644
index 000000000000..786b8f151a61
--- /dev/null
+++ b/libs/api/domains/endorsement-system/src/lib/dto/exportEndorsementList.input.ts
@@ -0,0 +1,10 @@
+import { Field, InputType } from '@nestjs/graphql'
+
+@InputType()
+export class ExportEndorsementListInput {
+  @Field()
+  listId!: string
+
+  @Field()
+  fileType!: string
+}
diff --git a/libs/api/domains/endorsement-system/src/lib/dto/exportUrl.response.ts b/libs/api/domains/endorsement-system/src/lib/dto/exportUrl.response.ts
new file mode 100644
index 000000000000..2643444b05b3
--- /dev/null
+++ b/libs/api/domains/endorsement-system/src/lib/dto/exportUrl.response.ts
@@ -0,0 +1,7 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+
+@ObjectType()
+export class ExportUrlResponse {
+  @Field(() => String)
+  url!: string
+}
diff --git a/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsement.response.ts b/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsement.response.ts
index 05506e9818f3..29331425822a 100644
--- a/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsement.response.ts
+++ b/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsement.response.ts
@@ -1,13 +1,16 @@
 import { Field, ObjectType } from '@nestjs/graphql'
 import { PageInfoResponse } from './pageInfo.response'
 import { Endorsement } from '../models/endorsement.model'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class PaginatedEndorsementResponse {
   @Field()
   totalCount!: number
-  @Field(() => [Endorsement])
+
+  @CacheField(() => [Endorsement])
   data!: Endorsement[]
-  @Field(() => PageInfoResponse)
+
+  @CacheField(() => PageInfoResponse)
   pageInfo!: PageInfoResponse
 }
diff --git a/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsementList.response.ts b/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsementList.response.ts
index 8dd52de6bcce..7962e4b88174 100644
--- a/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsementList.response.ts
+++ b/libs/api/domains/endorsement-system/src/lib/dto/paginatedEndorsementList.response.ts
@@ -1,13 +1,16 @@
 import { Field, ObjectType } from '@nestjs/graphql'
 import { PageInfoResponse } from './pageInfo.response'
 import { EndorsementList } from '../models/endorsementList.model'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class PaginatedEndorsementListResponse {
   @Field()
   totalCount!: number
-  @Field(() => [EndorsementList])
+
+  @CacheField(() => [EndorsementList])
   data!: EndorsementList[]
-  @Field(() => PageInfoResponse)
+
+  @CacheField(() => PageInfoResponse)
   pageInfo!: PageInfoResponse
 }
diff --git a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts
index acbbcd33b5b0..293946450d93 100644
--- a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts
+++ b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts
@@ -31,6 +31,9 @@ import { sendPdfEmailInput } from './dto/sendPdfEmail.input'
 import { CacheControl, CacheControlOptions } from '@island.is/nest/graphql'
 import { CACHE_CONTROL_MAX_AGE } from '@island.is/shared/constants'
 
+import { ExportUrlResponse } from './dto/exportUrl.response'
+import { ExportEndorsementListInput } from './dto/exportEndorsementList.input'
+
 const defaultCache: CacheControlOptions = { maxAge: CACHE_CONTROL_MAX_AGE }
 
 @UseGuards(IdsUserGuard)
@@ -254,4 +257,15 @@ export class EndorsementSystemResolver {
       user,
     )
   }
+
+  @Mutation(() => ExportUrlResponse)
+  async endorsementSystemExportList(
+    @Args('input') input: ExportEndorsementListInput,
+    @CurrentUser() user: User,
+  ): Promise<ExportUrlResponse> {
+    return await this.endorsementSystemService.endorsementListControllerExportList(
+      input,
+      user,
+    )
+  }
 }
diff --git a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.service.ts b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.service.ts
index 2258d9046bd9..eab84ca67cb8 100644
--- a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.service.ts
+++ b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.service.ts
@@ -20,9 +20,12 @@ import {
   EndorsementListControllerLockRequest,
   EndorsementListControllerUnlockRequest,
   EndorsementListControllerEmailEndorsementsPDFRequest,
+  EndorsementListControllerExportEndorsementListFileTypeEnum,
 } from '../../gen/fetch'
 import { Auth, AuthMiddleware } from '@island.is/auth-nest-tools'
 import type { Logger } from '@island.is/logging'
+import { ExportUrlResponse } from './dto/exportUrl.response'
+import { ExportEndorsementListInput } from './dto/exportEndorsementList.input'
 
 @Injectable()
 export class EndorsementSystemService {
@@ -219,4 +222,17 @@ export class EndorsementSystemService {
       .endorsementListControllerEmailEndorsementsPDF(endorsementList)
       .catch(this.handleError.bind(this))
   }
+
+  async endorsementListControllerExportList(
+    input: ExportEndorsementListInput,
+    auth: Auth,
+  ): Promise<ExportUrlResponse> {
+    return await this.endorsementListApiWithAuth(auth)
+      .endorsementListControllerExportEndorsementList({
+        listId: input.listId,
+        fileType:
+          input.fileType as EndorsementListControllerExportEndorsementListFileTypeEnum,
+      })
+      .catch(this.handleError.bind(this))
+  }
 }
diff --git a/libs/api/domains/endorsement-system/src/lib/models/endorsement.model.ts b/libs/api/domains/endorsement-system/src/lib/models/endorsement.model.ts
index 7381d2c45959..ab0c8b1e022e 100644
--- a/libs/api/domains/endorsement-system/src/lib/models/endorsement.model.ts
+++ b/libs/api/domains/endorsement-system/src/lib/models/endorsement.model.ts
@@ -1,6 +1,7 @@
 import { Field, ObjectType, ID } from '@nestjs/graphql'
 import { EndorsementListOpen } from './endorsementListOpen.model'
 import { EndorsementMetadata } from './endorsementMetadata.model'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class Endorsement {
@@ -13,10 +14,10 @@ export class Endorsement {
   @Field()
   endorsementListId!: string
 
-  @Field(() => EndorsementListOpen, { nullable: true })
+  @CacheField(() => EndorsementListOpen, { nullable: true })
   endorsementList?: EndorsementListOpen
 
-  @Field(() => EndorsementMetadata)
+  @CacheField(() => EndorsementMetadata)
   meta!: EndorsementMetadata
 
   @Field()
diff --git a/libs/api/domains/endorsement-system/src/lib/models/endorsementList.model.ts b/libs/api/domains/endorsement-system/src/lib/models/endorsementList.model.ts
index 2c03818d359a..dc5e2c55c16d 100644
--- a/libs/api/domains/endorsement-system/src/lib/models/endorsementList.model.ts
+++ b/libs/api/domains/endorsement-system/src/lib/models/endorsementList.model.ts
@@ -1,6 +1,7 @@
 import { Field, ObjectType, ID } from '@nestjs/graphql'
 import graphqlTypeJson from 'graphql-type-json'
 import { EndorsementListTagsEnum } from '../enums/endorsementListTags.enum'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class EndorsementList {
@@ -22,10 +23,10 @@ export class EndorsementList {
   @Field()
   adminLock!: boolean
 
-  @Field(() => [EndorsementListTagsEnum])
+  @CacheField(() => [EndorsementListTagsEnum])
   tags!: EndorsementListTagsEnum[]
 
-  @Field(() => graphqlTypeJson)
+  @CacheField(() => graphqlTypeJson)
   meta!: object
 
   @Field()
diff --git a/libs/api/domains/endorsement-system/src/lib/models/endorsementListOpen.model.ts b/libs/api/domains/endorsement-system/src/lib/models/endorsementListOpen.model.ts
index 17b7610d1c66..1a84dfda3713 100644
--- a/libs/api/domains/endorsement-system/src/lib/models/endorsementListOpen.model.ts
+++ b/libs/api/domains/endorsement-system/src/lib/models/endorsementListOpen.model.ts
@@ -1,5 +1,6 @@
 import { Field, ObjectType, ID } from '@nestjs/graphql'
 import { EndorsementListOpenTagsEnum } from '../enums/endorsementListOpenTagsEnum'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class EndorsementListOpen {
@@ -12,7 +13,7 @@ export class EndorsementListOpen {
   @Field(() => String, { nullable: true })
   description!: string | null
 
-  @Field(() => [EndorsementListOpenTagsEnum], { nullable: true })
+  @CacheField(() => [EndorsementListOpenTagsEnum], { nullable: true })
   tags?: EndorsementListOpenTagsEnum[]
 
   @Field(() => Date)
diff --git a/libs/api/domains/file-upload/src/lib/file-upload.resolver.ts b/libs/api/domains/file-upload/src/lib/file-upload.resolver.ts
index 8be7a55416e8..fa2d482c50f5 100644
--- a/libs/api/domains/file-upload/src/lib/file-upload.resolver.ts
+++ b/libs/api/domains/file-upload/src/lib/file-upload.resolver.ts
@@ -1,4 +1,5 @@
 import { Args, Resolver, Mutation } from '@nestjs/graphql'
+import { S3 } from 'aws-sdk'
 import { PresignedPost } from './presignedPost.model'
 import { FileStorageService } from '@island.is/file-storage'
 
@@ -7,9 +8,9 @@ export class FileUploadResolver {
   constructor(private fileStorageService: FileStorageService) {}
 
   @Mutation(() => PresignedPost)
-  async createUploadUrl(
+  createUploadUrl(
     @Args('filename') filename: string,
-  ): Promise<PresignedPost> {
+  ): Promise<S3.PresignedPost> {
     return this.fileStorageService.generatePresignedPost(filename)
   }
 }
diff --git a/libs/api/domains/occupational-licenses/src/lib/models/occupationalLicense.model.ts b/libs/api/domains/occupational-licenses/src/lib/models/occupationalLicense.model.ts
index 8f98b15c0258..a67fa3b79992 100644
--- a/libs/api/domains/occupational-licenses/src/lib/models/occupationalLicense.model.ts
+++ b/libs/api/domains/occupational-licenses/src/lib/models/occupationalLicense.model.ts
@@ -46,6 +46,7 @@ export abstract class OccupationalLicense {
 
   @Field(() => ID)
   id!: string | number
+
   @Field(() => String)
   type!: string
 
diff --git a/libs/api/domains/occupational-licenses/src/lib/occupationalLicenses.service.ts b/libs/api/domains/occupational-licenses/src/lib/occupationalLicenses.service.ts
index 8f08316cc97c..2eef0fad1cf6 100644
--- a/libs/api/domains/occupational-licenses/src/lib/occupationalLicenses.service.ts
+++ b/libs/api/domains/occupational-licenses/src/lib/occupationalLicenses.service.ts
@@ -98,6 +98,7 @@ export class OccupationalLicensesService {
           .map((license) => ({
             institution: OccupationalLicenseType.HEALTH,
             id: license.id.toString(),
+            licenseNumber: license.licenseNumber,
             legalEntityId: license.legalEntityId,
             holderName: license.licenseHolderName,
             profession: license.profession,
diff --git a/libs/api/domains/social-insurance/src/lib/dtos/temporaryCalculation.input.ts b/libs/api/domains/social-insurance/src/lib/dtos/temporaryCalculation.input.ts
new file mode 100644
index 000000000000..02e191306d34
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/dtos/temporaryCalculation.input.ts
@@ -0,0 +1,70 @@
+import { InputType, Field, Int } from '@nestjs/graphql'
+
+@InputType('SocialInsuranceIncomeType')
+class IncomeType {
+  @Field(() => Int, { nullable: true })
+  incomeTypeNumber?: number
+
+  @Field(() => String, { nullable: true })
+  incomeTypeCode?: string
+
+  @Field(() => String, { nullable: true })
+  incomeTypeName?: string
+
+  @Field(() => String, { nullable: true })
+  currencyCode?: string
+
+  @Field(() => Int, { nullable: true })
+  incomeCategoryNumber?: number
+
+  @Field(() => String, { nullable: true })
+  incomeCategoryCode?: string
+
+  @Field(() => String, { nullable: true })
+  incomeCategoryName?: string
+
+  @Field(() => Int, { nullable: true })
+  amountJan?: number
+
+  @Field(() => Int, { nullable: true })
+  amountFeb?: number
+
+  @Field(() => Int, { nullable: true })
+  amountMar?: number
+
+  @Field(() => Int, { nullable: true })
+  amountApr?: number
+
+  @Field(() => Int, { nullable: true })
+  amountMay?: number
+
+  @Field(() => Int, { nullable: true })
+  amountJun?: number
+
+  @Field(() => Int, { nullable: true })
+  amountJul?: number
+
+  @Field(() => Int, { nullable: true })
+  amountAug?: number
+
+  @Field(() => Int, { nullable: true })
+  amountSep?: number
+
+  @Field(() => Int, { nullable: true })
+  amountOct?: number
+
+  @Field(() => Int, { nullable: true })
+  amountNov?: number
+
+  @Field(() => Int, { nullable: true })
+  amountDec?: number
+}
+
+@InputType('SocialInsuranceTemporaryCalculationInput')
+export class TemporaryCalculationInput {
+  @Field(() => Int)
+  incomeYear!: number
+
+  @Field(() => [IncomeType], { nullable: true })
+  incomeTypes?: Array<IncomeType>
+}
diff --git a/libs/api/domains/social-insurance/src/lib/models/income/category.model.ts b/libs/api/domains/social-insurance/src/lib/models/income/category.model.ts
new file mode 100644
index 000000000000..a7c82ef08629
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/models/income/category.model.ts
@@ -0,0 +1,13 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql'
+
+@ObjectType('SocialInsuranceIncomePlanIncomeCategory')
+export class IncomeCategory {
+  @Field()
+  name!: string
+
+  @Field(() => Int)
+  annualSum!: number
+
+  @Field({ nullable: true })
+  currency?: string
+}
diff --git a/libs/api/domains/social-insurance/src/lib/models/income/incomePlan.model.ts b/libs/api/domains/social-insurance/src/lib/models/income/incomePlan.model.ts
new file mode 100644
index 000000000000..176cd4906713
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/models/income/incomePlan.model.ts
@@ -0,0 +1,26 @@
+import {
+  Field,
+  GraphQLISODateTime,
+  ObjectType,
+  registerEnumType,
+} from '@nestjs/graphql'
+import { IncomeCategory } from './category.model'
+import { IncomePlanStatus } from '../../socialInsurance.type'
+import { IncomePlanEligbility } from './incomePlanEligibility.model'
+
+registerEnumType(IncomePlanStatus, { name: 'SocialInsuranceIncomePlanStatus' })
+
+@ObjectType('SocialInsuranceIncomePlan')
+export class IncomePlan {
+  @Field(() => GraphQLISODateTime)
+  registrationDate!: Date
+
+  @Field(() => IncomePlanStatus)
+  status!: IncomePlanStatus
+
+  @Field(() => IncomePlanEligbility, { nullable: true })
+  isEligibleForChange?: IncomePlanEligbility
+
+  @Field(() => [IncomeCategory])
+  incomeCategories!: Array<IncomeCategory>
+}
diff --git a/libs/api/domains/social-insurance/src/lib/models/income/incomePlanEligibility.model.ts b/libs/api/domains/social-insurance/src/lib/models/income/incomePlanEligibility.model.ts
new file mode 100644
index 000000000000..2fa9b36d9d8e
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/models/income/incomePlanEligibility.model.ts
@@ -0,0 +1,10 @@
+import { Field, ObjectType } from '@nestjs/graphql'
+
+@ObjectType('SocialInsuranceIncomePlanEligbility')
+export class IncomePlanEligbility {
+  @Field({ nullable: true })
+  isEligible?: boolean
+
+  @Field({ nullable: true })
+  reason?: string
+}
diff --git a/libs/api/domains/social-insurance/src/lib/models/payment.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/payment.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/payment.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/payment.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/paymentGroup.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/paymentGroup.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/paymentGroup.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/paymentGroup.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/paymentGroupType.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/paymentGroupType.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/paymentGroupType.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/paymentGroupType.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/paymentMonth.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/paymentMonth.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/paymentMonth.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/paymentMonth.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/paymentPlan.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/paymentPlan.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/paymentPlan.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/paymentPlan.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/payments.model.ts b/libs/api/domains/social-insurance/src/lib/models/payments/payments.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/payments.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/payments/payments.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/pensionCalculation.model.ts b/libs/api/domains/social-insurance/src/lib/models/pension/pensionCalculation.model.ts
similarity index 100%
rename from libs/api/domains/social-insurance/src/lib/models/pensionCalculation.model.ts
rename to libs/api/domains/social-insurance/src/lib/models/pension/pensionCalculation.model.ts
diff --git a/libs/api/domains/social-insurance/src/lib/models/temporaryCalculation.model.ts b/libs/api/domains/social-insurance/src/lib/models/temporaryCalculation.model.ts
new file mode 100644
index 000000000000..c8e55c1b1d12
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/models/temporaryCalculation.model.ts
@@ -0,0 +1,55 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql'
+
+@ObjectType('SocialInsuranceTemporaryCalculationRow')
+class TemporaryCalculationRow {
+  @Field(() => String, { nullable: true })
+  name?: string
+
+  @Field(() => Int, { nullable: true })
+  total?: number
+
+  @Field(() => [TemporaryCalculationMonth], { nullable: true })
+  months?: Array<TemporaryCalculationMonth>
+}
+
+@ObjectType('SocialInsuranceTemporaryCalculationMonth')
+class TemporaryCalculationMonth {
+  @Field(() => Int)
+  month!: number
+
+  @Field(() => Int, { nullable: true })
+  amount?: number
+}
+
+@ObjectType('SocialInsuranceTemporaryCalculationGroup')
+class TemporaryCalculationGroup {
+  @Field(() => String, { nullable: true })
+  group?: string
+
+  @Field(() => Int, { nullable: true })
+  groupId?: number
+
+  @Field(() => Int, { nullable: true })
+  total?: number
+
+  @Field(() => [TemporaryCalculationMonth], { nullable: true })
+  monthTotals?: Array<TemporaryCalculationMonth>
+
+  @Field(() => [TemporaryCalculationRow], { nullable: true })
+  rows?: Array<TemporaryCalculationRow>
+}
+
+@ObjectType('SocialInsuranceTemporaryCalculation')
+export class TemporaryCalculation {
+  @Field(() => Int, { nullable: true })
+  totalPayment?: number
+
+  @Field(() => Int, { nullable: true })
+  subtracted?: number
+
+  @Field(() => Int, { nullable: true })
+  paidOut?: number
+
+  @Field(() => [TemporaryCalculationGroup], { nullable: true })
+  groups?: Array<TemporaryCalculationGroup>
+}
diff --git a/libs/api/domains/social-insurance/src/lib/resolvers/incomePlan.resolver.ts b/libs/api/domains/social-insurance/src/lib/resolvers/incomePlan.resolver.ts
new file mode 100644
index 000000000000..43e5e106720f
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/resolvers/incomePlan.resolver.ts
@@ -0,0 +1,46 @@
+import { Audit } from '@island.is/nest/audit'
+import { Query, ResolveField, Resolver } from '@nestjs/graphql'
+import {
+  CurrentUser,
+  IdsUserGuard,
+  Scopes,
+  ScopesGuard,
+  type User,
+} from '@island.is/auth-nest-tools'
+import { Inject, UseGuards } from '@nestjs/common'
+import { SocialInsuranceService } from '../socialInsurance.service'
+import {
+  FeatureFlag,
+  FeatureFlagGuard,
+  Features,
+} from '@island.is/nest/feature-flags'
+import { IncomePlan } from '../models/income/incomePlan.model'
+import { ApiScope } from '@island.is/auth/scopes'
+import { IncomePlanEligbility } from '../models/income/incomePlanEligibility.model'
+import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
+
+@Resolver(() => IncomePlan)
+@UseGuards(IdsUserGuard, ScopesGuard, FeatureFlagGuard)
+@Audit({ namespace: '@island.is/api/social-insurance' })
+export class IncomePlanResolver {
+  constructor(
+    @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
+    private readonly service: SocialInsuranceService,
+  ) {}
+
+  @Query(() => IncomePlan, {
+    name: 'socialInsuranceIncomePlan',
+    nullable: true,
+  })
+  @FeatureFlag(Features.servicePortalSocialInsuranceIncomePlanPageEnabled)
+  @Scopes(ApiScope.internal)
+  @Audit()
+  async incomePlan(@CurrentUser() user: User) {
+    return this.service.getIncomePlan(user)
+  }
+
+  @ResolveField('isEligibleForChange', () => IncomePlanEligbility)
+  async resolveField(@CurrentUser() user: User): Promise<IncomePlanEligbility> {
+    return this.service.getIncomePlanChangeEligibility(user)
+  }
+}
diff --git a/libs/api/domains/social-insurance/src/lib/resolvers/index.ts b/libs/api/domains/social-insurance/src/lib/resolvers/index.ts
new file mode 100644
index 000000000000..395d8a83cfba
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/resolvers/index.ts
@@ -0,0 +1,3 @@
+export { IncomePlanResolver } from './incomePlan.resolver'
+export { PaymentPlanResolver } from './paymentPlan.resolver'
+export { PensionResolver } from './pension.resolver'
diff --git a/libs/api/domains/social-insurance/src/lib/socialInsurance.resolver.ts b/libs/api/domains/social-insurance/src/lib/resolvers/paymentPlan.resolver.ts
similarity index 66%
rename from libs/api/domains/social-insurance/src/lib/socialInsurance.resolver.ts
rename to libs/api/domains/social-insurance/src/lib/resolvers/paymentPlan.resolver.ts
index afa323100377..dd41459cf2e1 100644
--- a/libs/api/domains/social-insurance/src/lib/socialInsurance.resolver.ts
+++ b/libs/api/domains/social-insurance/src/lib/resolvers/paymentPlan.resolver.ts
@@ -7,24 +7,23 @@ import {
   Scopes,
   CurrentUser,
   type User,
-  BypassAuth,
 } from '@island.is/auth-nest-tools'
 import { UseGuards } from '@nestjs/common'
-import { SocialInsuranceService } from './socialInsurance.service'
-import { PaymentPlan } from './models/paymentPlan.model'
+import { SocialInsuranceService } from '../socialInsurance.service'
+import { PaymentPlan } from '../models/payments/paymentPlan.model'
 import {
   FeatureFlagGuard,
   FeatureFlag,
   Features,
 } from '@island.is/nest/feature-flags'
-import { PensionCalculationInput } from './dtos/pensionCalculation.input'
-import { PensionCalculationResponse } from './models/pensionCalculation.model'
-import { Payments } from './models/payments.model'
+import { Payments } from '../models/payments/payments.model'
+import { TemporaryCalculation } from '../models/temporaryCalculation.model'
+import { TemporaryCalculationInput } from '../dtos/temporaryCalculation.input'
 
 @Resolver()
 @UseGuards(IdsUserGuard, ScopesGuard, FeatureFlagGuard)
 @Audit({ namespace: '@island.is/api/social-insurance' })
-export class SocialInsuranceResolver {
+export class PaymentPlanResolver {
   constructor(private readonly service: SocialInsuranceService) {}
 
   @Query(() => PaymentPlan, {
@@ -49,9 +48,11 @@ export class SocialInsuranceResolver {
     return this.service.getPayments(user)
   }
 
-  @Query(() => PensionCalculationResponse)
-  @BypassAuth()
-  async getPensionCalculation(@Args('input') input: PensionCalculationInput) {
-    return this.service.getPensionCalculation(input)
+  @Query(() => TemporaryCalculation)
+  async getTemporaryCalculations(
+    @Args('input') input: TemporaryCalculationInput,
+    @CurrentUser() user: User,
+  ) {
+    return this.service.getTemporaryCalculations(user, input)
   }
 }
diff --git a/libs/api/domains/social-insurance/src/lib/resolvers/pension.resolver.ts b/libs/api/domains/social-insurance/src/lib/resolvers/pension.resolver.ts
new file mode 100644
index 000000000000..3f5688bae31a
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/resolvers/pension.resolver.ts
@@ -0,0 +1,25 @@
+import { Audit } from '@island.is/nest/audit'
+import { Args, Query, Resolver } from '@nestjs/graphql'
+import {
+  IdsUserGuard,
+  ScopesGuard,
+  BypassAuth,
+} from '@island.is/auth-nest-tools'
+import { UseGuards } from '@nestjs/common'
+import { SocialInsuranceService } from '../socialInsurance.service'
+import { FeatureFlagGuard } from '@island.is/nest/feature-flags'
+import { PensionCalculationInput } from '../dtos/pensionCalculation.input'
+import { PensionCalculationResponse } from '../models/pension/pensionCalculation.model'
+
+@Resolver()
+@UseGuards(IdsUserGuard, ScopesGuard, FeatureFlagGuard)
+@Audit({ namespace: '@island.is/api/social-insurance' })
+export class PensionResolver {
+  constructor(private readonly service: SocialInsuranceService) {}
+
+  @Query(() => PensionCalculationResponse)
+  @BypassAuth()
+  async getPensionCalculation(@Args('input') input: PensionCalculationInput) {
+    return this.service.getPensionCalculation(input)
+  }
+}
diff --git a/libs/api/domains/social-insurance/src/lib/socialInsurance.module.ts b/libs/api/domains/social-insurance/src/lib/socialInsurance.module.ts
index 669621eb7e0a..df3a607b4af0 100644
--- a/libs/api/domains/social-insurance/src/lib/socialInsurance.module.ts
+++ b/libs/api/domains/social-insurance/src/lib/socialInsurance.module.ts
@@ -2,8 +2,12 @@ import { Module } from '@nestjs/common'
 import { SocialInsuranceAdministrationClientModule } from '@island.is/clients/social-insurance-administration'
 import { FeatureFlagModule } from '@island.is/nest/feature-flags'
 import { CmsModule } from '@island.is/cms'
-import { SocialInsuranceResolver } from './socialInsurance.resolver'
 import { SocialInsuranceService } from './socialInsurance.service'
+import {
+  IncomePlanResolver,
+  PaymentPlanResolver,
+  PensionResolver,
+} from './resolvers'
 
 @Module({
   imports: [
@@ -11,6 +15,11 @@ import { SocialInsuranceService } from './socialInsurance.service'
     FeatureFlagModule,
     CmsModule,
   ],
-  providers: [SocialInsuranceResolver, SocialInsuranceService],
+  providers: [
+    PaymentPlanResolver,
+    PensionResolver,
+    IncomePlanResolver,
+    SocialInsuranceService,
+  ],
 })
 export class SocialInsuranceModule {}
diff --git a/libs/api/domains/social-insurance/src/lib/socialInsurance.service.ts b/libs/api/domains/social-insurance/src/lib/socialInsurance.service.ts
index f9c4526b58ff..5b53e46c6cc3 100644
--- a/libs/api/domains/social-insurance/src/lib/socialInsurance.service.ts
+++ b/libs/api/domains/social-insurance/src/lib/socialInsurance.service.ts
@@ -1,6 +1,10 @@
 import { User } from '@island.is/auth-nest-tools'
 import { handle404 } from '@island.is/clients/middlewares'
-import { SocialInsuranceAdministrationClientService } from '@island.is/clients/social-insurance-administration'
+import {
+  SocialInsuranceAdministrationClientService,
+  TrWebCommonsExternalPortalsApiModelsPaymentPlanPaymentPlanDto,
+  IncomePlanStatus as IncomeStatus,
+} from '@island.is/clients/social-insurance-administration'
 import {
   CmsElasticsearchService,
   CustomPageUniqueIdentifier,
@@ -10,16 +14,20 @@ import { LOGGER_PROVIDER } from '@island.is/logging'
 import { isDefined } from '@island.is/shared/utils'
 import { Inject, Injectable } from '@nestjs/common'
 import { PensionCalculationInput } from './dtos/pensionCalculation.input'
-import { PensionCalculationResponse } from './models/pensionCalculation.model'
+import { PensionCalculationResponse } from './models/pension/pensionCalculation.model'
 import {
   getPensionCalculationHighlightedItems,
   groupPensionCalculationItems,
   mapPensionCalculationInput,
 } from './utils'
-import { PaymentGroup } from './models/paymentGroup.model'
-import { PaymentPlan } from './models/paymentPlan.model'
-import { Payments } from './models/payments.model'
-import { mapToPaymentGroupType } from './models/paymentGroupType.model'
+import { PaymentGroup } from './models/payments/paymentGroup.model'
+import { PaymentPlan } from './models/payments/paymentPlan.model'
+import { Payments } from './models/payments/payments.model'
+import { mapToPaymentGroupType } from './models/payments/paymentGroupType.model'
+import { IncomePlan } from './models/income/incomePlan.model'
+import { IncomePlanStatus, LOG_CATEGORY } from './socialInsurance.type'
+import { IncomePlanEligbility } from './models/income/incomePlanEligibility.model'
+import { TemporaryCalculationInput } from './dtos/temporaryCalculation.input'
 
 @Injectable()
 export class SocialInsuranceService {
@@ -121,6 +129,58 @@ export class SocialInsuranceService {
     }
   }
 
+  async getIncomePlan(user: User): Promise<IncomePlan | undefined> {
+    const data = await this.socialInsuranceApi.getLatestIncomePlan(user)
+
+    if (!data?.registrationDate || !data?.status || !data.incomeTypeLines) {
+      this.logger.info('Income plan incomplete, returning', {
+        category: LOG_CATEGORY,
+      })
+      return
+    }
+
+    let hasIncompleteLines = false
+    const incomeCategories = data.incomeTypeLines
+      .map((i) => {
+        if (!i.incomeCategoryName || !i.totalSum || !i.currency) {
+          hasIncompleteLines = true
+          return undefined
+        }
+        return {
+          name: i.incomeCategoryName,
+          annualSum: i.totalSum,
+          currency: i.currency,
+        }
+      })
+      .filter(isDefined)
+
+    if (hasIncompleteLines) {
+      this.logger.info(
+        'Income category data filtered out some incomplete lines',
+        {
+          category: LOG_CATEGORY,
+        },
+      )
+    }
+
+    return {
+      registrationDate: data.registrationDate,
+      status: this.parseIncomePlanStatus(data.status),
+      incomeCategories,
+    }
+  }
+
+  async getIncomePlanChangeEligibility(
+    user: User,
+  ): Promise<IncomePlanEligbility> {
+    const data = await this.socialInsuranceApi.getIsEligible(user, 'incomeplan')
+
+    return {
+      isEligible: data.isEligible ?? undefined,
+      reason: data.reason ?? undefined,
+    }
+  }
+
   async getPensionCalculation(
     input: PensionCalculationInput,
   ): Promise<PensionCalculationResponse> {
@@ -145,4 +205,24 @@ export class SocialInsuranceService {
       groups,
     }
   }
+
+  async getTemporaryCalculations(
+    user: User,
+    input: TemporaryCalculationInput,
+  ): Promise<TrWebCommonsExternalPortalsApiModelsPaymentPlanPaymentPlanDto> {
+    return await this.socialInsuranceApi.getTemporaryCalculations(user, input)
+  }
+
+  parseIncomePlanStatus = (status: IncomeStatus): IncomePlanStatus => {
+    switch (status) {
+      case 'Accepted':
+        return IncomePlanStatus.ACCEPTED
+      case 'InProgress':
+        return IncomePlanStatus.IN_PROGRESS
+      case 'Cancelled':
+        return IncomePlanStatus.CANCELLED
+      default:
+        return IncomePlanStatus.UNKNOWN
+    }
+  }
 }
diff --git a/libs/api/domains/social-insurance/src/lib/socialInsurance.type.ts b/libs/api/domains/social-insurance/src/lib/socialInsurance.type.ts
new file mode 100644
index 000000000000..e980dc067dfc
--- /dev/null
+++ b/libs/api/domains/social-insurance/src/lib/socialInsurance.type.ts
@@ -0,0 +1,8 @@
+export enum IncomePlanStatus {
+  ACCEPTED,
+  CANCELLED,
+  IN_PROGRESS,
+  UNKNOWN,
+}
+
+export const LOG_CATEGORY = 'api-domains-social-insurance-service'
diff --git a/libs/api/domains/social-insurance/src/lib/utils.ts b/libs/api/domains/social-insurance/src/lib/utils.ts
index 183116506153..cbdd1c2d3dd7 100644
--- a/libs/api/domains/social-insurance/src/lib/utils.ts
+++ b/libs/api/domains/social-insurance/src/lib/utils.ts
@@ -13,7 +13,7 @@ import addYears from 'date-fns/addYears'
 import differenceInMonths from 'date-fns/differenceInMonths'
 import differenceInYears from 'date-fns/differenceInYears'
 import { CustomPage } from '@island.is/cms'
-import { PensionCalculationResponse } from './models/pensionCalculation.model'
+import { PensionCalculationResponse } from './models/pension/pensionCalculation.model'
 
 const basePensionTypeMapping: Record<BasePensionType, number> = {
   [BasePensionType.Retirement]: 1, // Ellilífeyrir
diff --git a/libs/api/domains/syslumenn/src/lib/models/professionRights.ts b/libs/api/domains/syslumenn/src/lib/models/professionRights.ts
index f12947b906e5..1b20028f87f4 100644
--- a/libs/api/domains/syslumenn/src/lib/models/professionRights.ts
+++ b/libs/api/domains/syslumenn/src/lib/models/professionRights.ts
@@ -8,6 +8,9 @@ class ProfessionRight {
 
   @Field({ nullable: true })
   profession?: string
+
+  @Field({ nullable: true })
+  nationalId?: string
 }
 
 @ObjectType()
diff --git a/libs/api/domains/university-careers/src/lib/mapper.ts b/libs/api/domains/university-careers/src/lib/mapper.ts
index a170fa20e102..09166bcdb54c 100644
--- a/libs/api/domains/university-careers/src/lib/mapper.ts
+++ b/libs/api/domains/university-careers/src/lib/mapper.ts
@@ -18,9 +18,7 @@ export const mapToStudent = (
     !data?.graduationDate ||
     !data?.trackNumber ||
     !data?.school ||
-    !data?.faculty ||
-    !data?.studyProgram ||
-    !data?.degree
+    !data?.faculty
   ) {
     return null
   }
diff --git a/libs/api/domains/university-careers/src/lib/models/institution.model.ts b/libs/api/domains/university-careers/src/lib/models/institution.model.ts
index f244087c285e..b58054665da9 100644
--- a/libs/api/domains/university-careers/src/lib/models/institution.model.ts
+++ b/libs/api/domains/university-careers/src/lib/models/institution.model.ts
@@ -12,9 +12,9 @@ export class Institution {
   @Field(() => String)
   shortId!: UniversityIdShort
 
-  @Field(() => String, { nullable: true })
+  @Field({ nullable: true })
   displayName?: string
 
-  @Field(() => String, { nullable: true })
+  @Field({ nullable: true })
   logoUrl?: string
 }
diff --git a/libs/api/domains/university-careers/src/lib/models/studentFile.model.ts b/libs/api/domains/university-careers/src/lib/models/studentFile.model.ts
index 25ee567492ba..ad05cca835f6 100644
--- a/libs/api/domains/university-careers/src/lib/models/studentFile.model.ts
+++ b/libs/api/domains/university-careers/src/lib/models/studentFile.model.ts
@@ -2,15 +2,15 @@ import { ObjectType, Field } from '@nestjs/graphql'
 
 @ObjectType('UniversityCareersStudentFile')
 export class StudentFile {
-  @Field(() => String)
+  @Field()
   type!: string
 
-  @Field(() => String)
+  @Field()
   locale!: string
 
-  @Field(() => String)
+  @Field()
   displayName!: string
 
-  @Field(() => String)
+  @Field()
   fileName!: string
 }
diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrack.model.ts b/libs/api/domains/university-careers/src/lib/models/studentTrack.model.ts
index 06e707c8bc92..16c2a7cf7b20 100644
--- a/libs/api/domains/university-careers/src/lib/models/studentTrack.model.ts
+++ b/libs/api/domains/university-careers/src/lib/models/studentTrack.model.ts
@@ -16,6 +16,6 @@ export class StudentTrack {
   @Field(() => StudentTrackMetadata)
   metadata!: StudentTrackMetadata
 
-  @Field(() => String, { nullable: true })
+  @Field({ nullable: true })
   downloadServiceURL?: string
 }
diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrackMetadata.ts b/libs/api/domains/university-careers/src/lib/models/studentTrackMetadata.ts
index eb41db8582c8..d45057eb0d4f 100644
--- a/libs/api/domains/university-careers/src/lib/models/studentTrackMetadata.ts
+++ b/libs/api/domains/university-careers/src/lib/models/studentTrackMetadata.ts
@@ -2,12 +2,12 @@ import { ObjectType, Field } from '@nestjs/graphql'
 
 @ObjectType('UniversityCareersStudentTrackMetadata')
 export class StudentTrackMetadata {
-  @Field(() => String)
+  @Field()
   description!: string
 
-  @Field(() => String)
+  @Field()
   footer!: string
 
-  @Field(() => String, { nullable: true })
+  @Field({ nullable: true })
   unconfirmedData?: string
 }
diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscript.model.ts b/libs/api/domains/university-careers/src/lib/models/studentTrackTranscript.model.ts
index 468dd44118ad..68c339218ba2 100644
--- a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscript.model.ts
+++ b/libs/api/domains/university-careers/src/lib/models/studentTrackTranscript.model.ts
@@ -1,32 +1,32 @@
-import { ObjectType, Field } from '@nestjs/graphql'
+import { ObjectType, Field, Int } from '@nestjs/graphql'
 import { Institution } from './institution.model'
 
 @ObjectType('UniversityCareersStudentTrackTranscript')
 export class StudentTrackTranscript {
-  @Field(() => String)
+  @Field()
   name!: string
 
-  @Field(() => String, { nullable: true })
+  @Field({ nullable: true })
   nationalId?: string
 
-  @Field(() => String)
+  @Field()
   graduationDate!: string
 
-  @Field(() => Number)
+  @Field(() => Int)
   trackNumber!: number
 
   @Field(() => Institution)
   institution!: Institution
 
-  @Field(() => String)
+  @Field()
   school!: string
 
-  @Field(() => String)
+  @Field()
   faculty!: string
 
-  @Field(() => String)
-  studyProgram!: string
+  @Field({ nullable: true })
+  studyProgram?: string
 
-  @Field(() => String)
-  degree!: string
+  @Field({ nullable: true })
+  degree?: string
 }
diff --git a/libs/api/domains/work-machines/src/lib/models/getWorkMachines.ts b/libs/api/domains/work-machines/src/lib/models/getWorkMachines.ts
index 15c38882cb06..0a907fc9d8e4 100644
--- a/libs/api/domains/work-machines/src/lib/models/getWorkMachines.ts
+++ b/libs/api/domains/work-machines/src/lib/models/getWorkMachines.ts
@@ -1,4 +1,10 @@
-import { Field, ID, ObjectType, registerEnumType } from '@nestjs/graphql'
+import {
+  Field,
+  GraphQLISODateTime,
+  ID,
+  ObjectType,
+  registerEnumType,
+} from '@nestjs/graphql'
 import { Action, ExternalLink } from '../workMachines.types'
 import { PaginatedResponse } from '@island.is/nest/pagination'
 
@@ -24,8 +30,8 @@ export class WorkMachine {
   @Field(() => String, { nullable: true })
   subCategory?: string | null
 
-  @Field(() => String, { nullable: true })
-  dateLastInspection?: string | null
+  @Field(() => GraphQLISODateTime, { nullable: true })
+  dateLastInspection?: Date
 
   @Field(() => String, { nullable: true })
   registrationNumber?: string | null
diff --git a/libs/api/domains/work-machines/src/lib/workMachines.resolver.ts b/libs/api/domains/work-machines/src/lib/workMachines.resolver.ts
index 00810c5d5785..de0f5add00b0 100644
--- a/libs/api/domains/work-machines/src/lib/workMachines.resolver.ts
+++ b/libs/api/domains/work-machines/src/lib/workMachines.resolver.ts
@@ -177,7 +177,12 @@ export class WorkMachinesResolver {
   async getTechnicalInfoInputs(
     @CurrentUser() auth: User,
     @Args('parentCategory') parentCategory: string,
+    @Args('subCategory') subCategory: string,
   ) {
-    return this.workMachinesService.getTechnicalInfoInputs(auth, parentCategory)
+    return this.workMachinesService.getTechnicalInfoInputs(
+      auth,
+      parentCategory,
+      subCategory,
+    )
   }
 }
diff --git a/libs/api/domains/work-machines/src/lib/workMachines.service.ts b/libs/api/domains/work-machines/src/lib/workMachines.service.ts
index 662426fc302d..cee1ca0ffc09 100644
--- a/libs/api/domains/work-machines/src/lib/workMachines.service.ts
+++ b/libs/api/domains/work-machines/src/lib/workMachines.service.ts
@@ -79,6 +79,9 @@ export class WorkMachinesService {
       (v) =>
         ({
           ...v,
+          dateLastInspection: v.dateLastInspection
+            ? new Date(v.dateLastInspection)
+            : undefined,
           ownerName: v.owner,
           supervisorName: v.supervisor,
         } as WorkMachine),
@@ -132,6 +135,9 @@ export class WorkMachinesService {
 
     return {
       ...data,
+      dateLastInspection: data.dateLastInspection
+        ? new Date(data.dateLastInspection)
+        : undefined,
       links,
     }
   }
@@ -187,7 +193,11 @@ export class WorkMachinesService {
   async getTechnicalInfoInputs(
     auth: User,
     parentCategory: string,
+    subCategory: string,
   ): Promise<TechInfoItemDto[]> {
-    return this.machineService.getTechnicalInfoInputs(auth, { parentCategory })
+    return this.machineService.getTechnicalInfoInputs(auth, {
+      parentCategory,
+      subCategory,
+    })
   }
 }
diff --git a/libs/application/api/files/src/lib/file.service.spec.ts b/libs/application/api/files/src/lib/file.service.spec.ts
index 3d73ecf13ce8..b435792757ae 100644
--- a/libs/application/api/files/src/lib/file.service.spec.ts
+++ b/libs/application/api/files/src/lib/file.service.spec.ts
@@ -13,7 +13,6 @@ import { LoggingModule } from '@island.is/logging'
 import { NotFoundException } from '@nestjs/common'
 import { defineConfig, ConfigModule } from '@island.is/nest/config'
 import { FileStorageConfig } from '@island.is/file-storage'
-import { GetObjectCommandOutput } from '@aws-sdk/client-s3'
 
 describe('FileService', () => {
   let service: FileService
@@ -130,12 +129,9 @@ describe('FileService', () => {
 
     awsService = module.get(AwsService)
 
-    jest.spyOn(awsService, 'getFile').mockImplementation(
-      async () =>
-        ({
-          Body: { transformToString: () => 'body' },
-        } as unknown as GetObjectCommandOutput),
-    )
+    jest
+      .spyOn(awsService, 'getFile')
+      .mockImplementation(() => Promise.resolve({ Body: 'body' }))
 
     jest.spyOn(awsService, 'fileExists').mockResolvedValue(false)
 
@@ -199,11 +195,10 @@ describe('FileService', () => {
       PdfTypes.CHILDREN_RESIDENCE_CHANGE,
     )
 
-    expect(awsService.getFile).toHaveBeenCalledWith({
-      bucket: bucket,
-      fileName: `children-residence-change/${application.id}.pdf`,
-      encoding: 'binary',
-    })
+    expect(awsService.getFile).toHaveBeenCalledWith(
+      bucket,
+      `children-residence-change/${application.id}.pdf`,
+    )
 
     expect(signingService.requestSignature).toHaveBeenCalledWith(
       parentAWithContactInfo.phoneNumber,
@@ -225,12 +220,9 @@ describe('FileService', () => {
   it('should throw error for request file signature since file content is missing', async () => {
     const application = createApplication()
 
-    jest.spyOn(awsService, 'getFile').mockImplementation(
-      async () =>
-        ({
-          Body: { transformToString: () => '' },
-        } as unknown as GetObjectCommandOutput),
-    )
+    jest
+      .spyOn(awsService, 'getFile')
+      .mockImplementation(() => Promise.resolve({ Body: '' }))
 
     const act = async () =>
       await service.requestFileSignature(
@@ -240,11 +232,10 @@ describe('FileService', () => {
 
     await expect(act).rejects.toThrowError(NotFoundException)
 
-    expect(awsService.getFile).toHaveBeenCalledWith({
-      bucket: bucket,
-      fileName: `children-residence-change/${applicationId}.pdf`,
-      encoding: 'binary',
-    })
+    expect(awsService.getFile).toHaveBeenCalledWith(
+      bucket,
+      `children-residence-change/${applicationId}.pdf`,
+    )
 
     expect(signingService.requestSignature).not.toHaveBeenCalled()
   })
@@ -306,8 +297,6 @@ describe('FileService', () => {
         PdfTypes.CHILDREN_RESIDENCE_CHANGE,
       )
 
-    // The resolves are `undefined` 🥹
-    // await expect(act()).resolves.toBeTruthy()
     await expect(act).resolves
   })
 
@@ -334,7 +323,7 @@ describe('FileService', () => {
         PdfTypes.CHILDREN_RESIDENCE_CHANGE,
       )
 
-    await expect(act()).resolves.toBeTruthy()
+    await expect(act).resolves
   })
 
   it('should throw error for getPresignedUrl since application type is not supported', async () => {
diff --git a/libs/application/api/files/src/lib/file.service.ts b/libs/application/api/files/src/lib/file.service.ts
index 9c04fc543059..de85db0e2ab2 100644
--- a/libs/application/api/files/src/lib/file.service.ts
+++ b/libs/application/api/files/src/lib/file.service.ts
@@ -148,11 +148,8 @@ export class FileService {
   ) {
     const bucket = this.getBucketName()
     const s3FileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
-    const fileContent = await this.awsService.getFileEncoded({
-      bucket,
-      fileName: s3FileName,
-      encoding: 'binary',
-    })
+    const s3File = await this.awsService.getFile(bucket, s3FileName)
+    const fileContent = s3File.Body?.toString('binary')
 
     const { phoneNumber, name, title } = this.getSigningOptionsFromApplication(
       application,
diff --git a/libs/application/api/payment/src/lib/payment.controller.ts b/libs/application/api/payment/src/lib/payment.controller.ts
index 1bb0612d8ea8..10635784a92b 100644
--- a/libs/application/api/payment/src/lib/payment.controller.ts
+++ b/libs/application/api/payment/src/lib/payment.controller.ts
@@ -6,7 +6,13 @@ import {
   ParseUUIDPipe,
 } from '@nestjs/common'
 
-import { ApiParam, ApiTags, ApiHeader, ApiOkResponse } from '@nestjs/swagger'
+import {
+  ApiParam,
+  ApiTags,
+  ApiHeader,
+  ApiOkResponse,
+  ApiBearerAuth,
+} from '@nestjs/swagger'
 import type { User } from '@island.is/auth-nest-tools'
 import {
   IdsUserGuard,
@@ -20,10 +26,7 @@ import { PaymentStatusResponseDto } from './dto/paymentStatusResponse.dto'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @ApiTags('payments')
-@ApiHeader({
-  name: 'authorization',
-  description: 'Bearer token authorization',
-})
+@ApiBearerAuth()
 @ApiHeader({
   name: 'locale',
   description: 'Front-end language selected',
diff --git a/libs/application/api/payment/src/lib/payment.service.ts b/libs/application/api/payment/src/lib/payment.service.ts
index d4970d144755..579f2f82b4fb 100644
--- a/libs/application/api/payment/src/lib/payment.service.ts
+++ b/libs/application/api/payment/src/lib/payment.service.ts
@@ -124,7 +124,7 @@ export class PaymentService {
     return `${this.config.arkBaseUrl}/quickpay/pay?doc_num=${docNum}`
   }
 
-  private async setUser4(
+  async setUser4(
     applicationId: string,
     paymentId: string,
     user4: string,
diff --git a/libs/application/core/src/lib/ApplicationTemplateHelper.ts b/libs/application/core/src/lib/ApplicationTemplateHelper.ts
index 856e105b2e59..f7d35edcd394 100644
--- a/libs/application/core/src/lib/ApplicationTemplateHelper.ts
+++ b/libs/application/core/src/lib/ApplicationTemplateHelper.ts
@@ -71,6 +71,7 @@ export class ApplicationTemplateHelper<
     title?: StaticText
     description?: StaticText
     tag: { variant?: string; label?: StaticText }
+    historyButton?: StaticText
   } {
     const actionCard =
       this.template.stateMachineConfig.states[stateKey]?.meta?.actionCard
@@ -79,6 +80,7 @@ export class ApplicationTemplateHelper<
       title: actionCard?.title,
       description: actionCard?.description,
       tag: { variant: actionCard?.tag?.variant, label: actionCard?.tag?.label },
+      historyButton: actionCard?.historyButton,
     }
   }
 
@@ -281,6 +283,7 @@ export class ApplicationTemplateHelper<
         displayStatus: action.displayStatus,
         content: action.content ? formatMessage(action.content) : undefined,
         title: action.title ? formatMessage(action.title) : undefined,
+        button: action.button ? formatMessage(action.button) : undefined,
       }
     }
     return {
@@ -291,6 +294,9 @@ export class ApplicationTemplateHelper<
       content: pendingAction.content
         ? formatMessage(pendingAction.content)
         : undefined,
+      button: pendingAction.button
+        ? formatMessage(pendingAction.button)
+        : undefined,
     }
   }
 
diff --git a/libs/application/core/src/lib/fieldBuilders.ts b/libs/application/core/src/lib/fieldBuilders.ts
index 9bfd3ff57602..049cba433e2f 100644
--- a/libs/application/core/src/lib/fieldBuilders.ts
+++ b/libs/application/core/src/lib/fieldBuilders.ts
@@ -145,10 +145,11 @@ export function buildDescriptionField(
     space,
     marginBottom,
     marginTop,
+    doesNotRequireAnswer = true,
   } = data
   return {
     ...extractCommonFields(data),
-    doesNotRequireAnswer: true,
+    doesNotRequireAnswer,
     children: undefined,
     description,
     titleVariant,
@@ -277,6 +278,8 @@ export function buildTextField(
     rows,
     required,
     maxLength,
+    max,
+    min,
     readOnly,
     rightAlign,
     onChange,
@@ -294,6 +297,8 @@ export function buildTextField(
     maxLength,
     readOnly,
     rightAlign,
+    max,
+    min,
     onChange,
     type: FieldTypes.TEXT,
     component: FieldComponents.TEXT,
diff --git a/libs/application/graphql/src/lib/fragments/application.ts b/libs/application/graphql/src/lib/fragments/application.ts
index 5e64efc54701..0762f3efb34e 100644
--- a/libs/application/graphql/src/lib/fragments/application.ts
+++ b/libs/application/graphql/src/lib/fragments/application.ts
@@ -20,6 +20,7 @@ export const ApplicationFragment = gql`
         displayStatus
         content
         title
+        button
       }
       history {
         log
@@ -28,6 +29,7 @@ export const ApplicationFragment = gql`
       deleteButton
       draftTotalSteps
       draftFinishedSteps
+      historyButton
     }
     typeId
     answers
diff --git a/libs/application/template-api-modules/README.md b/libs/application/template-api-modules/README.md
index a999621114d9..4a868c3b6fe2 100644
--- a/libs/application/template-api-modules/README.md
+++ b/libs/application/template-api-modules/README.md
@@ -417,3 +417,29 @@ import { SharedApi } from '@island.is/application/types'
     },
 
 ```
+
+## Enabling payment mocking
+
+To enable payment mocking on dev and local you need to add `enableMockPayment: true` to the arguments object passed to the
+`buildExternalDataProvider` function when constructing your `approveExternalData` field.
+
+A simple example of this can be found in `libs/application/templates/example-payment/src/forms/draft.ts`
+
+```typescript
+buildExternalDataProvider({
+          title: m.draft.externalDataTitle,
+          id: 'approveExternalData',
+          subTitle: m.draft.externalDataTitle,
+          checkboxLabel: m.draft.externalDataTitle,
+          enableMockPayment: true,
+          dataProviders: [
+            buildDataProviderItem({
+              provider: PaymentCatalogApi,
+              title: m.draft.feeInfo,
+            }),
+          ],
+        }),
+
+```
+
+This will cause a checkbox saying "Enable mock payment" to be shown that if checked will cause the payment step to be skipped.
diff --git a/libs/application/template-api-modules/src/lib/modules/shared/api/payment/payment.service.ts b/libs/application/template-api-modules/src/lib/modules/shared/api/payment/payment.service.ts
index 96c22bc975a5..c6ceb34a56e1 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/api/payment/payment.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/api/payment/payment.service.ts
@@ -3,24 +3,34 @@ import {
   PaymentCatalogItem,
   PaymentCatalogParameters,
 } from '@island.is/application/types'
-import { TemplateApiModuleActionProps } from '../../../../types'
+import {
+  BaseTemplateAPIModuleConfig,
+  TemplateApiModuleActionProps,
+} from '../../../../types'
 import { ChargeFjsV2ClientService } from '@island.is/clients/charge-fjs-v2'
-import { Injectable } from '@nestjs/common'
+import { Inject, Injectable } from '@nestjs/common'
 import { BaseTemplateApiService } from '../../../base-template-api.service'
 import { PaymentService as PaymentModelService } from '@island.is/application/api/payment'
 import { TemplateApiError } from '@island.is/nest/problem'
+import { getSlugFromType } from '@island.is/application/core'
+import { getConfigValue } from '../../shared.utils'
+import { ConfigService } from '@nestjs/config'
+import { uuid } from 'uuidv4'
 
 @Injectable()
 export class PaymentService extends BaseTemplateApiService {
   constructor(
     private chargeFjsV2ClientService: ChargeFjsV2ClientService,
     private readonly paymentModelService: PaymentModelService,
+    @Inject(ConfigService)
+    private readonly configService: ConfigService<BaseTemplateAPIModuleConfig>,
   ) {
     super('Payment')
   }
 
   async paymentCatalog({
     params,
+    application,
   }: TemplateApiModuleActionProps<PaymentCatalogParameters>): Promise<
     PaymentCatalogItem[]
   > {
@@ -40,6 +50,48 @@ export class PaymentService extends BaseTemplateApiService {
     params,
   }: TemplateApiModuleActionProps<CreateChargeParameters>) {
     const { organizationId, chargeItemCodes, extraData } = params ?? {}
+    const { shouldUseMockPayment } = application.answers
+
+    if (shouldUseMockPayment) {
+      const list = [
+        {
+          performingOrgID: organizationId ?? 'string',
+          chargeType: ' string',
+          chargeItemCode: 'string',
+          chargeItemName: 'string',
+          priceAmount: 123123,
+        },
+      ]
+
+      const result = await this.paymentModelService.createPaymentModel(
+        list,
+        application.id,
+        organizationId ?? 'string',
+      )
+
+      await this.paymentModelService.setUser4(
+        application.id,
+        result.id,
+        'newser4',
+      )
+
+      await this.paymentModelService.fulfillPayment(
+        result.id,
+        result.reference_id ?? uuid(),
+        application.id,
+      )
+
+      const slug = getSlugFromType(application.typeId)
+      const clientLocationOrigin = getConfigValue(
+        this.configService,
+        'clientLocationOrigin',
+      ) as string
+
+      return {
+        id: result.id,
+        paymentUrl: `${clientLocationOrigin}/${slug}/${application.id}`,
+      }
+    }
 
     if (!organizationId) throw Error('Missing performing organization ID')
     if (!chargeItemCodes) throw Error('No selected charge item code')
diff --git a/libs/application/template-api-modules/src/lib/modules/shared/services/attachment-s3.service.ts b/libs/application/template-api-modules/src/lib/modules/shared/services/attachment-s3.service.ts
index 7170bab64de2..f1b5adde4890 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/services/attachment-s3.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/services/attachment-s3.service.ts
@@ -1,7 +1,8 @@
 import { getValueViaPath } from '@island.is/application/core'
 import { ApplicationWithAttachments as Application } from '@island.is/application/types'
+import { S3 } from 'aws-sdk'
+import AmazonS3URI from 'amazon-s3-uri'
 import { logger } from '@island.is/logging'
-import { AwsService } from '@island.is/nest/aws'
 import { Injectable } from '@nestjs/common'
 
 export interface AttachmentData {
@@ -13,33 +14,22 @@ export interface AttachmentData {
 
 @Injectable()
 export class AttachmentS3Service {
-  constructor(private readonly awsService: AwsService) {}
+  private readonly s3: AWS.S3
+  constructor() {
+    this.s3 = new S3()
+  }
 
-  /**
-   * This function retrieves files from an application based on provided attachment keys.
-   * It iterates over the attachment keys, retrieves the corresponding answers from the application,
-   * and converts them into a list of document data. The resulting list of document data is then returned.
-   *
-   * @param {Application} application - The application from which to retrieve files.
-   * @param {string[]} attachmentAnswerKeys - The keys of the attachments to retrieve.
-   * @returns {Promise<AttachmentData[]>} - A promise that resolves to an array of attachment data.
-   */
   public async getFiles(
     application: Application,
-    attachmentAnswerKeys: string | string[],
+    attachmentAnswerKeys: string[],
   ): Promise<AttachmentData[]> {
-    if (!Array.isArray(attachmentAnswerKeys)) {
-      attachmentAnswerKeys = [attachmentAnswerKeys]
-    }
     const attachments: AttachmentData[] = []
 
     for (const key of attachmentAnswerKeys) {
-      const answers = getValueViaPath<
-        Array<{
-          key: string
-          name: string
-        }>
-      >(application.answers, key)
+      const answers = getValueViaPath(application.answers, key) as Array<{
+        key: string
+        name: string
+      }>
       if (!answers) continue
       const list = await this.toDocumentDataList(answers, key, application)
       attachments.push(...list)
@@ -78,8 +68,17 @@ export class AttachmentS3Service {
   private async getApplicationFilecontentAsBase64(
     fileName: string,
   ): Promise<string | undefined> {
+    const { bucket, key } = AmazonS3URI(fileName)
+    const uploadBucket = bucket
     try {
-      return this.awsService.getFileBase64({ s3Uri: fileName })
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64')
     } catch (error) {
       logger.error(error)
       return undefined
diff --git a/libs/application/template-api-modules/src/lib/modules/shared/shared.module.ts b/libs/application/template-api-modules/src/lib/modules/shared/shared.module.ts
index b9df3f440074..2473e3838fec 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/shared.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/shared.module.ts
@@ -2,7 +2,7 @@ import { DynamicModule } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
 import { EmailModule } from '@island.is/email-service'
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
-import { AwsModule, AwsService } from '@island.is/nest/aws'
+import { AwsModule } from '@island.is/nest/aws'
 import {
   BaseTemplateAPIModuleConfig,
   BaseTemplateApiApplicationService,
@@ -35,7 +35,6 @@ export class SharedTemplateAPIModule {
           useClass: config.applicationService,
         },
         AttachmentS3Service,
-        AwsService,
       ],
       exports: [SharedTemplateApiService, AttachmentS3Service],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/shared/shared.service.ts b/libs/application/template-api-modules/src/lib/modules/shared/shared.service.ts
index a454da870f95..398c9537a598 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/shared.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/shared.service.ts
@@ -19,13 +19,15 @@ import { getConfigValue } from './shared.utils'
 import type { Logger } from '@island.is/logging'
 import { LOGGER_PROVIDER } from '@island.is/logging'
 import { SmsService } from '@island.is/nova-sms'
+import { S3 } from 'aws-sdk'
+import AmazonS3URI from 'amazon-s3-uri'
 import { PaymentService } from '@island.is/application/api/payment'
 import { User } from '@island.is/auth-nest-tools'
 import { ExtraData } from '@island.is/clients/charge-fjs-v2'
-import { AwsService, Encoding } from '@island.is/nest/aws'
 
 @Injectable()
 export class SharedTemplateApiService {
+  s3: S3
   constructor(
     @Inject(LOGGER_PROVIDER)
     private readonly logger: Logger,
@@ -38,8 +40,9 @@ export class SharedTemplateApiService {
     @Inject(BaseTemplateApiApplicationService)
     private readonly applicationService: BaseTemplateApiApplicationService,
     private readonly paymentService: PaymentService,
-    private readonly awsService: AwsService,
-  ) {}
+  ) {
+    this.s3 = new S3()
+  }
 
   async createAssignToken(application: Application, expiresIn: number) {
     const token = await this.applicationService.createAssignToken(
@@ -150,13 +153,10 @@ export class SharedTemplateApiService {
   async sendEmailWithAttachment(
     templateGenerator: AttachmentEmailTemplateGenerator,
     application: Application,
-    fileContent: Parameters<AttachmentEmailTemplateGenerator>[1],
+    fileContent: string,
     recipientEmail: string,
     locale = 'is',
   ) {
-    this.logger.debug('Sending email with attachment', {
-      applicationId: application.id,
-    })
     const clientLocationOrigin = getConfigValue(
       this.configService,
       'clientLocationOrigin',
@@ -245,33 +245,29 @@ export class SharedTemplateApiService {
   async getS3File(
     application: ApplicationWithAttachments,
     attachmentKey: string,
-  ): Promise<ReturnType<AwsService['getFile']>>
-  async getS3File(
-    application: ApplicationWithAttachments,
-    attachmentKey: string,
-    encoding: Encoding,
-  ): Promise<string | undefined>
-  async getS3File(
-    application: ApplicationWithAttachments,
-    attachmentKey: string,
-    encoding?: Encoding,
-  ): Promise<ReturnType<AwsService['getFile']> | string | undefined> {
+  ) {
     const fileName = (
       application.attachments as {
         [key: string]: string
       }
     )[attachmentKey]
-    if (encoding)
-      return await this.awsService.getFileEncoded({ fileName, encoding })
-    return await this.awsService.getFile({ fileName })
+    const { bucket, key } = AmazonS3URI(fileName)
+    const file = await this.s3
+      .getObject({
+        Bucket: bucket,
+        Key: key,
+      })
+      .promise()
+    return file
   }
 
   async getAttachmentContentAsBase64(
     application: ApplicationWithAttachments,
     attachmentKey: string,
   ): Promise<string> {
-    const fileContent = (await this.getS3File(application, attachmentKey))?.Body
-    return fileContent?.transformToString('base64') || ''
+    const fileContent = (await this.getS3File(application, attachmentKey))
+      ?.Body as Buffer
+    return fileContent?.toString('base64') || ''
   }
 
   async getAttachmentContentAsBlob(
@@ -279,11 +275,26 @@ export class SharedTemplateApiService {
     attachmentKey: string,
   ): Promise<Blob> {
     const file = await this.getS3File(application, attachmentKey)
-    if (!file.Body) {
-      return new Blob([], { type: file.ContentType })
+    return new Blob([file.Body as ArrayBuffer], { type: file.ContentType })
+  }
+
+  async getAttachmentUrl(key: string, expiration: number): Promise<string> {
+    if (expiration <= 0) {
+      return Promise.reject('expiration must be positive')
     }
-    return new Blob([await file.Body.transformToByteArray()], {
-      type: file.ContentType,
+
+    const bucket = this.configService.get('attachmentBucket') as
+      | string
+      | undefined
+
+    if (bucket == undefined) {
+      return Promise.reject('could not find s3 bucket')
+    }
+
+    return this.s3.getSignedUrlPromise('getObject', {
+      Bucket: bucket,
+      Key: key,
+      Expires: expiration,
     })
   }
 }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts
index dd40badb54a3..c3d21f0fbc8f 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts
@@ -6,7 +6,8 @@ import { AccidentNotificationService } from './accident-notification.service'
 import { HealthInsuranceV2ClientModule } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { ApplicationAttachmentService } from './attachments/applicationAttachment.service'
 import { AccidentNotificationAttachmentProvider } from './attachments/applicationAttachmentProvider'
-import { AwsService } from '@island.is/nest/aws'
+import { S3 } from 'aws-sdk'
+import { S3Service } from './attachments/s3.service'
 
 const applicationRecipientName =
   process.env.ACCIDENT_NOTIFICATION_APPLICATION_RECIPIENT_NAME ?? ''
@@ -40,9 +41,10 @@ export class AccidentNotificationModule {
         AccidentNotificationService,
         ApplicationAttachmentService,
         AccidentNotificationAttachmentProvider,
+        S3Service,
         {
-          provide: AwsService,
-          useValue: new AwsService(),
+          provide: S3,
+          useValue: new S3(),
         },
       ],
       exports: [AccidentNotificationService],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts
index e47be4f5ee40..55e60124b910 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts
@@ -14,14 +14,14 @@ import { ApplicationAttachmentService } from './attachments/applicationAttachmen
 import { ACCIDENT_NOTIFICATION_CONFIG } from './config'
 import { DocumentApi } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { createCurrentUser } from '@island.is/testing/fixtures'
+import { S3 } from 'aws-sdk'
 import type { Locale } from '@island.is/shared/types'
 import { createApplication } from '@island.is/application/testing'
 import get from 'lodash/get'
 import set from 'lodash/set'
+import { S3Service } from './attachments/s3.service'
 import { SmsService } from '@island.is/nova-sms'
 import { PaymentService } from '@island.is/application/api/payment'
-import { AwsService } from '@island.is/nest/aws'
-
 const nationalId = '1234564321'
 let id = 0
 
@@ -48,9 +48,16 @@ class MockSmsService {
   }
 }
 
+const S3Instance = {
+  upload: jest.fn().mockReturnThis(),
+  promise: jest.fn(),
+  deleteObject: jest.fn().mockReturnThis(),
+  getObject: jest.fn().mockReturnThis(),
+}
+
 describe('AccidentNotificationService', () => {
   let accidentNotificationService: AccidentNotificationService
-  let aws: AwsService
+  let s3Service: S3Service
   let documentApi: DocumentApi
 
   beforeEach(async () => {
@@ -73,6 +80,10 @@ describe('AccidentNotificationService', () => {
             },
           })),
         },
+        {
+          provide: S3,
+          useFactory: () => S3Instance,
+        },
         {
           provide: ConfigService,
           useValue: {},
@@ -90,9 +101,9 @@ describe('AccidentNotificationService', () => {
           useClass: MockSmsService,
         },
         {
-          provide: AwsService,
+          provide: S3Service,
           useClass: jest.fn(() => ({
-            getFileBase64: jest.fn(),
+            getFilecontentAsBase64: jest.fn(),
           })),
         },
         {
@@ -114,7 +125,7 @@ describe('AccidentNotificationService', () => {
     }).compile()
 
     accidentNotificationService = module.get(AccidentNotificationService)
-    aws = module.get(AwsService)
+    s3Service = module.get(S3Service)
     documentApi = module.get(DocumentApi)
   })
 
@@ -202,7 +213,7 @@ describe('AccidentNotificationService', () => {
       }
 
       jest
-        .spyOn(aws, 'getFileBase64')
+        .spyOn(s3Service, 'getFilecontentAsBase64')
         .mockResolvedValueOnce(
           Buffer.from('some content', 'utf-8') as unknown as string,
         )
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/applicationAttachment.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/applicationAttachment.service.ts
index a4847cf67af1..62516ce162b5 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/applicationAttachment.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/applicationAttachment.service.ts
@@ -2,8 +2,8 @@ import { getValueViaPath } from '@island.is/application/core'
 import { ApplicationWithAttachments as Application } from '@island.is/application/types'
 
 import { logger } from '@island.is/logging'
-import { AwsService } from '@island.is/nest/aws'
 import { Injectable } from '@nestjs/common'
+import { S3Service } from './s3.service'
 
 export interface AttachmentData {
   key: string
@@ -14,7 +14,7 @@ export interface AttachmentData {
 
 @Injectable()
 export class ApplicationAttachmentService {
-  constructor(private readonly awsService: AwsService) {}
+  constructor(private readonly s3Service: S3Service) {}
 
   public async getFiles(
     application: Application,
@@ -62,7 +62,7 @@ export class ApplicationAttachmentService {
           return { key: '', fileContent: '', answerKey, fileName: '' }
         }
         const fileContent =
-          (await this.awsService.getFileBase64({ s3Uri: url })) ?? ''
+          (await this.s3Service.getFilecontentAsBase64(url)) ?? ''
 
         return { key, fileContent, answerKey, fileName: name }
       }),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/s3.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/s3.service.ts
new file mode 100644
index 000000000000..9061b7c152b5
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/accident-notification/attachments/s3.service.ts
@@ -0,0 +1,30 @@
+import { logger } from '@island.is/logging'
+import { Injectable } from '@nestjs/common'
+import AmazonS3URI from 'amazon-s3-uri'
+import { S3 } from 'aws-sdk'
+
+@Injectable()
+export class S3Service {
+  constructor(private readonly s3: S3) {}
+
+  public async getFilecontentAsBase64(
+    filUri: string,
+  ): Promise<string | undefined> {
+    const { bucket, key } = AmazonS3URI(filUri)
+    const uploadBucket = bucket
+    try {
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64')
+    } catch (error) {
+      logger.error(error)
+      return undefined
+    }
+  }
+}
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..5d0958d27374 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,8 @@ import {
 } from '@island.is/clients/syslumenn'
 import {
   Answers as aodAnswers,
-  OtherPropertiesEnum,
+  FirearmApplicant,
+  PropertiesEnum,
 } from '@island.is/application/templates/announcement-of-death/types'
 import { NationalRegistry, RoleConfirmationEnum, PickRole } from './types'
 import {
@@ -24,7 +25,7 @@ import {
 import { isPerson } from 'kennitala'
 import { BaseTemplateApiService } from '../../base-template-api.service'
 import { Application, ApplicationTypes } from '@island.is/application/types'
-import { coreErrorMessages } from '@island.is/application/core'
+import { coreErrorMessages, YES } from '@island.is/application/core'
 import { TemplateApiError } from '@island.is/nest/problem'
 import { generateFirearmApplicantEmail } from './emailGenerators/firearmApplicantNotification'
 import { SharedTemplateApiService } from '../../shared'
@@ -75,18 +76,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 +223,38 @@ 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),
+        firearm:
+          answers.hadFirearms === YES
+            ? JSON.stringify(answers.firearmApplicant)
+            : JSON.stringify({
+                email: '',
+                phone: '',
+                name: '',
+                nationalId: '',
+              }),
         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/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.service.ts
index 57f3c6e42a03..6750c34a3f4a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.service.ts
@@ -64,7 +64,7 @@ export class RegisterNewMachineTemplateService extends BaseTemplateApiService {
     const techInfo = {} as { [key: string]: string | undefined }
 
     answers.techInfo.forEach(({ variableName, value }) => {
-      if (variableName) {
+      if (variableName && value) {
         techInfo[variableName] = value
       }
     })
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.module.ts
index cf82d718d71c..7034ce395966 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.module.ts
@@ -1,12 +1,13 @@
 import { DynamicModule } from '@nestjs/common'
 import { BaseTemplateAPIModuleConfig } from '../../../types'
-import { ChildrenResidenceChangeService } from './children-residence-change.service'
-import { PRESIGNED_BUCKET } from './constants'
+import {
+  ChildrenResidenceChangeService,
+  PRESIGNED_BUCKET,
+} from './children-residence-change.service'
 import { SyslumennClientModule } from '@island.is/clients/syslumenn'
 import { NationalRegistryClientModule } from '@island.is/clients/national-registry-v2'
 import { SharedTemplateAPIModule } from '../../shared'
 import { SmsModule } from '@island.is/nova-sms'
-import { AwsService } from '@island.is/nest/aws'
 
 export class ChildrenResidenceChangeModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -19,7 +20,6 @@ export class ChildrenResidenceChangeModule {
         NationalRegistryClientModule,
       ],
       providers: [
-        AwsService,
         {
           provide: PRESIGNED_BUCKET,
           useFactory: () => config.presignBucket,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.service.ts
index 3a2b08e73465..c531da5ef489 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@nestjs/common'
+import { Injectable, Inject } from '@nestjs/common'
 import { TemplateApiModuleActionProps } from '../../../types'
 import {
   SyslumennService,
@@ -13,7 +13,7 @@ import {
 } from '@island.is/application/templates/family-matters-core/utils'
 import { Override } from '@island.is/application/templates/family-matters-core/types'
 import { CRCApplication } from '@island.is/application/templates/children-residence-change'
-import { PRESIGNED_BUCKET } from './constants'
+import { S3 } from 'aws-sdk'
 import { SharedTemplateApiService } from '../../shared'
 import {
   generateApplicationSubmittedEmail,
@@ -25,7 +25,9 @@ import { SmsService } from '@island.is/nova-sms'
 import { syslumennDataFromPostalCode } from './utils'
 import { applicationRejectedEmail } from './emailGenerators/applicationRejected'
 import { BaseTemplateApiService } from '../../base-template-api.service'
-import { AwsService } from '@island.is/nest/aws'
+import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
+
+export const PRESIGNED_BUCKET = 'PRESIGNED_BUCKET'
 
 type props = Override<
   TemplateApiModuleActionProps,
@@ -34,14 +36,17 @@ type props = Override<
 
 @Injectable()
 export class ChildrenResidenceChangeService extends BaseTemplateApiService {
+  s3: S3
+
   constructor(
     private readonly syslumennService: SyslumennService,
-    private readonly sharedTemplateAPIService: SharedTemplateApiService,
     @Inject(PRESIGNED_BUCKET) private readonly presignedBucket: string,
+    private readonly sharedTemplateAPIService: SharedTemplateApiService,
     private readonly smsService: SmsService,
-    private readonly awsService: AwsService,
+    private nationalRegistryApi: NationalRegistryClientService,
   ) {
     super(ApplicationTypes.CHILDREN_RESIDENCE_CHANGE)
+    this.s3 = new S3()
   }
 
   async submitApplication({ application }: props) {
@@ -49,10 +54,10 @@ export class ChildrenResidenceChangeService extends BaseTemplateApiService {
     const { nationalRegistry } = externalData
     const applicant = nationalRegistry.data
     const s3FileName = `children-residence-change/${application.id}.pdf`
-    const file = await this.awsService.getFile({
-      bucket: this.presignedBucket,
-      fileName: s3FileName,
-    })
+    const file = await this.s3
+      .getObject({ Bucket: this.presignedBucket, Key: s3FileName })
+      .promise()
+    const fileContent = file.Body as Buffer
 
     const selectedChildren = getSelectedChildrenFromExternalData(
       externalData.childrenCustodyInformation.data,
@@ -68,16 +73,14 @@ export class ChildrenResidenceChangeService extends BaseTemplateApiService {
     )
     const currentAddress = childResidenceInfo?.current?.address
 
-    if (!file.Body) {
+    if (!fileContent) {
       throw new Error('File content was undefined')
     }
-    const fileB64 = await file.Body.transformToString('base64')
-    const fileBinary = await file.Body.transformToString('binary')
 
     const attachments: Attachment[] = [
       {
         name: `Lögheimilisbreyting-barns-${applicant.nationalId}.pdf`,
-        content: fileB64,
+        content: fileContent.toString('base64'),
       },
     ]
 
@@ -149,7 +152,7 @@ export class ChildrenResidenceChangeService extends BaseTemplateApiService {
         await this.sharedTemplateAPIService.sendEmailWithAttachment(
           generateSyslumennNotificationEmail,
           application as unknown as Application,
-          fileBinary,
+          fileContent.toString('binary'),
           syslumennData.email,
         )
         return undefined
@@ -159,7 +162,7 @@ export class ChildrenResidenceChangeService extends BaseTemplateApiService {
       (props) =>
         generateApplicationSubmittedEmail(
           props,
-          fileBinary,
+          fileContent.toString('binary'),
           answers.parentA.email,
           syslumennData.name,
           response?.caseNumber,
@@ -171,7 +174,7 @@ export class ChildrenResidenceChangeService extends BaseTemplateApiService {
       (props) =>
         generateApplicationSubmittedEmail(
           props,
-          fileBinary,
+          fileContent.toString('binary'),
           answers.parentB.email,
           syslumennData.name,
           response?.caseNumber,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/constants.ts b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/constants.ts
deleted file mode 100644
index fc4d7a36b13d..000000000000
--- a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const PRESIGNED_BUCKET = 'PRESIGNED_BUCKET'
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/emailGenerators/applicationSubmitted.ts b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/emailGenerators/applicationSubmitted.ts
index 8d2a80da2bdc..32f5a50d5ce9 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/emailGenerators/applicationSubmitted.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/emailGenerators/applicationSubmitted.ts
@@ -8,13 +8,12 @@ import {
   ulStyles,
   liStyles,
 } from './consts'
-import { Address, Attachment } from 'nodemailer/lib/mailer'
 
 interface ApplicationSubmittedEmail {
   (
     props: EmailTemplateGeneratorProps,
-    fileContent: Attachment['content'],
-    recipientEmail: Address['address'],
+    fileContent: string,
+    recipientEmail: string,
     syslumennName: string,
     caseNumber?: string,
   ): SendMailOptions
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/attachment-s3.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/attachment-s3.service.ts
new file mode 100644
index 000000000000..1be7582c8a7b
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/attachment-s3.service.ts
@@ -0,0 +1,95 @@
+import { getValueViaPath } from '@island.is/application/core'
+import { ApplicationWithAttachments as Application } from '@island.is/application/types'
+import { S3 } from 'aws-sdk'
+import AmazonS3URI from 'amazon-s3-uri'
+import { logger } from '@island.is/logging'
+import { Injectable } from '@nestjs/common'
+
+export interface AttachmentData {
+  key: string
+  answerKey: string
+  fileContent: string
+  fileName: string
+}
+
+@Injectable()
+export class AttachmentS3Service {
+  private readonly s3: AWS.S3
+  constructor() {
+    this.s3 = new S3()
+  }
+
+  public async getFiles(
+    application: Application,
+    attachmentAnswerKeys: string[],
+  ): Promise<AttachmentData[]> {
+    const attachments: AttachmentData[] = []
+
+    for (let i = 0; i < attachmentAnswerKeys.length; i++) {
+      const answers = getValueViaPath(
+        application.answers,
+        attachmentAnswerKeys[i],
+      ) as Array<{
+        key: string
+        name: string
+      }>
+      if (!answers) continue
+      const list = await this.toDocumentDataList(
+        answers,
+        attachmentAnswerKeys[i],
+        application,
+      )
+      attachments.push(...list)
+    }
+    return attachments
+  }
+
+  private async toDocumentDataList(
+    answers: Array<{
+      key: string
+      name: string
+    }>,
+    answerKey: string,
+    application: Application,
+  ): Promise<AttachmentData[]> {
+    return await Promise.all(
+      answers.map(async ({ key, name }) => {
+        const url = (
+          application.attachments as {
+            [key: string]: string
+          }
+        )[key]
+
+        if (!url) {
+          logger.info('Failed to get url from application state')
+          return { key: '', fileContent: '', answerKey, fileName: '' }
+        }
+        const fileContent =
+          (await this.getApplicationFilecontentAsBase64(url)) ?? ''
+
+        return { key, fileContent, answerKey, fileName: name }
+      }),
+    )
+  }
+
+  private async getApplicationFilecontentAsBase64(
+    fileName: string,
+  ): Promise<string | undefined> {
+    const { bucket, key } = AmazonS3URI(fileName)
+    const uploadBucket = bucket
+    try {
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64')
+    } catch (error) {
+      logger.log('error ', error)
+      logger.error(error)
+      return undefined
+    }
+  }
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/providers/applicationAttachmentProvider.ts b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/providers/applicationAttachmentProvider.ts
index 4716432c8526..9b4fbc6e9958 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/providers/applicationAttachmentProvider.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/attachments/providers/applicationAttachmentProvider.ts
@@ -1,7 +1,7 @@
 import { ApplicationWithAttachments as Application } from '@island.is/application/types'
 import { DocumentInfo } from '@island.is/clients/data-protection-complaint'
 import { AttachmentType } from '../../models/attachments'
-import { AttachmentS3Service } from '../../../../shared/services'
+import { AttachmentS3Service } from '../attachment-s3.service'
 import { Injectable } from '@nestjs/common'
 
 export interface DocumentBuildInfo {
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/data-protection-complaint.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/data-protection-complaint.module.ts
index e8f81aaeac20..631204c5000c 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/data-protection-complaint.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/data-protection-complaint.module.ts
@@ -13,8 +13,7 @@ import { ClientsDataProtectionComplaintModule } from '@island.is/clients/data-pr
 import { FileStorageModule } from '@island.is/file-storage'
 import { ApplicationAttachmentProvider } from './attachments/providers/applicationAttachmentProvider'
 import { PdfFileProvider } from './attachments/providers/pdfFileProvider'
-import { AttachmentS3Service } from '../../shared/services'
-import { AwsService } from '@island.is/nest/aws'
+import { AttachmentS3Service } from './attachments/attachment-s3.service'
 
 export class DataProtectionComplaintModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -26,7 +25,6 @@ export class DataProtectionComplaintModule {
         ClientsDataProtectionComplaintModule,
       ],
       providers: [
-        AwsService,
         ApplicationAttachmentProvider,
         PdfFileProvider,
         AttachmentS3Service,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.service.ts
index 8a7996ac0047..089b595ffc9b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.service.ts
@@ -306,8 +306,11 @@ export class CitizenshipService extends BaseTemplateApiService {
             }
           }) || [],
         isFormerIcelandicCitizen: answers.formerIcelander === YES,
-        givenName: individual?.givenName,
-        familyName: individual?.familyName,
+        givenName:
+          individual?.givenName ||
+          individual?.fullName.split(' ').slice(0, -1).join(' '), //if given name is not available then remove last name and return the rest of the name as the given name
+        familyName:
+          individual?.familyName || individual?.fullName.split(' ').pop(),
         fullName: individual?.fullName,
         address: individual?.address?.streetAddress,
         postalCode: individual?.address?.postalCode,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.module.ts
index 66f9df154677..21e42a341835 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.module.ts
@@ -2,7 +2,6 @@ import { DynamicModule } from '@nestjs/common'
 
 import { SharedTemplateAPIModule } from '../../shared'
 import { SyslumennClientModule } from '@island.is/clients/syslumenn'
-import { AwsService } from '@island.is/nest/aws'
 
 import { BaseTemplateAPIModuleConfig } from '../../../types'
 
@@ -16,7 +15,7 @@ export class EstateTemplateModule {
         SharedTemplateAPIModule.register(config),
         SyslumennClientModule,
       ],
-      providers: [EstateTemplateService, AwsService],
+      providers: [EstateTemplateService],
       exports: [EstateTemplateService],
     }
   }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.service.ts
index 508da0bc5324..6cb7f6d60cd5 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/estate/estate.service.ts
@@ -28,22 +28,24 @@ import {
   AttachmentPaths,
   ApplicationFile,
 } from './types/attachments'
+import AmazonS3Uri from 'amazon-s3-uri'
+import { S3 } from 'aws-sdk'
 import kennitala from 'kennitala'
 import { EstateTypes } from './consts'
 import { LOGGER_PROVIDER } from '@island.is/logging'
 import type { Logger } from '@island.is/logging'
-import { AwsService } from '@island.is/nest/aws'
 
 type EstateSchema = zinfer<typeof estateSchema>
 
 @Injectable()
 export class EstateTemplateService extends BaseTemplateApiService {
+  s3: S3
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private readonly syslumennService: SyslumennService,
-    private readonly awsService: AwsService,
   ) {
     super(ApplicationTypes.ESTATE)
+    this.s3 = new S3()
   }
 
   async estateProvider({
@@ -217,6 +219,7 @@ export class EstateTemplateService extends BaseTemplateApiService {
 
     const attachments: Attachment[] = []
 
+    // Convert form data to a PDF backup for syslumenn
     const pdfBuffer = await transformUploadDataToPDFStream(
       pdfData,
       application.id,
@@ -240,8 +243,7 @@ export class EstateTemplateService extends BaseTemplateApiService {
           const fileName = (application.attachments as ApplicationAttachments)[
             attachmentAnswerData[index]?.key
           ]
-          const content =
-            (await this.awsService.getFileBase64({ s3Uri: fileName })) ?? ''
+          const content = await this.getFileContentBase64(fileName)
           attachments.push({ name, content })
         }
       }
@@ -266,6 +268,24 @@ export class EstateTemplateService extends BaseTemplateApiService {
       this.logger.error('[estate]: Failed to upload data - ', result.message)
       throw new Error('Application submission failed on syslumadur upload data')
     }
-    return { success: result.success, id: result.caseNumber }
+    return { sucess: result.success, id: result.caseNumber }
+  }
+  private async getFileContentBase64(fileName: string): Promise<string> {
+    const { bucket, key } = AmazonS3Uri(fileName)
+
+    const uploadBucket = bucket
+    try {
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64') || ''
+    } catch (e) {
+      this.logger.warn('[estate]: Failed to get file content - ', e)
+      return 'err'
+    }
   }
 }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/fakeData.ts b/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/fakeData.ts
index ad7247877021..ebb19a1a799e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/fakeData.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/fakeData.ts
@@ -79,16 +79,22 @@ export const getFakeEstateInfo = (
         name: 'Gervimaður Afríka',
         relation: 'Sonur',
         nationalId: '0101303019',
+        email: 'fake@email.com',
+        phone: '9999999',
       },
       {
         name: 'Gervimaður Færeyjar',
         relation: 'Maki',
         nationalId: '0101302399',
+        email: 'fake2@email.com',
+        phone: '9999998',
       },
       {
         name: 'Gervimaður Bretland',
         relation: 'Faðir',
         nationalId: '0101304929',
+        email: 'fake3@email.com',
+        phone: '9999997',
       },
     ],
     caseNumber: `2020-00012${nationalIdOfDeceased.slice(-4)}`,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/mappers.ts b/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/mappers.ts
index 6e6cf78d09ac..af749f55140c 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/mappers.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/estate/utils/mappers.ts
@@ -27,8 +27,8 @@ const estateMemberMapper = (element: EstateMember) => {
     ...element,
     initial: true,
     enabled: true,
-    phone: '',
-    email: '',
+    phone: element.phone ?? '',
+    email: element.email ?? '',
     relationWithApplicant: '',
     noContactInfo: ['No'] as ('Yes' | 'No')[],
     advocate: element.advocate
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.service.ts
index 2a0850681091..1d21f87122b1 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.service.ts
@@ -18,9 +18,14 @@ import {
 import * as kennitala from 'kennitala'
 import { TemplateApiModuleActionProps } from '../../../types'
 import { BaseTemplateApiService } from '../../base-template-api.service'
-import { ApplicationTypes } from '@island.is/application/types'
+import {
+  ApplicationTypes,
+  ApplicationWithAttachments as Application,
+} from '@island.is/application/types'
 import { getValueViaPath } from '@island.is/application/core'
 import AmazonS3URI from 'amazon-s3-uri'
+
+import { S3 } from 'aws-sdk'
 import {
   mapValuesToIndividualtype,
   mapValuesToPartytype,
@@ -28,7 +33,6 @@ import {
 } from './mappers/mapValuesToUsertype'
 import type { Logger } from '@island.is/logging'
 import { LOGGER_PROVIDER } from '@island.is/logging'
-import { SharedTemplateApiService } from '../../shared'
 
 export interface AttachmentData {
   key: string
@@ -52,12 +56,48 @@ export interface DataResponse {
 
 @Injectable()
 export class FinancialStatementsInaoTemplateService extends BaseTemplateApiService {
+  s3: S3
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private financialStatementsClientService: FinancialStatementsInaoClientService,
-    private readonly sharedTemplateAPIService: SharedTemplateApiService,
   ) {
     super(ApplicationTypes.FINANCIAL_STATEMENTS_INAO)
+    this.s3 = new S3()
+  }
+
+  private async getAttachment(application: Application): Promise<string> {
+    const attachments: AttachmentData[] | undefined = getValueViaPath(
+      application.answers,
+      'attachments.file',
+    ) as Array<{ key: string; name: string }>
+
+    const attachmentKey = attachments[0].key
+
+    const fileName = (
+      application.attachments as {
+        [key: string]: string
+      }
+    )[attachmentKey]
+
+    if (!fileName) {
+      return Promise.reject({})
+    }
+
+    const { bucket, key } = AmazonS3URI(fileName)
+
+    const uploadBucket = bucket
+    try {
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64') || ''
+    } catch (error) {
+      throw new Error('Villa kom kom upp við að senda umsókn')
+    }
   }
 
   async getUserType({ auth }: TemplateApiModuleActionProps) {
@@ -77,16 +117,6 @@ export class FinancialStatementsInaoTemplateService extends BaseTemplateApiServi
     const externalData = application.externalData
     const currentUserType = getCurrentUserType(answers, externalData)
 
-    const getAttachment = async (): Promise<string> => {
-      const file = await this.sharedTemplateAPIService.getS3File(
-        application,
-        'attachments.file',
-        'base64',
-      )
-      if (!file) throw new Error('Error submitting application')
-      return file
-    }
-
     if (currentUserType === FSIUSERTYPE.INDIVIDUAL) {
       const electionIncomeLimit = getValueViaPath(
         answers,
@@ -107,7 +137,9 @@ export class FinancialStatementsInaoTemplateService extends BaseTemplateApiServi
       ) as string
       const clientEmail = getValueViaPath(answers, 'about.email') as string
 
-      const fileName = noValueStatement ? undefined : await getAttachment()
+      const fileName = noValueStatement
+        ? undefined
+        : await this.getAttachment(application)
 
       this.logger.info(
         `PostFinancialStatementForPersonalElection => clientNationalId: '${nationalId}', actorNationalId: '${
@@ -199,7 +231,7 @@ export class FinancialStatementsInaoTemplateService extends BaseTemplateApiServi
       ) as string
       const clientEmail = getValueViaPath(answers, 'about.email') as string
 
-      const fileName = await getAttachment()
+      const fileName = await this.getAttachment(application)
 
       const client = {
         nationalId: nationalId,
@@ -274,7 +306,7 @@ export class FinancialStatementsInaoTemplateService extends BaseTemplateApiServi
 
       const file = getValueViaPath(answers, 'attachments.file')
 
-      const fileName = file ? await getAttachment() : undefined
+      const fileName = file ? await this.getAttachment(application) : undefined
 
       const client = {
         nationalId: nationalId,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/bucket/bucket.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/bucket/bucket.service.ts
new file mode 100644
index 000000000000..0617c09837fe
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/bucket/bucket.service.ts
@@ -0,0 +1,45 @@
+import { Inject, Injectable } from '@nestjs/common'
+import * as AWS from 'aws-sdk'
+import * as S3 from 'aws-sdk/clients/s3'
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
+import AmazonS3URI from 'amazon-s3-uri'
+
+@Injectable()
+export class BucketService {
+  private s3 = new AWS.S3({ apiVersion: '2006-03-01' })
+  constructor(@Inject(LOGGER_PROVIDER) private logger: Logger) {}
+
+  async getFileContentAsBase64(filename: string): Promise<string> {
+    this.logger.info('getFileContent base64...')
+
+    const { region, bucket, key } = AmazonS3URI(filename)
+    const sm = await this.getFile(key, bucket)
+    if (sm.Body) {
+      this.logger.info('found file:' + key)
+      return sm.Body.toString('base64')
+    } else {
+      throw new Error('error getting file:' + key)
+    }
+  }
+
+  async getFile(
+    filename: string,
+    bucketName: string,
+  ): Promise<S3.GetObjectOutput> {
+    this.logger.info('get bucket file:' + filename)
+    return new Promise((resolve, reject) => {
+      const params = {
+        Bucket: bucketName,
+        Key: filename,
+      }
+      this.s3.getObject(params, function (err, data) {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(data)
+        }
+      })
+    })
+  }
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.module.ts
index 2549bfcee7fc..a6bdf74fd03a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.module.ts
@@ -10,7 +10,7 @@ import { BaseTemplateAPIModuleConfig } from '../../../types'
 // Here you import your module service
 import { HealthInsuranceService } from './health-insurance.service'
 import { HealthInsuranceV2ClientModule } from '@island.is/clients/icelandic-health-insurance/health-insurance'
-import { AwsService } from '@island.is/nest/aws'
+import { BucketService } from './bucket/bucket.service'
 
 export class HealthInsuranceModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -20,7 +20,7 @@ export class HealthInsuranceModule {
         HealthInsuranceV2ClientModule,
         SharedTemplateAPIModule.register(config),
       ],
-      providers: [HealthInsuranceService, AwsService],
+      providers: [HealthInsuranceService, BucketService],
       exports: [HealthInsuranceService],
     }
   }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.service.ts
index 82eb0f903d46..fe5ff84e7a58 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.service.ts
@@ -10,20 +10,20 @@ import {
   DocumentApi,
   PersonApi,
 } from '@island.is/clients/icelandic-health-insurance/health-insurance'
+import { BucketService } from './bucket/bucket.service'
 import { BaseTemplateApiService } from '../../base-template-api.service'
 import { ApplicationTypes } from '@island.is/application/types'
 import format from 'date-fns/format'
 import is from 'date-fns/locale/is'
 import { TemplateApiError } from '@island.is/nest/problem'
 import { coreErrorMessages } from '@island.is/application/core/messages'
-import { AwsService } from '@island.is/nest/aws'
 
 @Injectable()
 export class HealthInsuranceService extends BaseTemplateApiService {
   constructor(
     private documentApi: DocumentApi,
+    private bucketService: BucketService,
     private personApi: PersonApi,
-    private readonly awsService: AwsService,
   ) {
     super(ApplicationTypes.HEALTH_INSURANCE)
   }
@@ -64,7 +64,7 @@ export class HealthInsuranceService extends BaseTemplateApiService {
     const xml = await insuranceToXML(
       inputs.vistaskjal,
       inputs.attachmentNames,
-      this.awsService,
+      this.bucketService,
     )
 
     try {
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.utils.ts b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.utils.ts
index 91d8695543ae..b8d26ffcf71f 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.utils.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance/health-insurance.utils.ts
@@ -5,6 +5,7 @@ import { logger } from '@island.is/logging'
 import { ApplicationWithAttachments as Application } from '@island.is/application/types'
 import { objectToXML } from '../../shared/shared.utils'
 import is from 'date-fns/locale/is'
+import { BucketService } from './bucket/bucket.service'
 import format from 'date-fns/format'
 import {
   ApplyHealthInsuranceInputs,
@@ -13,7 +14,6 @@ import {
   GetVistaSkjalBody,
   VistaSkjalInput,
 } from './types/health-insurance-types'
-import { AwsService } from '@island.is/nest/aws'
 
 const formatDate = (date: Date) => {
   return format(new Date(date), 'yyyy-MM-dd', {
@@ -34,7 +34,7 @@ const formatDate = (date: Date) => {
 export const insuranceToXML = async (
   inputObj: VistaSkjalInput,
   attachmentNames: string[],
-  aws: AwsService,
+  bucketService: BucketService,
 ) => {
   logger.debug(`--- Starting to convert application to XML ---`)
   const vistaSkjalBody: GetVistaSkjalBody = {
@@ -93,11 +93,11 @@ export const insuranceToXML = async (
     }
     for (let i = 0; i < arrAttachments.length; i++) {
       const filename = arrAttachments[i]
-      const file = await aws.getFileBase64({ s3Uri: attachmentNames[i] })
-      if (!file) throw new Error('error getting file')
       const fylgiskjal: Fylgiskjal = {
         heiti: filename,
-        innihald: file,
+        innihald: await bucketService.getFileContentAsBase64(
+          attachmentNames[i],
+        ),
       }
       fylgiskjol.fylgiskjal.push(fylgiskjal)
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/index.ts b/libs/application/template-api-modules/src/lib/modules/templates/index.ts
index 375f2bc3a8ab..01eab1f29940 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/index.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/index.ts
@@ -140,6 +140,8 @@ import { NewPrimarySchoolService } from './new-primary-school/new-primary-school
 
 import { IdCardModule } from './id-card/id-card.module'
 import { IdCardService } from './id-card/id-card.service'
+import { ParliamentaryListCreationModule } from './signature-collection/parliamentary-list-creation/parliamentary-list-creation.module'
+import { ParliamentaryListCreationService } from './signature-collection/parliamentary-list-creation/parliamentary-list-creation.service'
 
 export const modules = [
   ReferenceTemplateModule,
@@ -210,6 +212,7 @@ export const modules = [
   IdCardModule,
   HealthInsuranceDeclarationModule,
   NewPrimarySchoolModule,
+  ParliamentaryListCreationModule,
 ]
 
 export const services = [
@@ -281,4 +284,5 @@ export const services = [
   IdCardService,
   HealthInsuranceDeclarationService,
   NewPrimarySchoolService,
+  ParliamentaryListCreationService,
 ]
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/fakeData.ts b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/fakeData.ts
index 63e59315e041..705ad7e7dded 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/fakeData.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/fakeData.ts
@@ -67,6 +67,7 @@ const generateRandomHeir = (
         }
       : {}),
     email: name.split(' ').at(-1) + '@gervimadur.com',
+    phone: '9999999',
     enabled: true,
     relationWithApplicant: ['Bróðir', 'Systir', 'Móðir', 'Faðir'].sort(
       () => 0.5 - Math.random(),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts
index d5eb3dfc9e6d..b248ea6462c9 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts
@@ -105,16 +105,16 @@ export const expandAnswers = (
     prepaidInheritance: answers.prepaidInheritance,
     executors: {
       executor: {
-        email: '',
-        phone: '',
-        name: '',
-        nationalId: '',
+        email: answers.executors?.executor.email ?? '',
+        phone: answers.executors?.executor.phone ?? '',
+        name: answers.executors?.executor.name ?? '',
+        nationalId: answers.executors?.executor.nationalId ?? '',
       },
       spouse: {
-        email: '',
-        phone: '',
-        name: '',
-        nationalId: '',
+        email: answers.executors?.spouse?.email ?? '',
+        phone: answers.executors?.spouse?.phone ?? '',
+        name: answers.executors?.spouse?.name ?? '',
+        nationalId: answers.executors?.spouse?.nationalId ?? '',
       },
       includeSpouse: undefined,
     },
@@ -234,6 +234,9 @@ export const expandAnswers = (
     },
     caseNumber: answers.estateInfoSelection,
     confirmAction: answers.confirmAction,
+    assetsConfirmation: answers.assetsConfirmation,
+    debtsConfirmation: answers.debtsConfirmation,
+    heirsConfirmation: answers.heirsConfirmation,
     debts: {
       debtsTotal: answers?.debts?.debtsTotal ?? 0,
       domesticAndForeignDebts: {
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.module.ts
index 37b57ee14028..4610e3de6d46 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.module.ts
@@ -6,7 +6,6 @@ import { SyslumennClientModule } from '@island.is/clients/syslumenn'
 import { CriminalRecordModule } from '@island.is/api/domains/criminal-record'
 import { FinanceClientModule } from '@island.is/clients/finance'
 import { JudicialAdministrationClientModule } from '@island.is/clients/judicial-administration'
-import { AwsService } from '@island.is/nest/aws'
 
 export class OperatingLicenseModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -19,7 +18,7 @@ export class OperatingLicenseModule {
         FinanceClientModule,
         JudicialAdministrationClientModule,
       ],
-      providers: [OperatingLicenseService, AwsService],
+      providers: [OperatingLicenseService],
       exports: [OperatingLicenseService],
     }
   }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.service.ts
index ab8c4725d070..ceb663cbdda2 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/operatingLicense.service.ts
@@ -1,9 +1,10 @@
-import { Inject, Injectable } from '@nestjs/common'
+import { Injectable } from '@nestjs/common'
 import { SharedTemplateApiService } from '../../shared'
 import { TemplateApiModuleActionProps } from '../../../types'
 import { coreErrorMessages, getValueViaPath } from '@island.is/application/core'
 
 import AmazonS3URI from 'amazon-s3-uri'
+import { S3 } from 'aws-sdk'
 import {
   SyslumennService,
   Person,
@@ -21,6 +22,7 @@ import {
 import {
   ApplicationTypes,
   ApplicationWithAttachments,
+  InstitutionNationalIds,
   YES,
 } from '@island.is/application/types'
 import { Info, BankruptcyHistoryResult } from './types/application'
@@ -35,23 +37,18 @@ import { BANNED_BANKRUPTCY_STATUSES } from './constants'
 import { error } from '@island.is/application/templates/operating-license'
 import { isPerson } from 'kennitala'
 import { User } from '@island.is/auth-nest-tools'
-import { AwsService } from '@island.is/nest/aws'
-import { LOGGER_PROVIDER } from '@island.is/logging'
-import type { Logger } from '@island.is/logging'
-
 @Injectable()
 export class OperatingLicenseService extends BaseTemplateApiService {
+  s3: S3
   constructor(
     private readonly sharedTemplateAPIService: SharedTemplateApiService,
     private readonly syslumennService: SyslumennService,
     private readonly criminalRecordService: CriminalRecordService,
     private readonly financeService: FinanceClientService,
     private readonly judicialAdministrationService: JudicialAdministrationService,
-    private readonly awsService: AwsService,
-    @Inject(LOGGER_PROVIDER)
-    private readonly logger: Logger,
   ) {
     super(ApplicationTypes.OPERATING_LICENSE)
+    this.s3 = new S3()
   }
 
   async criminalRecord({
@@ -337,12 +334,17 @@ export class OperatingLicenseService extends BaseTemplateApiService {
   private async getFileContentBase64(fileName: string): Promise<string> {
     const { bucket, key } = AmazonS3URI(fileName)
 
+    const uploadBucket = bucket
     try {
-      return (
-        (await this.awsService.getFileBase64({ bucket, fileName: key })) ?? ''
-      )
+      const file = await this.s3
+        .getObject({
+          Bucket: uploadBucket,
+          Key: key,
+        })
+        .promise()
+      const fileContent = file.Body as Buffer
+      return fileContent?.toString('base64') || ''
     } catch (e) {
-      this.logger.error('Error getting file', { error: e })
       return 'err'
     }
   }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.module.ts
index bc7551efbf3a..1ec4008ac711 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.module.ts
@@ -3,7 +3,6 @@ import { SyslumennClientModule } from '@island.is/clients/syslumenn'
 import { PSignSubmissionService } from './p-sign-submission.service'
 import { SharedTemplateAPIModule } from '../../shared'
 import { BaseTemplateAPIModuleConfig } from '../../../types'
-import { AwsService } from '@island.is/nest/aws'
 
 export class PSignSubmissionModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -13,7 +12,7 @@ export class PSignSubmissionModule {
         SyslumennClientModule,
         SharedTemplateAPIModule.register(config),
       ],
-      providers: [PSignSubmissionService, AwsService],
+      providers: [PSignSubmissionService],
       exports: [PSignSubmissionService],
     }
   }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.service.ts
index 88c286cd84e6..aacee2aea86a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/p-sign-submission/p-sign-submission.service.ts
@@ -16,13 +16,12 @@ import {
 } from '@island.is/application/types'
 
 import AmazonS3URI from 'amazon-s3-uri'
+import { S3 } from 'aws-sdk'
 import { SharedTemplateApiService } from '../../shared'
 import { BaseTemplateApiService } from '../../base-template-api.service'
 import { TemplateApiError } from '@island.is/nest/problem'
 import { LOGGER_PROVIDER } from '@island.is/logging'
 import type { Logger } from '@island.is/logging'
-import { AwsService } from '@island.is/nest/aws'
-import { AttachmentS3Service } from '../../shared/services'
 
 export const QUALITY_PHOTO = `
 query HasQualityPhoto {
@@ -60,13 +59,14 @@ type Delivery = {
 const YES = 'yes'
 @Injectable()
 export class PSignSubmissionService extends BaseTemplateApiService {
+  s3: S3
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private readonly syslumennService: SyslumennService,
     private readonly sharedTemplateAPIService: SharedTemplateApiService,
-    private readonly awsService: AwsService,
   ) {
     super(ApplicationTypes.P_SIGN)
+    this.s3 = new S3()
   }
 
   async doctorsNote({
@@ -187,13 +187,11 @@ export class PSignSubmissionService extends BaseTemplateApiService {
   private async getAttachments({
     application,
   }: TemplateApiModuleActionProps): Promise<string> {
-    const attacher = new AttachmentS3Service(this.awsService)
-    const attachments = await attacher.getFiles(
-      application,
+    const attachments = getValueViaPath(
+      application.answers,
       'photo.attachments',
-    )
-
-    const hasAttachments = attachments && attachments.length > 0
+    ) as Array<{ key: string; name: string }>
+    const hasAttachments = attachments && attachments?.length > 0
 
     if (!hasAttachments) {
       return Promise.reject({})
@@ -206,6 +204,16 @@ export class PSignSubmissionService extends BaseTemplateApiService {
       }
     )[attachmentKey]
 
-    return (await this.awsService.getFileBase64({ s3Uri: fileName })) ?? ''
+    const { bucket, key } = AmazonS3URI(fileName)
+
+    const uploadBucket = bucket
+    const file = await this.s3
+      .getObject({
+        Bucket: uploadBucket,
+        Key: key,
+      })
+      .promise()
+    const fileContent = file.Body as Buffer
+    return fileContent?.toString('base64') || ''
   }
 }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.module.ts
index 0f532db2fd7b..2221e0f1950a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.module.ts
@@ -11,7 +11,6 @@ import {
   NationalRegistryClientService,
 } from '@island.is/clients/national-registry-v2'
 import { APPLICATION_ATTACHMENT_BUCKET } from './constants'
-import { AwsService } from '@island.is/nest/aws'
 
 export class ParentalLeaveModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -25,7 +24,6 @@ export class ParentalLeaveModule {
         NationalRegistryClientModule,
       ],
       providers: [
-        AwsService,
         ChildrenService,
         ParentalLeaveService,
         NationalRegistryClientService,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts
index fe2e7ccae84e..92524c696bbd 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts
@@ -42,7 +42,6 @@ import { SmsService } from '@island.is/nova-sms'
 import { ChildrenService } from './children/children.service'
 import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
 import { PaymentService } from '@island.is/application/api/payment'
-import { AwsService } from '@island.is/nest/aws'
 
 const nationalId = '1234564321'
 let id = 0
@@ -240,7 +239,6 @@ describe('ParentalLeaveService', () => {
           provide: APPLICATION_ATTACHMENT_BUCKET,
           useValue: 'attachmentBucket',
         },
-        AwsService,
       ],
     }).compile()
 
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
index 4c5fcbb7a2cf..7e84e1d6cff8 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
@@ -1,4 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common'
+import { S3 } from 'aws-sdk'
 import addDays from 'date-fns/addDays'
 import format from 'date-fns/format'
 import cloneDeep from 'lodash/cloneDeep'
@@ -82,7 +83,6 @@ import {
   generateEmployerRejectedApplicationSms,
   generateOtherParentRejectedApplicationSms,
 } from './smsGenerators'
-import { AwsService } from '@island.is/nest/aws'
 
 interface VMSTError {
   type: string
@@ -105,6 +105,8 @@ interface AnswerPeriod {
 
 @Injectable()
 export class ParentalLeaveService extends BaseTemplateApiService {
+  s3 = new S3()
+
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private parentalLeaveApi: ParentalLeaveApi,
@@ -115,7 +117,6 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     private readonly configService: ConfigService<BaseTemplateAPIModuleConfig>,
     private readonly childrenService: ChildrenService,
     private readonly nationalRegistryApi: NationalRegistryClientService,
-    private readonly awsService: AwsService,
   ) {
     super(ApplicationTypes.PARENTAL_LEAVE)
   }
@@ -386,16 +387,16 @@ export class ParentalLeaveService extends BaseTemplateApiService {
       )
 
       const Key = `${application.id}/${filename}`
-      const file = await this.awsService.getFileBase64({
-        bucket: this.attachmentBucket,
-        fileName: Key,
-      })
+      const file = await this.s3
+        .getObject({ Bucket: this.attachmentBucket, Key })
+        .promise()
+      const fileContent = file.Body as Buffer
 
-      if (!file) {
+      if (!fileContent) {
         throw new Error('File content was undefined')
       }
 
-      return file
+      return fileContent.toString('base64')
     } catch (e) {
       this.logger.error('Cannot get ' + fileUpload + ' attachment', { e })
       throw new Error('Failed to get the ' + fileUpload + ' attachment')
@@ -433,7 +434,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
       state === States.RESIDENCE_GRANT_APPLICATION
     ) {
       if (residenceGrantFiles) {
-        residenceGrantFiles.forEach(async (_item, index) => {
+        residenceGrantFiles.forEach(async (item, index) => {
           const pdf = await this.getPdf(
             application,
             index,
@@ -448,7 +449,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     }
 
     if (changeEmployerFile) {
-      changeEmployerFile.forEach(async (_item, index) => {
+      changeEmployerFile.forEach(async (item, index) => {
         const pdf = await this.getPdf(
           application,
           index,
@@ -464,7 +465,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     // We don't want to send old files to VMST again
     if (applicationFundId && applicationFundId !== '') {
       if (additionalDocuments) {
-        additionalDocuments.forEach(async (_val, i) => {
+        additionalDocuments.forEach(async (val, i) => {
           const pdf = await this.getPdf(
             application,
             i,
@@ -1391,7 +1392,10 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     return periods
   }
 
-  async sendApplication({ application }: TemplateApiModuleActionProps) {
+  async sendApplication({
+    application,
+    params = undefined,
+  }: TemplateApiModuleActionProps) {
     const {
       isSelfEmployed,
       isReceivingUnemploymentBenefits,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/applicationSubmitted.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/applicationSubmitted.ts
new file mode 100644
index 000000000000..c6d5bd1d7cf6
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/applicationSubmitted.ts
@@ -0,0 +1,65 @@
+import { EmailTemplateGenerator } from '../../../../../types'
+import { CreateListSchema } from '@island.is/application/templates/signature-collection/presidential-list-creation'
+import { OwnerInput } from '@island.is/clients/signature-collection'
+import { SignatureCollection } from '../types'
+import { Message, Body } from '@island.is/email-service'
+
+export const generateApplicationSubmittedEmail: EmailTemplateGenerator = (
+  props,
+): Message => {
+  const {
+    application,
+    options: { email },
+  } = props
+
+  const answers = application.answers as CreateListSchema
+
+  const owner: OwnerInput = answers.applicant
+  const currentCollection: SignatureCollection = application.externalData
+    .currentCollection?.data as SignatureCollection
+
+  const subject = 'Ný meðmælasöfnun hefur verið stofnuð'
+  const lists: Body[] = currentCollection.areas.map((area) => {
+    return {
+      component: 'Copy',
+      context: { copy: `${owner.name} - ${area.name}` },
+    }
+  })
+
+  return {
+    from: {
+      name: email.sender,
+      address: email.address,
+    },
+    to: [
+      {
+        name: 'Landskjörstjórn',
+        address: 'postur@landskjorstjorn.is',
+      },
+      {
+        name: 'Þjóðskrá',
+        address: 'kosningar@skra.is',
+      },
+    ],
+    subject,
+    template: {
+      title: subject,
+      body: [
+        { component: 'Heading', context: { copy: subject } },
+        {
+          component: 'Copy',
+          context: {
+            copy: `${owner.name} Kt: ${owner.nationalId} hefur stofnað eftirfarandi lista til meðmælasöfnunar:`,
+          },
+        },
+        ...lists,
+        {
+          component: 'Copy',
+          context: {
+            copy: `Samskiptaupplýsingar framboðs. Sími ${owner.phone} Netfang: ${owner.email} `,
+          },
+        },
+      ],
+    },
+  }
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/index.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/index.ts
new file mode 100644
index 000000000000..68d597add205
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/emailGenerators/index.ts
@@ -0,0 +1 @@
+export * from './applicationSubmitted'
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.module.ts
new file mode 100644
index 000000000000..111c2917eabb
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.module.ts
@@ -0,0 +1,26 @@
+import { DynamicModule } from '@nestjs/common'
+
+// This is a shared module that gives you access to common methods
+import { SharedTemplateAPIModule } from '../../../shared'
+
+// The base config that template api modules are registered with by default
+// (configurable inside `template-api.module.ts`)
+import { BaseTemplateAPIModuleConfig } from '../../../../types'
+
+// Here you import your module service
+import { ParliamentaryListCreationService } from './parliamentary-list-creation.service'
+import { SignatureCollectionClientModule } from '@island.is/clients/signature-collection'
+
+export class ParliamentaryListCreationModule {
+  static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
+    return {
+      module: ParliamentaryListCreationModule,
+      imports: [
+        SharedTemplateAPIModule.register(config),
+        SignatureCollectionClientModule,
+      ],
+      providers: [ParliamentaryListCreationService],
+      exports: [ParliamentaryListCreationService],
+    }
+  }
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.service.ts
new file mode 100644
index 000000000000..e528ac393161
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.service.ts
@@ -0,0 +1,112 @@
+import { Inject, Injectable } from '@nestjs/common'
+import { SharedTemplateApiService } from '../../../shared'
+import { TemplateApiModuleActionProps } from '../../../../types'
+import { BaseTemplateApiService } from '../../../base-template-api.service'
+import { ApplicationTypes } from '@island.is/application/types'
+import {
+  CreateParliamentaryCandidacyInput,
+  MandateType,
+  ReasonKey,
+  SignatureCollectionClientService,
+} from '@island.is/clients/signature-collection'
+import { errorMessages } from '@island.is/application/templates/signature-collection/parliamentary-list-creation'
+import { TemplateApiError } from '@island.is/nest/problem'
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
+import { CollectionType } from '@island.is/clients/signature-collection'
+import { CreateListSchema } from '@island.is/application/templates/signature-collection/parliamentary-list-creation'
+import { FetchError } from '@island.is/clients/middlewares'
+
+@Injectable()
+export class ParliamentaryListCreationService extends BaseTemplateApiService {
+  constructor(
+    @Inject(LOGGER_PROVIDER) private logger: Logger,
+    private readonly _sharedTemplateAPIService: SharedTemplateApiService,
+    private signatureCollectionClientService: SignatureCollectionClientService,
+  ) {
+    super(ApplicationTypes.PARLIAMENTARY_LIST_CREATION)
+  }
+
+  async candidate({ auth }: TemplateApiModuleActionProps) {
+    const candidate = await this.signatureCollectionClientService.getSignee(
+      auth,
+    )
+
+    if (!candidate.hasPartyBallotLetter) {
+      throw new TemplateApiError(errorMessages.partyBallotLetter, 405)
+    }
+
+    return candidate
+  }
+
+  async parliamentaryCollection({ auth }: TemplateApiModuleActionProps) {
+    const currentCollection =
+      await this.signatureCollectionClientService.currentCollection()
+    if (currentCollection.collectionType !== CollectionType.Parliamentary) {
+      throw new TemplateApiError(
+        errorMessages.currentCollectionNotParliamentary,
+        405,
+      )
+    }
+
+    const candidateInCollection = currentCollection.candidates.some(
+      (candidate) => candidate.nationalId === auth.nationalId,
+    )
+
+    if (!candidateInCollection) {
+      throw new TemplateApiError(errorMessages.partyBallotLetter, 405)
+    }
+
+    return currentCollection
+  }
+
+  async submit({ application, auth }: TemplateApiModuleActionProps) {
+    const answers = application.answers as CreateListSchema
+
+    const input: CreateParliamentaryCandidacyInput = {
+      owner: answers.applicant,
+      agents: answers.managers
+        .map((manager) => ({
+          nationalId: manager.manager.nationalId,
+          phoneNumber: '',
+          mandateType: MandateType.Guarantor,
+          email: '',
+          areas: answers.constituency.map((constituency) => {
+            const [id, name] = constituency.split('|')
+            return {
+              areaId: id,
+            }
+          }),
+        }))
+        .concat(
+          answers.supervisors.map((supervisor) => ({
+            nationalId: supervisor.supervisor.nationalId,
+            phoneNumber: '',
+            mandateType: MandateType.Administrator,
+            email: '',
+            areas: supervisor.constituency.map((constituency) => {
+              const [id, name] = constituency.split('|')
+              return {
+                areaId: id,
+              }
+            }),
+          })),
+        ),
+      // TODO: determine collectionID
+      collectionId: '',
+    }
+
+    const result = await this.signatureCollectionClientService
+      .createParliamentaryCandidacy(input, auth)
+      .catch((e: FetchError) => {
+        return {
+          success: false,
+          message: e.message,
+        }
+      })
+
+    return {
+      success: true,
+    }
+  }
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/types.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/types.ts
new file mode 100644
index 000000000000..89d1767e0e24
--- /dev/null
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/types.ts
@@ -0,0 +1,12 @@
+export type Area = {
+  id: string
+  name: string
+  min: number
+}
+export type SignatureCollection = {
+  areas: Area[]
+  endTime: Date
+  id: string
+  name: string
+  startTime: Date
+}
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration-utils.ts b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration-utils.ts
index dd15e788eecd..2f2bb8266982 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration-utils.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration-utils.ts
@@ -4,6 +4,7 @@ import {
   ApplicationDTO,
   TrWebCommonsExternalPortalsApiModelsDocumentsDocument as Attachment,
   Employer as TrWebEmployer,
+  IncomeTypes,
 } from '@island.is/clients/social-insurance-administration'
 import {
   ApplicationType,
@@ -34,6 +35,12 @@ import {
   getApplicationExternalData as getPSApplicationExternalData,
 } from '@island.is/application/templates/social-insurance-administration/pension-supplement'
 
+import {
+  INCOME,
+  getApplicationAnswers as getIPApplicationAnswers,
+  getApplicationExternalData as getIPApplicationExternalData,
+} from '@island.is/application/templates/social-insurance-administration/income-plan'
+
 export const transformApplicationToOldAgePensionDTO = (
   application: Application,
   uploads: Attachment[],
@@ -298,6 +305,87 @@ export const transformApplicationToPensionSupplementDTO = (
   return pensionSupplementDTO
 }
 
+export const transformApplicationToIncomePlanDTO = (
+  application: Application,
+): ApplicationDTO => {
+  const { userProfileEmail, userProfilePhoneNumber, incomePlanConditions } =
+    getIPApplicationExternalData(application.externalData)
+
+  const incomePlanDTO: ApplicationDTO = {
+    applicantInfo: {
+      email: userProfileEmail,
+      phonenumber: userProfilePhoneNumber,
+    },
+    period: {
+      year: new Date().getFullYear(),
+      month: new Date().getMonth(),
+    },
+    applicationId: application.id,
+    incomePlan: {
+      incomeYear: incomePlanConditions.incomePlanYear,
+      incomeTypes: getIncomeTypes(application),
+    },
+  }
+
+  return incomePlanDTO
+}
+
+export const getIncomeTypes = (application: Application): IncomeTypes[] => {
+  const { incomePlan } = getIPApplicationAnswers(application.answers)
+  const { categorizedIncomeTypes } = getIPApplicationExternalData(
+    application.externalData,
+  )
+
+  return incomePlan.map((i) => ({
+    incomeTypeNumber:
+      categorizedIncomeTypes.find((c) => c.incomeTypeName === i.incomeType)
+        ?.incomeTypeNumber ?? 0,
+    incomeTypeCode:
+      categorizedIncomeTypes.find((c) => c.incomeTypeName === i.incomeType)
+        ?.incomeTypeCode ?? '',
+    incomeTypeName: i.incomeType,
+    currencyCode: i.currency,
+    incomeCategoryNumber:
+      categorizedIncomeTypes.find((c) => c.incomeTypeName === i.incomeType)
+        ?.categoryNumber ?? 0,
+    incomeCategoryCode:
+      categorizedIncomeTypes.find((c) => c.incomeTypeName === i.incomeType)
+        ?.categoryCode ?? '',
+    incomeCategoryName: i.incomeCategory,
+    ...(i.income === RatioType.MONTHLY &&
+    i?.incomeCategory === INCOME &&
+    i?.unevenIncomePerYear?.[0] === YES
+      ? {
+          amountJan: Number(i.january),
+          amountFeb: Number(i.february),
+          amountMar: Number(i.march),
+          amountApr: Number(i.april),
+          amountMay: Number(i.may),
+          amountJun: Number(i.june),
+          amountJul: Number(i.july),
+          amountAug: Number(i.august),
+          amountSep: Number(i.september),
+          amountOct: Number(i.october),
+          amountNov: Number(i.november),
+          amountDec: Number(i.december),
+        }
+      : {
+          amountJan: Number(i.incomePerYear) / 12,
+          amountFeb: Number(i.incomePerYear) / 12,
+          amountMar: Number(i.incomePerYear) / 12,
+          amountApr: Number(i.incomePerYear) / 12,
+          amountMay: Number(i.incomePerYear) / 12,
+          amountJun: Number(i.incomePerYear) / 12,
+          amountJul: Number(i.incomePerYear) / 12,
+          amountAug: Number(i.incomePerYear) / 12,
+          amountSep: Number(i.incomePerYear) / 12,
+          amountOct: Number(i.incomePerYear) / 12,
+          amountNov: Number(i.incomePerYear) / 12,
+          amountDec: Number(i.incomePerYear) / 12,
+        }),
+  }))
+}
+
 export const getMonthNumber = (monthName: string): number => {
   // Parse the month name and get the month number (0-based)
   const monthNumber = parse(monthName, 'MMMM', new Date())
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.module.ts
index 246577d402e4..69e9067c328b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.module.ts
@@ -9,7 +9,6 @@ import {
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
 import { NationalRegistryClientModule } from '@island.is/clients/national-registry-v2'
 import { SocialInsuranceAdministrationClientModule } from '@island.is/clients/social-insurance-administration'
-import { AwsService } from '@island.is/nest/aws'
 
 export class SocialInsuranceAdministrationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
@@ -22,7 +21,6 @@ export class SocialInsuranceAdministrationModule {
         NationalRegistryClientModule,
       ],
       providers: [
-        AwsService,
         SocialInsuranceAdministrationService,
         {
           provide: APPLICATION_ATTACHMENT_BUCKET,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
index 012ad14e3e44..5a33615c9ede 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
@@ -8,7 +8,6 @@ import {
 import { createCurrentUser } from '@island.is/testing/fixtures'
 import { LOGGER_PROVIDER, logger } from '@island.is/logging'
 import { ApplicationTypes } from '@island.is/application/types'
-import { AwsService } from '@island.is/nest/aws'
 
 describe('SocialInsuranceAdministrationService', () => {
   let socialInsuranceAdministrationService: SocialInsuranceAdministrationService
@@ -34,7 +33,6 @@ describe('SocialInsuranceAdministrationService', () => {
           provide: APPLICATION_ATTACHMENT_BUCKET,
           useValue: 'attachmentBucket',
         },
-        AwsService,
       ],
     }).compile()
 
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.ts
index ffe34c0e2345..258b8d42d022 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.ts
@@ -1,51 +1,54 @@
-import { Inject, Injectable } from '@nestjs/common'
+import { FileType } from '@island.is/application/templates/social-insurance-administration-core/types'
+import { getApplicationAnswers as getASFTEApplicationAnswers } from '@island.is/application/templates/social-insurance-administration/additional-support-for-the-elderly'
 import {
-  Application,
-  ApplicationTypes,
-  YES,
-} from '@island.is/application/types'
-import type { Logger } from '@island.is/logging'
-import { LOGGER_PROVIDER } from '@island.is/logging'
-import { TemplateApiModuleActionProps } from '../../../types'
-import { BaseTemplateApiService } from '../../base-template-api.service'
+  HouseholdSupplementHousing,
+  getApplicationAnswers as getHSApplicationAnswers,
+} from '@island.is/application/templates/social-insurance-administration/household-supplement'
 import {
   ApplicationType,
   Employment,
   getApplicationAnswers as getOAPApplicationAnswers,
   isEarlyRetirement,
 } from '@island.is/application/templates/social-insurance-administration/old-age-pension'
-import {
-  HouseholdSupplementHousing,
-  getApplicationAnswers as getHSApplicationAnswers,
-} from '@island.is/application/templates/social-insurance-administration/household-supplement'
 import { getApplicationAnswers as getPSApplicationAnswers } from '@island.is/application/templates/social-insurance-administration/pension-supplement'
-import { getApplicationAnswers as getASFTEApplicationAnswers } from '@island.is/application/templates/social-insurance-administration/additional-support-for-the-elderly'
 import {
+  Application,
+  ApplicationTypes,
+  YES,
+} from '@island.is/application/types'
+import {
+  ApiProtectedV1IncomePlanWithholdingTaxGetRequest,
   TrWebCommonsExternalPortalsApiModelsDocumentsDocument as Attachment,
   DocumentTypeEnum,
   SocialInsuranceAdministrationClientService,
 } from '@island.is/clients/social-insurance-administration'
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
+import { isRunningOnEnvironment } from '@island.is/shared/utils'
+import { Inject, Injectable } from '@nestjs/common'
+import { S3 } from 'aws-sdk'
+import { TemplateApiModuleActionProps } from '../../../types'
+import { BaseTemplateApiService } from '../../base-template-api.service'
 import {
   getApplicationType,
+  transformApplicationToAdditionalSupportForTheElderlyDTO,
   transformApplicationToHouseholdSupplementDTO,
+  transformApplicationToIncomePlanDTO,
   transformApplicationToOldAgePensionDTO,
   transformApplicationToPensionSupplementDTO,
-  transformApplicationToAdditionalSupportForTheElderlyDTO,
 } from './social-insurance-administration-utils'
-import { isRunningOnEnvironment } from '@island.is/shared/utils'
-import { FileType } from '@island.is/application/templates/social-insurance-administration-core/types'
-import { AwsService } from '@island.is/nest/aws'
 
 export const APPLICATION_ATTACHMENT_BUCKET = 'APPLICATION_ATTACHMENT_BUCKET'
 
 @Injectable()
 export class SocialInsuranceAdministrationService extends BaseTemplateApiService {
+  s3 = new S3()
+
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private siaClientService: SocialInsuranceAdministrationClientService,
     @Inject(APPLICATION_ATTACHMENT_BUCKET)
     private readonly attachmentBucket: string,
-    private readonly awsService: AwsService,
   ) {
     super('SocialInsuranceAdministration')
   }
@@ -374,15 +377,16 @@ export class SocialInsuranceAdministrationService extends BaseTemplateApiService
   }
 
   async getPdf(key: string) {
-    this.logger.debug('Getting pdf', { key })
-    const file = await this.awsService.getFileBase64({
-      bucket: this.attachmentBucket,
-      fileName: key,
-    })
-    if (!file) {
+    const file = await this.s3
+      .getObject({ Bucket: this.attachmentBucket, Key: key })
+      .promise()
+    const fileContent = file.Body as Buffer
+
+    if (!fileContent) {
       throw new Error('File content was undefined')
     }
-    return file
+
+    return fileContent.toString('base64')
   }
 
   async sendApplication({ application, auth }: TemplateApiModuleActionProps) {
@@ -452,6 +456,18 @@ export class SocialInsuranceAdministrationService extends BaseTemplateApiService
       )
       return response
     }
+
+    if (application.typeId === ApplicationTypes.INCOME_PLAN) {
+      const incomePlanDTO = transformApplicationToIncomePlanDTO(application)
+
+      const response = await this.siaClientService.sendApplication(
+        auth,
+        incomePlanDTO,
+        application.typeId.toLowerCase(),
+      )
+
+      return response
+    }
   }
 
   async sendDocuments({ application, auth }: TemplateApiModuleActionProps) {
@@ -507,4 +523,23 @@ export class SocialInsuranceAdministrationService extends BaseTemplateApiService
   async getCurrencies({ auth }: TemplateApiModuleActionProps) {
     return await this.siaClientService.getCurrencies(auth)
   }
+
+  async getCategorizedIncomeTypes({ auth }: TemplateApiModuleActionProps) {
+    return await this.siaClientService.getCategorizedIncomeTypes(auth)
+  }
+
+  async getWithholdingTax(
+    { auth }: TemplateApiModuleActionProps,
+    year: ApiProtectedV1IncomePlanWithholdingTaxGetRequest = {},
+  ) {
+    return await this.siaClientService.getWithholdingTax(auth, year)
+  }
+
+  async getLatestIncomePlan({ auth }: TemplateApiModuleActionProps) {
+    return await this.siaClientService.getLatestIncomePlan(auth)
+  }
+
+  async getIncomePlanConditions({ auth }: TemplateApiModuleActionProps) {
+    return await this.siaClientService.getIncomePlanConditions(auth)
+  }
 }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/university/university.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/university/university.service.ts
index cd031e996d63..3405f7851e79 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/university/university.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/university/university.service.ts
@@ -136,8 +136,7 @@ export class UniversityService extends BaseTemplateApiService {
     const exemptionData =
       educationOptionChosen === UniversityApplicationTypes.EXEMPTION
         ? {
-            degreeAttachments: await this.getFilesFromAttachment(
-              application,
+            degreeAttachments: await this.getAttachmentUrls(
               answers.educationDetails.exemptionDetails?.degreeAttachments?.map(
                 (x, i) => {
                   const type = this.mapFileTypes(i)
@@ -167,8 +166,7 @@ export class UniversityService extends BaseTemplateApiService {
             degreeEndDate: answers.educationDetails.thirdLevelDetails?.endDate,
             moreDetails:
               answers.educationDetails.thirdLevelDetails?.moreDetails,
-            degreeAttachments: await this.getFilesFromAttachment(
-              application,
+            degreeAttachments: await this.getAttachmentUrls(
               answers.educationDetails.thirdLevelDetails?.degreeAttachments?.map(
                 (x, i) => {
                   const type = this.mapFileTypes(i)
@@ -187,8 +185,7 @@ export class UniversityService extends BaseTemplateApiService {
         answers.educationDetails.finishedDetails.map(async (item) => {
           return {
             ...item,
-            degreeAttachments: await this.getFilesFromAttachment(
-              application,
+            degreeAttachments: await this.getAttachmentUrls(
               item.degreeAttachments?.map((x, i) => {
                 const type = this.mapFileTypes(i)
                 return {
@@ -258,21 +255,20 @@ export class UniversityService extends BaseTemplateApiService {
     ).universityApplicationControllerCreateApplication(createApplicationDto)
   }
 
-  private async getFilesFromAttachment(
-    application: ApplicationWithAttachments,
+  private async getAttachmentUrls(
     attachments?: { name: string; key: string; type: string }[],
-  ): Promise<{ fileName: string; fileType: string; blob: Blob }[]> {
+  ): Promise<{ fileName: string; fileType: string; url: string }[]> {
+    const expiry = 36000
+
     return await Promise.all(
       attachments?.map(async (file) => {
-        const blob =
-          await this.sharedTemplateAPIService.getAttachmentContentAsBlob(
-            application,
-            file.key,
-          )
         return {
           fileName: file.name,
           fileType: file.type,
-          blob,
+          url: await this.sharedTemplateAPIService.getAttachmentUrl(
+            file.key,
+            expiry,
+          ),
         }
       }) || [],
     )
diff --git a/libs/application/template-api-modules/src/lib/types/index.ts b/libs/application/template-api-modules/src/lib/types/index.ts
index 8969bb680439..9c19b3721967 100644
--- a/libs/application/template-api-modules/src/lib/types/index.ts
+++ b/libs/application/template-api-modules/src/lib/types/index.ts
@@ -9,7 +9,6 @@ import { IslykillApiModuleConfig } from '@island.is/clients/islykill'
 import { Message } from '@island.is/email-service'
 
 import type { Locale } from '@island.is/shared/types'
-import { Attachment } from 'nodemailer/lib/mailer'
 
 export interface BaseTemplateAPIModuleConfig {
   xRoadBasePathWithEnv: string
@@ -65,7 +64,7 @@ export type EmailTemplateGenerator = (
 
 export type AttachmentEmailTemplateGenerator = (
   props: EmailTemplateGeneratorProps,
-  fileContent: Attachment['content'],
+  fileContent: string,
   email: string,
 ) => Message
 
@@ -107,8 +106,3 @@ export interface SmsMessage {
   phoneNumber: string
   message: string
 }
-
-export type ApplicationSubmittedEmail<T> = (
-  props: EmailTemplateGeneratorProps,
-  recipient: T,
-) => Message
diff --git a/libs/application/template-loader/src/lib/templateLoaders.ts b/libs/application/template-loader/src/lib/templateLoaders.ts
index 4d57bc0a1a11..d1ea92123509 100644
--- a/libs/application/template-loader/src/lib/templateLoaders.ts
+++ b/libs/application/template-loader/src/lib/templateLoaders.ts
@@ -193,6 +193,10 @@ const templates: Record<ApplicationTypes, () => Promise<unknown>> = {
     import('@island.is/application/templates/id-card'),
   [ApplicationTypes.HEALTH_INSURANCE_DECLARATION]: () =>
     import('@island.is/application/templates/health-insurance-declaration'),
+  [ApplicationTypes.INCOME_PLAN]: () =>
+    import(
+      '@island.is/application/templates/social-insurance-administration/income-plan'
+    ),
   [ApplicationTypes.NEW_PRIMARY_SCHOOL]: () =>
     import('@island.is/application/templates/new-primary-school'),
   [ApplicationTypes.MACHINE_REGISTRATION]: () =>
diff --git a/libs/application/templates/announcement-of-death/src/fields/FirearmApplicant/index.tsx b/libs/application/templates/announcement-of-death/src/fields/FirearmApplicant/index.tsx
index 64057ebb6524..ef68d88ac7f8 100644
--- a/libs/application/templates/announcement-of-death/src/fields/FirearmApplicant/index.tsx
+++ b/libs/application/templates/announcement-of-death/src/fields/FirearmApplicant/index.tsx
@@ -107,12 +107,9 @@ export const FirearmApplicant: FC<
             backgroundColor="blue"
             icon={name ? 'checkmarkCircle' : undefined}
             loading={queryLoading}
+            required
             error={
-              getErrorViaPath(
-                errors,
-                'pickRole.electPerson.lookupError.message',
-              ) ||
-              getErrorViaPath(errors, 'pickRole.electPerson.nationalId') ||
+              getErrorViaPath(errors, 'firearmApplicant.nationalId') ||
               undefined
             }
           />
@@ -126,6 +123,7 @@ export const FirearmApplicant: FC<
               application,
               formatMessage,
             )}
+            readOnly
           />
         </GridColumn>
       </GridRow>
@@ -139,6 +137,10 @@ export const FirearmApplicant: FC<
               application,
               formatMessage,
             )}
+            error={
+              getErrorViaPath(errors, 'firearmApplicant.phone') || undefined
+            }
+            required
           />
         </GridColumn>
         <GridColumn span="6/12">
@@ -146,6 +148,10 @@ export const FirearmApplicant: FC<
             id={fieldNames.firearmApplicantEmail}
             name={fieldNames.firearmApplicantEmail}
             label={formatText(m.applicantsEmail, application, formatMessage)}
+            error={
+              getErrorViaPath(errors, 'firearmApplicant.email') || undefined
+            }
+            required
           />
         </GridColumn>
       </GridRow>
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..e657384ff918 100644
--- a/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts
+++ b/libs/application/templates/announcement-of-death/src/forms/overviewSections.ts
@@ -4,14 +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 { FormatMessage } from '@island.is/localization'
+import { Answers as AODAnswers, PropertiesEnum } from '../types'
 import { getFileRecipientName } from '../lib/utils'
 import { EstateRegistrant } from '@island.is/clients/syslumenn'
 
@@ -123,7 +123,7 @@ export const testament: Field[] = [
   }),
   buildKeyValueField({
     label: m.testamentKnowledgeOfOtherTestament,
-    width: 'half',
+    width: 'full',
     value: ({ answers }) =>
       answers.knowledgeOfOtherWills === 'yes'
         ? m.testamentKnowledgeOfOtherTestamentYes
@@ -132,71 +132,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 +179,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 +279,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.certificateOfDeathAnnouncementTitle,
-      description: m.certificateOfDeathAnnouncementDescription,
       id: 'certificateOfDeathAnnouncement',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -338,7 +295,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.financesDataCollectionPermissionTitle,
-      description: m.financesDataCollectionPermissionDescription,
       id: 'financesDataCollectionPermission',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -355,7 +311,6 @@ export const files: Field[] = [
   buildCustomField(
     {
       title: m.authorizationForFuneralExpensesTitle,
-      description: m.authorizationForFuneralExpensesDescription,
       id: 'authorizationForFuneralExpenses',
       component: 'FilesRecipientCard',
       condition: (answers) => showInDone(answers.viewOverview),
@@ -381,31 +336,50 @@ export const firearmApplicant: Field[] = [
     titleVariant: 'h3',
     condition: (answers) => showInDone(answers.viewOverview),
   }),
+  buildKeyValueField({
+    label: m.firearmsHadFirearms,
+    width: 'full',
+    value: ({ answers }) =>
+      answers.hadFirearms === YES ? m.firearmsYes : m.firearmsNo,
+    condition: (answers) => showInDone(answers.viewOverview),
+  }),
+  buildDescriptionField({
+    id: 'firearmApplicantInfo',
+    title: m.firearmsApplicant,
+    titleVariant: 'h3',
+    space: 2,
+    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 +388,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..e1feabcf8435 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 { NO, YES } from '@island.is/application/core'
 
 const isValidPhoneNumber = (phoneNumber: string) => {
   const phone = parsePhoneNumberFromString(phoneNumber, 'IS')
@@ -76,9 +77,10 @@ export const dataSchema = z.object({
   }),
   applicantEmail: customZodError(z.string().email(), m.errorEmail),
   applicantRelation: customZodError(z.string().min(1), m.errorRelation),
+  hadFirearms: z.enum([YES, NO]),
   firearmApplicant: z
     .object({
-      nationalId: z.string(),
+      nationalId: z.string().refine((v) => nationalId.isPerson(v)),
       name: z.string(),
       phone: z.string().refine((v) => isValidPhoneNumber(v), {
         params: m.errorPhoneNumber,
@@ -119,6 +121,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..c75ed61bde01 100644
--- a/libs/application/templates/announcement-of-death/src/lib/messages.ts
+++ b/libs/application/templates/announcement-of-death/src/lib/messages.ts
@@ -232,9 +232,14 @@ export const m = defineMessages({
     defaultMessage: 'Skráning vörsluaðila:',
     description: '',
   },
+  firearmsApplicant: {
+    id: 'aod.application:firearmsApplicant',
+    defaultMessage: 'Skráður vörsluaðili',
+    description: '',
+  },
   firearmsApplicantOverviewHeader: {
     id: 'aod.application:firearmsApplicantOverviewHeader',
-    defaultMessage: 'Skotvopn - vörsluaðili',
+    defaultMessage: 'Skotvopn',
     description: '',
   },
   firearmsApplicantName: {
@@ -323,6 +328,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 +349,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 +357,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/aosh/register-new-machine/src/fields/AboutMachine/index.tsx b/libs/application/templates/aosh/register-new-machine/src/fields/AboutMachine/index.tsx
index 33d7f6e0d49d..701a8b9343fb 100644
--- a/libs/application/templates/aosh/register-new-machine/src/fields/AboutMachine/index.tsx
+++ b/libs/application/templates/aosh/register-new-machine/src/fields/AboutMachine/index.tsx
@@ -57,7 +57,13 @@ export const AboutMachine: FC<React.PropsWithChildren<FieldBaseProps>> = (
     { subCat: string; registrationNumberPrefix: string }[]
   >([])
   const [registrationNumberPrefix, setRegistrationNumberPrefix] =
-    useState<string>('')
+    useState<string>(
+      getValueViaPath(
+        application.answers,
+        'machine.aboutMachine.registrationNumberPrefix',
+        '',
+      ) as string,
+    )
   const [subCategoryDisabled, setSubCategoryDisabled] = useState<boolean>(
     fromService || (!fromService && !subCategory.length),
   )
diff --git a/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/formFieldMapper.tsx b/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/formFieldMapper.tsx
index 833e32fa3c7b..4261a536cc7c 100644
--- a/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/formFieldMapper.tsx
+++ b/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/formFieldMapper.tsx
@@ -23,11 +23,15 @@ export const formFieldMapper = ({
   const { variableName, label, type, required, maxLength, values } = item
   const { application, field } = props
   const error =
-    displayError &&
-    required &&
-    variableName &&
-    watchTechInfoFields[variableName].length === 0
-      ? formatMessage(coreErrorMessages.defaultError)
+    displayError && required && variableName
+      ? (watchTechInfoFields[variableName].length === 0
+          ? formatMessage(coreErrorMessages.defaultError)
+          : undefined) ||
+        ((type === 'int' || type === 'float') &&
+        maxLength &&
+        watchTechInfoFields[variableName].length > maxLength
+          ? formatMessage(coreErrorMessages.defaultError)
+          : undefined)
       : undefined
   if (values && values.length > 0) {
     return (
@@ -63,8 +67,9 @@ export const formFieldMapper = ({
           children: undefined,
           backgroundColor: 'blue',
           required: required,
-          maxLength: maxLength ? parseInt(maxLength, 10) : undefined,
           variant: 'number',
+          max: maxLength ? parseInt(maxLength, 10) : undefined,
+          min: 0,
         }}
       />
     )
diff --git a/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/index.tsx b/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/index.tsx
index 6b621efad1b3..b5b94c0827f4 100644
--- a/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/index.tsx
+++ b/libs/application/templates/aosh/register-new-machine/src/fields/TechnicalInfo/index.tsx
@@ -17,6 +17,7 @@ import { UPDATE_APPLICATION } from '@island.is/application/graphql'
 import { TechInfoItem } from '../../shared/types'
 import { formFieldMapper } from './formFieldMapper'
 import { application as applicationMessage } from '../../lib/messages'
+import { formatDate } from '../../utils'
 
 export const technicalInfoInputs = gql`
   ${TECHNICAL_INFO_INPUTS}
@@ -62,34 +63,46 @@ export const TechnicalInfo: FC<React.PropsWithChildren<FieldBaseProps>> = (
   })
 
   useEffect(() => {
-    // Call subcategory
     runQuery({
       variables: {
         parentCategory: machineCategory,
+        subCategory: machineSubCategory,
       },
     })
-  }, [machineCategory])
+  }, [machineCategory, machineSubCategory])
 
   setBeforeSubmitCallback?.(async () => {
-    // Renna yfir listan í techInfoItems og finna í listanum watchTechInfoFields
-    // Ef það er required þá tékka hvort það sé útfyllt
-    // Síðan setja í answers með nafninu og value
     setDisplayError(false)
     const techInfoAnswer = techInfoItems?.map(
-      ({ variableName, required, label }, index) => {
+      ({ variableName, required, label, maxLength, type }, index) => {
         const answer = variableName ? watchTechInfoFields[variableName] : ''
-        if (required && answer.length === 0) {
+        if (
+          (required && answer.length === 0) ||
+          (required &&
+            (type === 'int' || type === 'float'
+              ? maxLength
+                ? answer.length > maxLength
+                : false
+              : false))
+        ) {
           setDisplayError(true)
           return 'error'
         }
         setValue(`techInfo[${index}].variableName`, variableName)
-        setValue(`techInfo[${index}].value`, answer)
+        setValue(
+          `techInfo[${index}].value`,
+          type === 'dateTime' ? formatDate(answer) : answer,
+        )
         setValue(`techInfo[${index}].label`, label)
         return { variableName, value: answer, label }
       },
     )
 
-    if (techInfoAnswer?.some((val) => val === 'error')) {
+    if (
+      loading ||
+      connectionError ||
+      techInfoAnswer?.some((val) => val === 'error')
+    ) {
       return [false, '']
     }
 
diff --git a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/MachineSection/MachineBasicInformation.ts b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/MachineSection/MachineBasicInformation.ts
index f2f7ad6ff90d..11a5ed13c080 100644
--- a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/MachineSection/MachineBasicInformation.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/MachineSection/MachineBasicInformation.ts
@@ -48,6 +48,8 @@ export const MachineBasicInformation = buildSubSection({
           width: 'half',
           required: true,
           variant: 'number',
+          min: 1900,
+          max: new Date().getFullYear(),
         }),
         buildTextField({
           id: 'machine.basicInformation.productionNumber',
@@ -95,11 +97,11 @@ export const MachineBasicInformation = buildSubSection({
           options: [
             {
               value: NEW,
-              label: 'Ný',
+              label: machine.labels.basicMachineInformation.new,
             },
             {
               value: USED,
-              label: 'Notuð',
+              label: machine.labels.basicMachineInformation.used,
             },
           ],
         }),
diff --git a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/OverviewSection.ts b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/OverviewSection.ts
index 0187bccb45b9..20cbc1438e01 100644
--- a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/OverviewSection.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/OverviewSection.ts
@@ -25,6 +25,7 @@ export const OverviewSection = buildSection({
           id: 'submit',
           placement: 'footer',
           title: overview.labels.approveButton,
+          refetchApplicationAfterSubmit: true,
           actions: [
             {
               event: DefaultEvents.SUBMIT,
diff --git a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/index.ts b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/index.ts
index 2d05584a6a1b..2882b39679bd 100644
--- a/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/index.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/forms/RegisterMachineForm/index.ts
@@ -12,8 +12,6 @@ export const RegisterNewMachineForm: Form = buildForm({
   title: '',
   logo: Logo,
   mode: FormModes.DRAFT,
-  renderLastScreenButton: true,
-  renderLastScreenBackButton: true,
   children: [
     buildSection({
       id: 'externalData',
diff --git a/libs/application/templates/aosh/register-new-machine/src/graphql/queries.ts b/libs/application/templates/aosh/register-new-machine/src/graphql/queries.ts
index da35c46331b2..ae1bff3720ea 100644
--- a/libs/application/templates/aosh/register-new-machine/src/graphql/queries.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/graphql/queries.ts
@@ -27,8 +27,8 @@ export const MACHINE_SUB_CATEGORIES = `
 `
 
 export const TECHNICAL_INFO_INPUTS = `
-  query GetTechnicalInfoInputs($parentCategory: String!) {
-    getTechnicalInfoInputs(parentCategory: $parentCategory) {
+  query GetTechnicalInfoInputs($parentCategory: String!, $subCategory: String!) {
+    getTechnicalInfoInputs(parentCategory: $parentCategory, subCategory: $subCategory) {
       variableName
       label
       type
diff --git a/libs/application/templates/aosh/register-new-machine/src/lib/dataSchema.ts b/libs/application/templates/aosh/register-new-machine/src/lib/dataSchema.ts
index e2a76b140c54..1b182d57d631 100644
--- a/libs/application/templates/aosh/register-new-machine/src/lib/dataSchema.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/lib/dataSchema.ts
@@ -14,6 +14,15 @@ const PersonInformationSchema = z.object({
   email: z.string().min(1),
 })
 
+const RemovablePersonInformationSchema = z.object({
+  name: z.string().optional(),
+  nationalId: z.string().optional(),
+  address: z.string().optional(),
+  postCode: z.string().optional(),
+  phone: z.string().optional(),
+  email: z.string().optional(),
+})
+
 const BasicInformationSchema = z.object({
   productionCountry: z.string().min(1),
   productionYear: z.string().min(1),
@@ -42,15 +51,135 @@ const TechInfoSchema = z.object({
 
 export const NewMachineAnswersSchema = z.object({
   approveExternalData: z.boolean(),
-  importerInformation: z.object({
-    importer: PersonInformationSchema,
-    isOwnerOtherThanImporter: z.enum([YES, NO]),
-    owner: PersonInformationSchema.optional(),
-  }),
-  operatorInformation: z.object({
-    operator: PersonInformationSchema.optional(),
-    hasOperator: z.enum([YES, NO]),
-  }),
+  importerInformation: z
+    .object({
+      importer: PersonInformationSchema,
+      isOwnerOtherThanImporter: z.enum([YES, NO]),
+      owner: RemovablePersonInformationSchema.optional(),
+    })
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return owner && owner.name && owner.name.length > 0
+      },
+      {
+        path: ['owner', 'name'],
+      },
+    )
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return (
+          owner &&
+          owner.nationalId &&
+          owner.nationalId.length > 0 &&
+          kennitala.isValid(owner.nationalId)
+        )
+      },
+      {
+        path: ['owner', 'nationalId'],
+      },
+    )
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return owner && owner.address && owner.address.length > 0
+      },
+      {
+        path: ['owner', 'address'],
+      },
+    )
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return owner && owner.postCode && owner.postCode.length > 0
+      },
+      {
+        path: ['owner', 'postCode'],
+      },
+    )
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return owner && owner.phone && owner.phone.length > 0
+      },
+      {
+        path: ['owner', 'phone'],
+      },
+    )
+    .refine(
+      ({ isOwnerOtherThanImporter, owner }) => {
+        if (isOwnerOtherThanImporter === NO) return true
+        return owner && owner.email && owner.email.length > 0
+      },
+      {
+        path: ['owner', 'email'],
+      },
+    ),
+  operatorInformation: z
+    .object({
+      operator: RemovablePersonInformationSchema.optional(),
+      hasOperator: z.enum([YES, NO]),
+    })
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return operator && operator.name && operator.name.length > 0
+      },
+      {
+        path: ['operator', 'name'],
+      },
+    )
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return (
+          operator &&
+          operator.nationalId &&
+          operator.nationalId.length > 0 &&
+          kennitala.isValid(operator.nationalId)
+        )
+      },
+      {
+        path: ['operator', 'nationalId'],
+      },
+    )
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return operator && operator.address && operator.address.length > 0
+      },
+      {
+        path: ['operator', 'address'],
+      },
+    )
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return operator && operator.postCode && operator.postCode.length > 0
+      },
+      {
+        path: ['operator', 'postCode'],
+      },
+    )
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return operator && operator.phone && operator.phone.length > 0
+      },
+      {
+        path: ['operator', 'phone'],
+      },
+    )
+    .refine(
+      ({ hasOperator, operator }) => {
+        if (hasOperator === NO) return true
+        return operator && operator.email && operator.email.length > 0
+      },
+      {
+        path: ['operator', 'email'],
+      },
+    ),
   machine: z.object({
     machineType: z
       .object({
diff --git a/libs/application/templates/aosh/register-new-machine/src/lib/messages/machine.ts b/libs/application/templates/aosh/register-new-machine/src/lib/messages/machine.ts
index 8dc427c54725..1e9c5992949e 100644
--- a/libs/application/templates/aosh/register-new-machine/src/lib/messages/machine.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/lib/messages/machine.ts
@@ -143,6 +143,16 @@ export const machine = {
         defaultMessage: 'Er vélin ný eða notuð?',
         description: `Basic machine information is used or new label`,
       },
+      new: {
+        id: 'aosh.rnm.application:machine.labels.basicMachineInformation.new',
+        defaultMessage: 'Ný',
+        description: `Basic machine information new label`,
+      },
+      used: {
+        id: 'aosh.rnm.application:machine.labels.basicMachineInformation.used',
+        defaultMessage: 'Notuð',
+        description: `Basic machine information used label`,
+      },
       registrationInformationTitle: {
         id: 'aosh.rnm.application:machine.labels.basicMachineInformation.registrationInformationTitle',
         defaultMessage: 'Skráningaupplýsingar',
diff --git a/libs/application/templates/aosh/register-new-machine/src/utils/formatDate.ts b/libs/application/templates/aosh/register-new-machine/src/utils/formatDate.ts
new file mode 100644
index 000000000000..70f6ad10309f
--- /dev/null
+++ b/libs/application/templates/aosh/register-new-machine/src/utils/formatDate.ts
@@ -0,0 +1,9 @@
+import format from 'date-fns/format'
+import is from 'date-fns/locale/is'
+import parseISO from 'date-fns/parseISO'
+
+export const formatDate = (date: string) => {
+  return format(parseISO(date), 'dd.MM.yyyy', {
+    locale: is,
+  })
+}
diff --git a/libs/application/templates/aosh/register-new-machine/src/utils/formatPhoneNumber.ts b/libs/application/templates/aosh/register-new-machine/src/utils/formatPhoneNumber.ts
new file mode 100644
index 000000000000..f4b75cf49acf
--- /dev/null
+++ b/libs/application/templates/aosh/register-new-machine/src/utils/formatPhoneNumber.ts
@@ -0,0 +1,6 @@
+import { parsePhoneNumberFromString } from 'libphonenumber-js'
+
+export const formatPhoneNumber = (phoneNumber: string): string => {
+  const phone = parsePhoneNumberFromString(phoneNumber, 'IS')
+  return phone?.formatNational() || phoneNumber
+}
diff --git a/libs/application/templates/aosh/register-new-machine/src/utils/getBasicMachineInformation.ts b/libs/application/templates/aosh/register-new-machine/src/utils/getBasicMachineInformation.ts
index d8b66c052bb3..d559246a29a8 100644
--- a/libs/application/templates/aosh/register-new-machine/src/utils/getBasicMachineInformation.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/utils/getBasicMachineInformation.ts
@@ -1,7 +1,8 @@
 import { getValueViaPath } from '@island.is/application/core'
-import { FormatMessage, FormValue } from '@island.is/application/types'
+import { FormatMessage, FormValue, YES } from '@island.is/application/types'
 import { AboutMachine, BasicInformation } from '../lib/dataSchema'
-import { machine } from '../lib/messages'
+import { information, machine } from '../lib/messages'
+import { NEW } from '../shared/types'
 
 export const getBasicMachineInformation = (
   answers: FormValue,
@@ -39,13 +40,21 @@ export const getBasicMachineInformation = (
       machine.labels.basicMachineInformation.productionNumber,
     )}: ${basicMachineInformation.productionNumber}`,
     `${formatMessage(machine.labels.basicMachineInformation.markedCE)}: ${
-      basicMachineInformation.markedCE
+      basicMachineInformation.markedCE === YES
+        ? formatMessage(information.labels.radioButtons.radioOptionYes)
+        : formatMessage(information.labels.radioButtons.radioOptionNo)
     }`,
     `${formatMessage(
       machine.labels.basicMachineInformation.preRegistration,
-    )}: ${basicMachineInformation.preRegistration}`,
+    )}: ${
+      basicMachineInformation.preRegistration === YES
+        ? formatMessage(information.labels.radioButtons.radioOptionYes)
+        : formatMessage(information.labels.radioButtons.radioOptionNo)
+    }`,
     `${formatMessage(machine.labels.basicMachineInformation.isUsed)}: ${
-      basicMachineInformation.isUsed
+      basicMachineInformation.isUsed === NEW
+        ? formatMessage(machine.labels.basicMachineInformation.new)
+        : formatMessage(machine.labels.basicMachineInformation.used)
     }`,
     `${formatMessage(machine.labels.basicMachineInformation.location)}: ${
       basicMachineInformation.location
diff --git a/libs/application/templates/aosh/register-new-machine/src/utils/getPersonInformationForOverview.ts b/libs/application/templates/aosh/register-new-machine/src/utils/getPersonInformationForOverview.ts
index 12206495b070..a8292a1e6518 100644
--- a/libs/application/templates/aosh/register-new-machine/src/utils/getPersonInformationForOverview.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/utils/getPersonInformationForOverview.ts
@@ -2,6 +2,8 @@ import { getValueViaPath } from '@island.is/application/core'
 import { FormatMessage, FormValue } from '@island.is/application/types'
 import { PersonInformation } from '../lib/dataSchema'
 import { information } from '../lib/messages'
+import { format as formatKennitala } from 'kennitala'
+import { formatPhoneNumber } from '../utils'
 
 export const getPersonInformationForOverview = (
   person: string,
@@ -15,10 +17,12 @@ export const getPersonInformationForOverview = (
 
   return [
     personInformation.name,
-    personInformation.nationalId,
+    personInformation.nationalId
+      ? formatKennitala(personInformation.nationalId)
+      : '',
     `${personInformation.address}, ${personInformation.postCode}`,
     `${formatMessage(information.labels.owner.phone)}: ${
-      personInformation.phone
+      personInformation.phone ? formatPhoneNumber(personInformation.phone) : ''
     }`,
     personInformation.email,
   ]
diff --git a/libs/application/templates/aosh/register-new-machine/src/utils/index.ts b/libs/application/templates/aosh/register-new-machine/src/utils/index.ts
index db7d3194c8e8..dbb381d187a8 100644
--- a/libs/application/templates/aosh/register-new-machine/src/utils/index.ts
+++ b/libs/application/templates/aosh/register-new-machine/src/utils/index.ts
@@ -6,3 +6,5 @@ export * from './getStreetRegistrationInformation'
 export * from './canRegisterToTraffic'
 export * from './canMaybeRegisterToTraffic'
 export * from './getTechnicalInformation'
+export * from './formatPhoneNumber'
+export * from './formatDate'
diff --git a/libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/PersonalSection/UserInformationSubSection.ts b/libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/PersonalSection/UserInformationSubSection.ts
index e092a4a2525d..5df130ebc371 100644
--- a/libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/PersonalSection/UserInformationSubSection.ts
+++ b/libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/PersonalSection/UserInformationSubSection.ts
@@ -58,7 +58,7 @@ export const UserInformationSubSection = buildSubSection({
               undefined,
             ) as NationalRegistryIndividual | undefined
 
-            return `${individual?.givenName} ${individual?.familyName}`
+            return individual?.fullName
           },
         }),
         buildTextField({
diff --git a/libs/application/templates/directorate-of-immigration/citizenship/src/lib/CitizenshipTemplate.ts b/libs/application/templates/directorate-of-immigration/citizenship/src/lib/CitizenshipTemplate.ts
index 936f02db4cc2..f4473ae7f15d 100644
--- a/libs/application/templates/directorate-of-immigration/citizenship/src/lib/CitizenshipTemplate.ts
+++ b/libs/application/templates/directorate-of-immigration/citizenship/src/lib/CitizenshipTemplate.ts
@@ -120,7 +120,7 @@ const template: ApplicationTemplate<
               },
             ],
           },
-          lifecycle: pruneAfterDays(1),
+          lifecycle: pruneAfterDays(30),
           onExit: defineTemplateApi({
             action: ApiActions.validateApplication,
           }),
diff --git a/libs/application/templates/directorate-of-immigration/citizenship/src/lib/messages/confirmation.ts b/libs/application/templates/directorate-of-immigration/citizenship/src/lib/messages/confirmation.ts
index c3631ab03312..b48732c1a65e 100644
--- a/libs/application/templates/directorate-of-immigration/citizenship/src/lib/messages/confirmation.ts
+++ b/libs/application/templates/directorate-of-immigration/citizenship/src/lib/messages/confirmation.ts
@@ -23,7 +23,7 @@ export const confirmation = {
       description: 'Confirmation accordion title',
     },
     accordionText: {
-      id: 'doi.cs.application:confirmation.general.accordionText',
+      id: 'doi.cs.application:confirmation.general.accordionText#markdown',
       defaultMessage: `* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis eu nulla porta, luctus mi ac, pharetra mauris\n`,
       description: 'Confirmation accordion text',
     },
diff --git a/libs/application/templates/driving-license/src/forms/prerequisites/sectionApplicationFor.ts b/libs/application/templates/driving-license/src/forms/prerequisites/sectionApplicationFor.ts
index 1c4686790468..323267bc98ad 100644
--- a/libs/application/templates/driving-license/src/forms/prerequisites/sectionApplicationFor.ts
+++ b/libs/application/templates/driving-license/src/forms/prerequisites/sectionApplicationFor.ts
@@ -84,6 +84,7 @@ export const sectionApplicationFor = (allowBELicense = false) =>
                   disabled:
                     !currentLicense ||
                     age < 18 ||
+                    age >= 65 ||
                     categories?.some((c) => c.nr.toUpperCase() === 'BE') ||
                     // validToCode === 8 is temporary license and should not be applicable for BE
                     !categories?.some(
diff --git a/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx b/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx
index afff3c39b2f5..9f1603f1e02b 100644
--- a/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx
+++ b/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx
@@ -12,7 +12,6 @@ import {
 } from '@island.is/island-ui/core'
 import { m } from '../../lib/messages'
 import * as kennitala from 'kennitala'
-import { EstateRegistrant } from '@island.is/clients/syslumenn'
 import { Answers, EstateMember } from '../../types'
 import { AdditionalEstateMember } from './AdditionalEstateMember'
 import { getValueViaPath } from '@island.is/application/core'
@@ -175,7 +174,12 @@ export const EstateMembersRepeater: FC<
           ...acc,
           <Box marginTop={index > 0 ? 7 : 0} key={index}>
             <Box display="flex" justifyContent="spaceBetween" marginBottom={3}>
-              <Text variant="h4">{formatMessage(m.estateMember)}</Text>
+              <Text
+                color={member.enabled ? 'currentColor' : 'dark300'}
+                variant="h4"
+              >
+                {formatMessage(m.estateMember)}
+              </Text>
               <Box>
                 <Button
                   variant="text"
@@ -349,13 +353,12 @@ export const EstateMembersRepeater: FC<
                     />
                   </GridColumn>
                   <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                    <InputController
+                    <PhoneInputController
                       id={`${id}[${index}].advocate.phone`}
                       name={`${id}[${index}].advocate.phone`}
                       label={formatMessage(m.phone)}
                       backgroundColor="blue"
                       disabled={!member.enabled}
-                      format="###-####"
                       defaultValue={member.advocate?.phone || ''}
                       error={
                         error && error[index] && error[index].advocate?.phone
diff --git a/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts b/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts
index 8f78cc404d32..9cd2507860ca 100644
--- a/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts
+++ b/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts
@@ -68,8 +68,7 @@ export const announcerInfo = buildSection({
           title: m.phone,
           width: 'half',
           required: true,
-          disableDropdown: true,
-          allowedCountryCodes: ['IS'],
+          disableDropdown: false,
           defaultValue: (application: Application) => {
             const phone =
               (
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: {
diff --git a/libs/application/templates/example-payment/src/forms/draft.ts b/libs/application/templates/example-payment/src/forms/draft.ts
index ecee67f35034..4f4fe116d0de 100644
--- a/libs/application/templates/example-payment/src/forms/draft.ts
+++ b/libs/application/templates/example-payment/src/forms/draft.ts
@@ -28,6 +28,7 @@ export const draft: Form = buildForm({
           id: 'approveExternalData',
           subTitle: m.draft.externalDataTitle,
           checkboxLabel: m.draft.externalDataTitle,
+          enableMockPayment: true,
           dataProviders: [
             buildDataProviderItem({
               provider: PaymentCatalogApi,
diff --git a/libs/application/templates/health-insurance-declaration/mockData/health-insurance-declaration.json b/libs/application/templates/health-insurance-declaration/mockData/health-insurance-declaration.json
new file mode 100644
index 000000000000..feaf925be9f6
--- /dev/null
+++ b/libs/application/templates/health-insurance-declaration/mockData/health-insurance-declaration.json
@@ -0,0 +1,1661 @@
+{
+  "uuid": "e559ecbf-22e8-409f-bc5e-7863c7d3d222",
+  "lastMigration": 32,
+  "name": "Health Insurance Declaration Mock",
+  "endpointPrefix": "",
+  "latency": 0,
+  "port": 8081,
+  "hostname": "",
+  "folders": [],
+  "routes": [
+    {
+      "uuid": "24c30259-dd87-4c40-9c4b-f6ba87b4a427",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399",
+      "responses": [
+        {
+          "uuid": "c725bd03-cf7b-445b-b63b-725da24319dd",
+          "body": "{\n  \"kennitala\": \"0101302399\",\n  \"nafn\": \"Gervimaður Færeyjar\",\n  \"eiginnafn\": \"Gervimaður\",\n  \"millinafn\": null,\n  \"kenninafn\": \"Færeyjar\",\n  \"fulltNafn\": \"Gervimaður Færeyjar\",\n  \"kynkodi\": \"2\",\n  \"bannmerking\": false,\n  \"faedingardagur\": \"1930-01-01T00:00:00\",\n  \"logheimili\": {\n    \"heiti\": \"Hvassaleiti 5\",\n    \"postnumer\": \"103\",\n    \"stadur\": \"Reykjavík\",\n    \"sveitarfelagsnumer\": \"0000\"\n  },\n  \"adsetur\": null\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:55 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-e50f9dba-c7ff-4ef0-8d50-2ef2d42092c9"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "ClDxyajxNvnI3xxIS93v4myqgdwSTdl7wQXvB1WDRDQVvH2T4pM0bDHUjMhx83zSEcrD+rgP87HOoalll/YgsA=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "8cd5e87b-5f21-4162-9384-57ca4b1ace2f"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "420"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "2a4bd937-d20f-48aa-bc0a-0b6b17e2e7a9",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/hjuskapur",
+      "responses": [
+        {
+          "uuid": "bf25343e-1e8d-4e36-b3f2-37eaffa911d8",
+          "body": "{\n  \"kennitalaMaka\": \"0101302989\",\n  \"nafnMaka\": \"Gervimaður Ameríku \",\n  \"hjuskaparkodi\": \"3\",\n  \"breytt\": \"1992-09-02T00:00:00\",\n  \"sambud\": false,\n  \"sambudBreytt\": \"0001-01-01T00:00:00\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:55 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-6889cc23-e49e-4e83-a772-b44a38095ce1"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "LGAKQAQew+BWI7pT3oV4kEnrhWOJzJbD+3BoOKzQv37n+efC55pb61MZehyP7CdKeIHFsYdYZh9N6VP5oTUxCA=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "be29304d-09ef-4a70-a4fe-5be917252fb0"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "191"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "720734e5-28bd-4360-964c-30b2102e04f1",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/forsja",
+      "responses": [
+        {
+          "uuid": "dc8b28d2-145e-4562-9bd7-d6cf1b490f6f",
+          "body": "[\n  \"2222222229\"\n]",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:55 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-39421f8f-a7fb-43cd-b543-7501bee18a1c"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "hWSVjBXpPeskYJctPkSgtwTEtT3mX701nB/VF14TzwYz8HgGvd8wo7LZukcRoUH35Ipn0cx6FQqYBguMQh71WQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "0056c1f3-97bb-483f-bf94-a945e4160b4c"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "18"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "e524ba42-097a-4b2d-8b60-8e7e8c6e2cfa",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/rikisfang",
+      "responses": [
+        {
+          "uuid": "896387fa-c8cc-4bb7-8d47-1bfb24120209",
+          "body": "{\n  \"kodi\": \"IS\",\n  \"land\": \"Ísland\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:56 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-b775f28b-029d-4e20-a25d-2766f8af3eb0"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "r1JVULlVdZxwJUdz5omFj5j+aotJ3rl+BHBqpnkkGujKTG9ivcEFFPzc3KRfRx7tA1vLPAWjs934Sr7qCoFB7w=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "99504780-105f-4cf3-ac81-3cce089061d9"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "38"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "802741ec-af17-478a-9602-d107aa36b795",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302989/faedingarstadur",
+      "responses": [
+        {
+          "uuid": "2dd8ea65-f391-4020-bea8-b567f99e8592",
+          "body": "{\n  \"sveitarfelagsnumer\": \"0000\",\n  \"stadur\": \"Reykjavík\",\n  \"faedingardagur\": \"1930-01-01T00:00:00\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:56 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-fb681d64-423e-48e3-9cce-cad746e9f1a8"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "IROHulpd42GHC6ksnwaEV5yP1Vu9aGc8/cbBErMn2uBzA05OuQlp/KoxIfdlsjSex/7Ovrdw+nUd3pup8pyDfw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "0d0809ec-7ed3-4016-8910-c12b866e0e28"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "102"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "c065ec07-878d-4d3f-8a02-1f2f2f2e4be2",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/fjolskyldumedlimir",
+      "responses": [
+        {
+          "uuid": "f06e0310-27bd-4ea9-931b-10ecc8896307",
+          "body": "{\n  \"fjolskyldunumer\": \"0101302989\",\n  \"einstaklingar\": [\n    {\n      \"kennitala\": \"0101302399\",\n      \"nafn\": \"Gervimaður Færeyjar\",\n      \"eiginnafn\": \"Gervimaður\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Færeyjar\",\n      \"fulltNafn\": \"Gervimaður Færeyjar\",\n      \"kynkodi\": \"2\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"1930-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    },\n    {\n      \"kennitala\": \"0101302989\",\n      \"nafn\": \"Gervimaður Ameríku \",\n      \"eiginnafn\": \"Gervimaður\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Ameríku\",\n      \"fulltNafn\": \"Gervimaður Ameríku\",\n      \"kynkodi\": \"1\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"1930-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    },\n    {\n      \"kennitala\": \"2222222229\",\n      \"nafn\": \"Stúfur Maack \",\n      \"eiginnafn\": \"Stúfur\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Maack\",\n      \"fulltNafn\": \"Stúfur Maack\",\n      \"kynkodi\": \"3\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"2020-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    },\n    {\n      \"kennitala\": \"3333333339\",\n      \"nafn\": \"Stubba Maack\",\n      \"eiginnafn\": \"Stúfur\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Maack\",\n      \"fulltNafn\": \"Stubba Maack\",\n      \"kynkodi\": \"4\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"2020-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    },\n    {\n      \"kennitala\": \"4444444449\",\n      \"nafn\": \"Dúskur Maack\",\n      \"eiginnafn\": \"Dúskur\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Maack\",\n      \"fulltNafn\": \"Dúskur Maack\",\n      \"kynkodi\": \"3\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"2020-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    },\n    {\n      \"kennitala\": \"5555555559\",\n      \"nafn\": \"Bína Maack \",\n      \"eiginnafn\": \"Bína\",\n      \"millinafn\": null,\n      \"kenninafn\": \"Maack\",\n      \"fulltNafn\": \"Bína Maack\",\n      \"kynkodi\": \"4\",\n      \"bannmerking\": false,\n      \"faedingardagur\": \"2020-01-01T00:00:00\",\n      \"logheimili\": {\n        \"heiti\": \"Hvassaleiti 5\",\n        \"postnumer\": \"103\",\n        \"stadur\": \"Reykjavík\",\n        \"sveitarfelagsnumer\": \"0000\"\n      },\n      \"adsetur\": null\n    }\n  ]\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:56 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-f2ee2554-dbfc-4a3b-90f4-d00b2a0f3d6f"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "Q9Y55HTJBH1D8je96Hg7TSBJe9azipZflI5MQGAbvnqxVqqeefzxrNOEpZKw2qX8PUz7zUJ9Rr92KVfrTRhgXw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "384872e9-47ff-44bc-82e8-8ea4a88a9bc9"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "2936"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "dbdf359e-c145-4e93-a5ad-9fcd0f76df00",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302989",
+      "responses": [
+        {
+          "uuid": "b2f8c53d-42ba-4941-8dc3-4c185fa24f93",
+          "body": "{\n  \"kennitala\": \"0101302989\",\n  \"nafn\": \"Gervimaður Ameríku \",\n  \"eiginnafn\": \"Gervimaður\",\n  \"millinafn\": null,\n  \"kenninafn\": \"Ameríku\",\n  \"fulltNafn\": \"Gervimaður Ameríku\",\n  \"kynkodi\": \"1\",\n  \"bannmerking\": false,\n  \"faedingardagur\": \"1930-01-01T00:00:00\",\n  \"logheimili\": {\n    \"heiti\": \"Hvassaleiti 5\",\n    \"postnumer\": \"103\",\n    \"stadur\": \"Reykjavík\",\n    \"sveitarfelagsnumer\": \"0000\"\n  },\n  \"adsetur\": null\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:56 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-4d11575e-5770-4325-934d-ddc60f290192"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "o1xMU0ouUD+XGnb3LELDIBQXGRWd72mYo+sONFc7eYnDT8lVdKnjc9HYt8rG8d0Aqxl1JUpsg1jyPR5npaXcpA=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "13c91fad-c194-40cf-9494-64ab206b90f4"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "418"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "4cc6b066-6773-484c-8623-f7fd7cec42b4",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/2222222229",
+      "responses": [
+        {
+          "uuid": "3a2b43e3-0af4-44c5-8e25-2365aff4bffd",
+          "body": "{\n  \"kennitala\": \"2222222229\",\n  \"nafn\": \"Stúfur Maack \",\n  \"eiginnafn\": \"Stúfur\",\n  \"millinafn\": null,\n  \"kenninafn\": \"Maack\",\n  \"fulltNafn\": \"Stúfur Maack\",\n  \"kynkodi\": \"3\",\n  \"bannmerking\": false,\n  \"faedingardagur\": \"2020-01-01T00:00:00\",\n  \"logheimili\": {\n    \"heiti\": \"Hvassaleiti 5\",\n    \"postnumer\": \"103\",\n    \"stadur\": \"Reykjavík\",\n    \"sveitarfelagsnumer\": \"0000\"\n  },\n  \"adsetur\": null\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:56 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-13bc66c4-9ff6-4885-acdb-bc83965dc1c7"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "GMgK2NU8E3ml/PVjqRhqlJUIshbj9up9rZdWJOV67pzsD0N0lrkUELiwwWokDWUypTsTscEaghsNlUkJAd1hoQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "99bdebba-2f20-4705-aec8-09ddd728d041"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "400"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "1e6fcb51-8b25-432b-a55b-329f4c8d83c4",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur/v1/insurancestatements/status/0101302399",
+      "responses": [
+        {
+          "uuid": "a9384814-ffa3-4bdd-ae69-35d53bb264c7",
+          "body": "{\n  \"canApply\": true,\n  \"isInsured\": true,\n  \"hasInsuranceStatement\": true,\n  \"insuranceStatementValidUntil\": \"2024-12-05\",\n  \"comment\": \"Umsækjandi á tryggingayfirlýsingu í gildi til 05.12.2024\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-security-policy",
+              "value": "frame-ancestors 'self' *.sjukra.is"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:46:47 GMT"
+            },
+            {
+              "key": "permissions-policy",
+              "value": "camera=(), microphone=(), geolocation=(), interest-cohort=()"
+            },
+            {
+              "key": "referrer-policy",
+              "value": "strict-origin-when-cross-origin"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=31536000;"
+            },
+            {
+              "key": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "key": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "testapp04"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-1e584f85-167b-44fb-91ab-119d05bf9c43"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "5iA9/KpgtdgiFKUr9zUQd3AHTilQVnO6DlCp+b4RW2CmNRa7S4SRUSCu0L/fnou+j4pFRunKjDM0vTJB9sDhVw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "6d2fe8ce-6e9f-4826-8960-0a359de53728"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur"
+            },
+            {
+              "key": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "key": "content-length",
+              "value": "198"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "ea8cf045-2a07-44d6-949e-f9711e681e6c",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302989/rikisfang",
+      "responses": [
+        {
+          "uuid": "d99e9cdb-c4ab-4702-91df-329e595a05f5",
+          "body": "{\n  \"kodi\": \"IS\",\n  \"land\": \"Ísland\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-5b874b7c-bc64-4fdb-bda5-e5d61fb12803"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "PXfCmGl+L9V/LiOdhQT/mYbITxYasXAi3N1OtIYN4+U+gjfJX74nJmktZqna50/rIolcOaOT6LA16/3w9hVLZg=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "b88b75cd-2703-4f87-9e08-154388bc56a9"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "38"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "5a1659fa-04ca-45dc-921d-fc61eefc5569",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/lyklar/hjuskaparkodar/3/2",
+      "responses": [
+        {
+          "uuid": "706d5ef9-e9f0-4c57-959a-19053da57a4e",
+          "body": "{\n  \"kodi\": \"3\",\n  \"lysing\": \"Gift\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-c354268d-6985-4ec6-a5f7-360030e6e6df"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "Cso/cA9t0KmBmE2rdHBUN/GgJmB9jLhxgRWBVu546f7KHQe8oU9hafgjoJknQd4j1VRcPWCxYjH6Jr//fqH6HQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "2152de0d-552c-4605-aa06-25198fd4b380"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "37"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "c01222ce-0e25-4d4a-8843-213ecefd3d12",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/2222222229/rikisfang",
+      "responses": [
+        {
+          "uuid": "92de2f3c-d22f-4a57-b506-325714235915",
+          "body": "{\n  \"kodi\": \"IS\",\n  \"land\": \"Ísland\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-193c079a-d583-4538-8177-1a0bf7371d26"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "De2RQc37I+rAuYvZq5Kft7YdXbym82RRhfIoRWZgpjfMvi7JU60BlIoSq+51dYDD+yiq3u6s2NcRcuIrU8sezg=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "b0d53f78-48d6-4c60-8de1-b82f4058de56"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "38"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "73a840d6-66ec-441a-8599-56f11ea0ba11",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302989/hjuskapur",
+      "responses": [
+        {
+          "uuid": "45319a91-a19b-436b-b46f-ed993a40a62f",
+          "body": "{\n  \"kennitalaMaka\": null,\n  \"nafnMaka\": null,\n  \"hjuskaparkodi\": \"3\",\n  \"breytt\": \"1992-11-16T00:00:00\",\n  \"sambud\": false,\n  \"sambudBreytt\": \"0001-01-01T00:00:00\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-6c05f081-387a-4e48-af59-e6dd6ffc7e9b"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "kutZxz4wF4QIzUF1UJAXRXWNUIFPY2xao0H7T1sQl8S+CEVAY7uIGZpRBTJDNNL0PFTNVrZclm/WphtxUF4Khg=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "9a689b75-5dcd-4bd5-addf-a7bec824dfcc"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "166"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "51b3a70c-3ca7-41f4-98ca-dffca855ab30",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/2222222229/hjuskapur",
+      "responses": [
+        {
+          "uuid": "1f264684-9996-4733-be49-f4ecefd7bb29",
+          "body": "{\n  \"kennitalaMaka\": null,\n  \"nafnMaka\": null,\n  \"hjuskaparkodi\": \"1\",\n  \"breytt\": \"0001-01-01T00:00:00\",\n  \"sambud\": false,\n  \"sambudBreytt\": \"0001-01-01T00:00:00\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-4787a7aa-5599-477a-a5ea-ebd86c53f8d8"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "UgAlzIxXr9Uh9xjDUaSjke2w6MSvw9YHBMO2/n3Y9idkWGIdcvMKMiV+f7nb9uUtWJNU/ONoK19J+8HYvAeeEQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "a5db1e41-1218-4cfc-8fbe-621153b9d102"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "166"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "466acf25-b822-407a-a42b-1fc0e09e11ee",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur/v1/insurancestatements/continents",
+      "responses": [
+        {
+          "uuid": "00804a1c-31d6-463a-a2d7-8aea592ab37a",
+          "body": "[\n  {\n    \"code\": \"99XT\",\n    \"name\": \"Africa\",\n    \"icelandicName\": \"Afríka\"\n  },\n  {\n    \"code\": \"99XS\",\n    \"name\": \"America\",\n    \"icelandicName\": \"Ameríka\"\n  },\n  {\n    \"code\": \"99XU\",\n    \"name\": \"Asia\",\n    \"icelandicName\": \"Asía\"\n  },\n  {\n    \"code\": \"99XR\",\n    \"name\": \"Europe\",\n    \"icelandicName\": \"Evrópa\"\n  },\n  {\n    \"code\": \"99XV\",\n    \"name\": \"Oceania\",\n    \"icelandicName\": \"Eyjaálfa\"\n  }\n]",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-security-policy",
+              "value": "frame-ancestors 'self' *.sjukra.is"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:46:48 GMT"
+            },
+            {
+              "key": "permissions-policy",
+              "value": "camera=(), microphone=(), geolocation=(), interest-cohort=()"
+            },
+            {
+              "key": "referrer-policy",
+              "value": "strict-origin-when-cross-origin"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=31536000;"
+            },
+            {
+              "key": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "key": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "testapp04"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-d4a579b5-21ee-4b61-9b70-52fd9e587ba9"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "4xcuIsAGXbgcrullGyHoeHfRRbUcFZb0u9OfWeyZvxT8U3OruN7sfXGAoMoNgrGMw/VbaUA3/gRsFUBHzOa2sw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "09f771ac-b1e3-4f99-950b-21ebe7cc0584"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur"
+            },
+            {
+              "key": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "key": "content-length",
+              "value": "408"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "7661781d-90c6-4769-88b0-99933a79ac07",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/forsja/2222222229",
+      "responses": [
+        {
+          "uuid": "72f3ec04-b49c-4421-9364-9e68bbc790bd",
+          "body": "[\n  \"0101302989\"\n]",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:34:57 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-cf1f64f9-5322-4d41-8b2d-45a68f22b845"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "MqIav9hjttXA9bGGOTFtUjYmTLgV+2iF8O5r4I3uFRbQNrMBEd9QdcfhDI4h56ESlsj0ZJDVYztZ6LSaIxN/cw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "73bfc3cd-4e1c-4413-9959-6acfcda7933b"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "18"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "e7206e1d-4bee-489f-88a0-c5f29687cf20",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur/v1/insurancestatements/countries",
+      "responses": [
+        {
+          "uuid": "ed63198c-ed8e-4f44-a000-e0c0feaa8c49",
+          "body": "[\n  {\n    \"code\": \"99AF\",\n    \"name\": \"Afghanistan\",\n    \"icelandicName\": \"Afganistan\"\n  },\n  {\n    \"code\": \"99AL\",\n    \"name\": \"Albania\",\n    \"icelandicName\": \"Albanía\"\n  },\n  {\n    \"code\": \"99DZ\",\n    \"name\": \"Algeria\",\n    \"icelandicName\": \"Alsír\"\n  },\n  {\n    \"code\": \"99AD\",\n    \"name\": \"Andorra\",\n    \"icelandicName\": \"Andorra\"\n  },\n  {\n    \"code\": \"99AO\",\n    \"name\": \"Angola\",\n    \"icelandicName\": \"Angóla\"\n  },\n  {\n    \"code\": \"99AI\",\n    \"name\": \"Anguilla\",\n    \"icelandicName\": \"Anguilla\"\n  },\n  {\n    \"code\": \"99AG\",\n    \"name\": \"Antigua and Barbuda\",\n    \"icelandicName\": \"Antígva Og Barbúda\"\n  },\n  {\n    \"code\": \"99AR\",\n    \"name\": \"Argentina\",\n    \"icelandicName\": \"Argentína\"\n  },\n  {\n    \"code\": \"99AM\",\n    \"name\": \"Armenia\",\n    \"icelandicName\": \"Armenía\"\n  },\n  {\n    \"code\": \"99AW\",\n    \"name\": \"Aruba\",\n    \"icelandicName\": \"Arúba\"\n  },\n  {\n    \"code\": \"99AZ\",\n    \"name\": \"Azerbaijan\",\n    \"icelandicName\": \"Aserbaídsjan\"\n  },\n  {\n    \"code\": \"99TL\",\n    \"name\": \"East Timor\",\n    \"icelandicName\": \"Austur Tímor\"\n  },\n  {\n    \"code\": \"99AT\",\n    \"name\": \"Austria\",\n    \"icelandicName\": \"Austurríki\"\n  },\n  {\n    \"code\": \"99DD\",\n    \"name\": \"East-Germany\",\n    \"icelandicName\": \"Austur-Þýskaland\"\n  },\n  {\n    \"code\": \"99AX\",\n    \"name\": \"Åland Islands\",\n    \"icelandicName\": \"Álandseyjar\"\n  },\n  {\n    \"code\": \"99AU\",\n    \"name\": \"Australia\",\n    \"icelandicName\": \"Ástralía\"\n  },\n  {\n    \"code\": \"99BS\",\n    \"name\": \"Bahamas\",\n    \"icelandicName\": \"Bahamaeyjar\"\n  },\n  {\n    \"code\": \"99US\",\n    \"name\": \"The United States\",\n    \"icelandicName\": \"Bandaríkin\"\n  },\n  {\n    \"code\": \"99AS\",\n    \"name\": \"American Samoa\",\n    \"icelandicName\": \"Bandaríska Samóa\"\n  },\n  {\n    \"code\": \"99BD\",\n    \"name\": \"Bangladesh\",\n    \"icelandicName\": \"Bangladess\"\n  },\n  {\n    \"code\": \"99BB\",\n    \"name\": \"Barbados\",\n    \"icelandicName\": \"Barbados\"\n  },\n  {\n    \"code\": \"99BH\",\n    \"name\": \"Bahrain\",\n    \"icelandicName\": \"Barein\"\n  },\n  {\n    \"code\": \"99BE\",\n    \"name\": \"Belgium\",\n    \"icelandicName\": \"Belgía\"\n  },\n  {\n    \"code\": \"99BZ\",\n    \"name\": \"Belize\",\n    \"icelandicName\": \"Belís\"\n  },\n  {\n    \"code\": \"99BJ\",\n    \"name\": \"Benin\",\n    \"icelandicName\": \"Benín\"\n  },\n  {\n    \"code\": \"99BM\",\n    \"name\": \"Bermuda\",\n    \"icelandicName\": \"Bermúdaeyjar\"\n  },\n  {\n    \"code\": \"99BQ\",\n    \"name\": \"Bonaire\",\n    \"icelandicName\": \"Bonaire\"\n  },\n  {\n    \"code\": \"99BA\",\n    \"name\": \"Bosnia-Herzgovina\",\n    \"icelandicName\": \"Bosnía-Hersegóvína\"\n  },\n  {\n    \"code\": \"99BW\",\n    \"name\": \"Botswana\",\n    \"icelandicName\": \"Botsvana\"\n  },\n  {\n    \"code\": \"99BV\",\n    \"name\": \"Bouvet Island\",\n    \"icelandicName\": \"Bouvet eyja\"\n  },\n  {\n    \"code\": \"99BO\",\n    \"name\": \"Bolivia\",\n    \"icelandicName\": \"Bólivía\"\n  },\n  {\n    \"code\": \"99BR\",\n    \"name\": \"Brazil\",\n    \"icelandicName\": \"Brasilía\"\n  },\n  {\n    \"code\": \"99IO\",\n    \"name\": \"British Indian Ocean Territory\",\n    \"icelandicName\": \"Breska indverska hafsvæðið\"\n  },\n  {\n    \"code\": \"99GB\",\n    \"name\": \"Great Britain\",\n    \"icelandicName\": \"Bretland\"\n  },\n  {\n    \"code\": \"99BN\",\n    \"name\": \"Brunei\",\n    \"icelandicName\": \"Brúnei\"\n  },\n  {\n    \"code\": \"99BG\",\n    \"name\": \"Bulgaria\",\n    \"icelandicName\": \"Búlgaría\"\n  },\n  {\n    \"code\": \"99BF\",\n    \"name\": \"Burkina Faso\",\n    \"icelandicName\": \"Búrkína-Fasó\"\n  },\n  {\n    \"code\": \"99BI\",\n    \"name\": \"Burundi\",\n    \"icelandicName\": \"Búrúndí\"\n  },\n  {\n    \"code\": \"99BT\",\n    \"name\": \"Bhutan\",\n    \"icelandicName\": \"Bútan\"\n  },\n  {\n    \"code\": \"99KY\",\n    \"name\": \"Cayman Islands\",\n    \"icelandicName\": \"Caymaneyjar\"\n  },\n  {\n    \"code\": \"99TD\",\n    \"name\": \"Chad\",\n    \"icelandicName\": \"Chad\"\n  },\n  {\n    \"code\": \"99CL\",\n    \"name\": \"Chile\",\n    \"icelandicName\": \"Chile\"\n  },\n  {\n    \"code\": \"99CK\",\n    \"name\": \"Cook Islands\",\n    \"icelandicName\": \"Cookseyjar\"\n  },\n  {\n    \"code\": \"99CW\",\n    \"name\": \"Curacao\",\n    \"icelandicName\": \"Curacao\"\n  },\n  {\n    \"code\": \"99DK\",\n    \"name\": \"Denmark\",\n    \"icelandicName\": \"Danmörk\"\n  },\n  {\n    \"code\": \"99DJ\",\n    \"name\": \"Djibouti\",\n    \"icelandicName\": \"Djíbútí\"\n  },\n  {\n    \"code\": \"99DM\",\n    \"name\": \"Dominica\",\n    \"icelandicName\": \"Dóminíka\"\n  },\n  {\n    \"code\": \"99DO\",\n    \"name\": \"Dominican Republic\",\n    \"icelandicName\": \"Dóminíska lýðveldið\"\n  },\n  {\n    \"code\": \"99EG\",\n    \"name\": \"Egypt\",\n    \"icelandicName\": \"Egyptaland\"\n  },\n  {\n    \"code\": \"99EE\",\n    \"name\": \"Estonia\",\n    \"icelandicName\": \"Eistland\"\n  },\n  {\n    \"code\": \"99EC\",\n    \"name\": \"Ecuador\",\n    \"icelandicName\": \"Ekvador\"\n  },\n  {\n    \"code\": \"99SV\",\n    \"name\": \"El Salvador\",\n    \"icelandicName\": \"El Salvador\"\n  },\n  {\n    \"code\": \"99ER\",\n    \"name\": \"Eritrea\",\n    \"icelandicName\": \"Erítrea\"\n  },\n  {\n    \"code\": \"99ET\",\n    \"name\": \"Ethiopia\",\n    \"icelandicName\": \"Eþíópía\"\n  },\n  {\n    \"code\": \"99FK\",\n    \"name\": \"Falkland Islands\",\n    \"icelandicName\": \"Falklandseyjar\"\n  },\n  {\n    \"code\": \"99PH\",\n    \"name\": \"Philippines\",\n    \"icelandicName\": \"Filippseyjar\"\n  },\n  {\n    \"code\": \"99FI\",\n    \"name\": \"Finland\",\n    \"icelandicName\": \"Finnland\"\n  },\n  {\n    \"code\": \"99FJ\",\n    \"name\": \"Fiji\",\n    \"icelandicName\": \"Fídji\"\n  },\n  {\n    \"code\": \"99CI\",\n    \"name\": \"Ivory Coast\",\n    \"icelandicName\": \"Fílabeinsströnd\"\n  },\n  {\n    \"code\": \"99FR\",\n    \"name\": \"France\",\n    \"icelandicName\": \"Frakkland\"\n  },\n  {\n    \"code\": \"99GF\",\n    \"name\": \"French Guiana\",\n    \"icelandicName\": \"Franska Guiana\"\n  },\n  {\n    \"code\": \"99PF\",\n    \"name\": \"French Polynesia\",\n    \"icelandicName\": \"Franska Pólýnesía\"\n  },\n  {\n    \"code\": \"99TF\",\n    \"name\": \"French Southern Territories\",\n    \"icelandicName\": \"Franska suður svæðið\"\n  },\n  {\n    \"code\": \"99FO\",\n    \"name\": \"Faeroe Islands\",\n    \"icelandicName\": \"Færeyjar\"\n  },\n  {\n    \"code\": \"99GA\",\n    \"name\": \"Gabon\",\n    \"icelandicName\": \"Gabon\"\n  },\n  {\n    \"code\": \"99GM\",\n    \"name\": \"Gambia\",\n    \"icelandicName\": \"Gambía\"\n  },\n  {\n    \"code\": \"99GH\",\n    \"name\": \"Ghana\",\n    \"icelandicName\": \"Gana\"\n  },\n  {\n    \"code\": \"99GE\",\n    \"name\": \"Georgia\",\n    \"icelandicName\": \"Georgía\"\n  },\n  {\n    \"code\": \"99GI\",\n    \"name\": \"Gibraltar\",\n    \"icelandicName\": \"Gíbraltar\"\n  },\n  {\n    \"code\": \"99GN\",\n    \"name\": \"Guinea\",\n    \"icelandicName\": \"Gínea\"\n  },\n  {\n    \"code\": \"99GW\",\n    \"name\": \"Guinea-Bissau\",\n    \"icelandicName\": \"Gínea-Bissá\"\n  },\n  {\n    \"code\": \"99GD\",\n    \"name\": \"Grenada\",\n    \"icelandicName\": \"Grenada\"\n  },\n  {\n    \"code\": \"99GR\",\n    \"name\": \"Greece\",\n    \"icelandicName\": \"Grikkland\"\n  },\n  {\n    \"code\": \"99CV\",\n    \"name\": \"Cape Verde\",\n    \"icelandicName\": \"Grænhöfðaeyjar\"\n  },\n  {\n    \"code\": \"99GL\",\n    \"name\": \"Greenland\",\n    \"icelandicName\": \"Grænland\"\n  },\n  {\n    \"code\": \"99GP\",\n    \"name\": \"Guadeloupe\",\n    \"icelandicName\": \"Guadeloupe\"\n  },\n  {\n    \"code\": \"99GU\",\n    \"name\": \"Guam\",\n    \"icelandicName\": \"Guam\"\n  },\n  {\n    \"code\": \"99GG\",\n    \"name\": \"Guernsey\",\n    \"icelandicName\": \"Guernsey\"\n  },\n  {\n    \"code\": \"99GT\",\n    \"name\": \"Guatemala\",\n    \"icelandicName\": \"Gvatemala\"\n  },\n  {\n    \"code\": \"99GY\",\n    \"name\": \"Guyana\",\n    \"icelandicName\": \"Gvæjana\"\n  },\n  {\n    \"code\": \"99HT\",\n    \"name\": \"Haiti\",\n    \"icelandicName\": \"Haítí\"\n  },\n  {\n    \"code\": \"99HM\",\n    \"name\": \"Heard Island and McDonald Isl.\",\n    \"icelandicName\": \"Heard eyja og McDonald eyjur\"\n  },\n  {\n    \"code\": \"99NL\",\n    \"name\": \"Netherlands\",\n    \"icelandicName\": \"Holland\"\n  },\n  {\n    \"code\": \"99AN\",\n    \"name\": \"Netherlands Antilles\",\n    \"icelandicName\": \"Hollensku Antillur\"\n  },\n  {\n    \"code\": \"99HN\",\n    \"name\": \"Honduras\",\n    \"icelandicName\": \"Hondúras\"\n  },\n  {\n    \"code\": \"99HK\",\n    \"name\": \"Hong Kong\",\n    \"icelandicName\": \"Hong Kong\"\n  },\n  {\n    \"code\": \"99BY\",\n    \"name\": \"Belarus\",\n    \"icelandicName\": \"Hvíta-Rússland\"\n  },\n  {\n    \"code\": \"99IN\",\n    \"name\": \"India\",\n    \"icelandicName\": \"Indland\"\n  },\n  {\n    \"code\": \"99ID\",\n    \"name\": \"Indonesia\",\n    \"icelandicName\": \"Indónesía\"\n  },\n  {\n    \"code\": \"99IQ\",\n    \"name\": \"Iraq\",\n    \"icelandicName\": \"Írak\"\n  },\n  {\n    \"code\": \"99IR\",\n    \"name\": \"Iran\",\n    \"icelandicName\": \"Íran\"\n  },\n  {\n    \"code\": \"99IE\",\n    \"name\": \"Ireland\",\n    \"icelandicName\": \"Írland\"\n  },\n  {\n    \"code\": \"99IS\",\n    \"name\": \"Iceland\",\n    \"icelandicName\": \"Ísland\"\n  },\n  {\n    \"code\": \"99IL\",\n    \"name\": \"Israel\",\n    \"icelandicName\": \"Ísrael\"\n  },\n  {\n    \"code\": \"99IT\",\n    \"name\": \"Italy\",\n    \"icelandicName\": \"Ítalía\"\n  },\n  {\n    \"code\": \"99JM\",\n    \"name\": \"Jamaica\",\n    \"icelandicName\": \"Jamaíka\"\n  },\n  {\n    \"code\": \"99JP\",\n    \"name\": \"Japan\",\n    \"icelandicName\": \"Japan\"\n  },\n  {\n    \"code\": \"99YE\",\n    \"name\": \"Jemen\",\n    \"icelandicName\": \"Jemen\"\n  },\n  {\n    \"code\": \"99JE\",\n    \"name\": \"Jersey\",\n    \"icelandicName\": \"Jersey\"\n  },\n  {\n    \"code\": \"99CX\",\n    \"name\": \"Christmas Island\",\n    \"icelandicName\": \"Jólaey\"\n  },\n  {\n    \"code\": \"99VI\",\n    \"name\": \"Virgin Islands (U.S)\",\n    \"icelandicName\": \"Jómfrúreyjar, bandar\"\n  },\n  {\n    \"code\": \"99VG\",\n    \"name\": \"Virgin Islands (British)\",\n    \"icelandicName\": \"Jómfrúreyjar, breskar\"\n  },\n  {\n    \"code\": \"99JO\",\n    \"name\": \"Jordan\",\n    \"icelandicName\": \"Jórdanía\"\n  },\n  {\n    \"code\": \"99YU\",\n    \"name\": \"Yugoslavia\",\n    \"icelandicName\": \"Júgóslavía\"\n  },\n  {\n    \"code\": \"99KH\",\n    \"name\": \"Cambodia\",\n    \"icelandicName\": \"Kambódía\"\n  },\n  {\n    \"code\": \"99CM\",\n    \"name\": \"Cameroon\",\n    \"icelandicName\": \"Kamerún\"\n  },\n  {\n    \"code\": \"99CA\",\n    \"name\": \"Canada\",\n    \"icelandicName\": \"Kanada\"\n  },\n  {\n    \"code\": \"99KZ\",\n    \"name\": \"Kazakhstan\",\n    \"icelandicName\": \"Kasakstan\"\n  },\n  {\n    \"code\": \"99QA\",\n    \"name\": \"Quatar\",\n    \"icelandicName\": \"Katar\"\n  },\n  {\n    \"code\": \"99KE\",\n    \"name\": \"Kenya\",\n    \"icelandicName\": \"Kenía\"\n  },\n  {\n    \"code\": \"99KG\",\n    \"name\": \"Kyrgyzstan\",\n    \"icelandicName\": \"Kirgisistan\"\n  },\n  {\n    \"code\": \"99KI\",\n    \"name\": \"Kiribati\",\n    \"icelandicName\": \"Kiribatí\"\n  },\n  {\n    \"code\": \"99CN\",\n    \"name\": \"China\",\n    \"icelandicName\": \"Kína\"\n  },\n  {\n    \"code\": \"99CG\",\n    \"name\": \"Congo\",\n    \"icelandicName\": \"Kongó\"\n  },\n  {\n    \"code\": \"99QR\",\n    \"name\": \"Kosovo\",\n    \"icelandicName\": \"Kosóva\"\n  },\n  {\n    \"code\": \"99CR\",\n    \"name\": \"Costa Rica\",\n    \"icelandicName\": \"Kosta Ríka\"\n  },\n  {\n    \"code\": \"99CC\",\n    \"name\": \"Cocos  Islands\",\n    \"icelandicName\": \"Kókoseyjar\"\n  },\n  {\n    \"code\": \"99CO\",\n    \"name\": \"Colombia\",\n    \"icelandicName\": \"Kólumbía\"\n  },\n  {\n    \"code\": \"99KM\",\n    \"name\": \"Comoros\",\n    \"icelandicName\": \"Kómóróeyjar\"\n  },\n  {\n    \"code\": \"99XK\",\n    \"name\": \"Kosovo\",\n    \"icelandicName\": \"Kósóvó\"\n  },\n  {\n    \"code\": \"99HR\",\n    \"name\": \"Croatia\",\n    \"icelandicName\": \"Króatía\"\n  },\n  {\n    \"code\": \"99CU\",\n    \"name\": \"Cuba\",\n    \"icelandicName\": \"Kúba\"\n  },\n  {\n    \"code\": \"99KW\",\n    \"name\": \"Kuwait\",\n    \"icelandicName\": \"Kúveit\"\n  },\n  {\n    \"code\": \"99CY\",\n    \"name\": \"Cyprus\",\n    \"icelandicName\": \"Kýpur\"\n  },\n  {\n    \"code\": \"99LA\",\n    \"name\": \"Laos\",\n    \"icelandicName\": \"Laos\"\n  },\n  {\n    \"code\": \"99LS\",\n    \"name\": \"Lesotho\",\n    \"icelandicName\": \"Lesótó\"\n  },\n  {\n    \"code\": \"99LV\",\n    \"name\": \"Latvia\",\n    \"icelandicName\": \"Lettland\"\n  },\n  {\n    \"code\": \"99LI\",\n    \"name\": \"Liechtenstein\",\n    \"icelandicName\": \"Liechtenstein\"\n  },\n  {\n    \"code\": \"99LT\",\n    \"name\": \"Lithuania\",\n    \"icelandicName\": \"Litháen\"\n  },\n  {\n    \"code\": \"99LB\",\n    \"name\": \"Lebanon\",\n    \"icelandicName\": \"Líbanon\"\n  },\n  {\n    \"code\": \"99LR\",\n    \"name\": \"Liberia\",\n    \"icelandicName\": \"Líbería\"\n  },\n  {\n    \"code\": \"99LY\",\n    \"name\": \"Libya\",\n    \"icelandicName\": \"Líbía\"\n  },\n  {\n    \"code\": \"99LU\",\n    \"name\": \"Luxembourg\",\n    \"icelandicName\": \"Lúxemborg\"\n  },\n  {\n    \"code\": \"99CD\",\n    \"name\": \"Congo Republic\",\n    \"icelandicName\": \"Lýðveldið Kongó\"\n  },\n  {\n    \"code\": \"99MG\",\n    \"name\": \"Madagascar\",\n    \"icelandicName\": \"Madagaskar\"\n  },\n  {\n    \"code\": \"99MO\",\n    \"name\": \"Macau\",\n    \"icelandicName\": \"Makaó\"\n  },\n  {\n    \"code\": \"99MK\",\n    \"name\": \"Macedonia\",\n    \"icelandicName\": \"Makedónía\"\n  },\n  {\n    \"code\": \"99MY\",\n    \"name\": \"Malaysia\",\n    \"icelandicName\": \"Malasía\"\n  },\n  {\n    \"code\": \"99MW\",\n    \"name\": \"Malawi\",\n    \"icelandicName\": \"Malaví\"\n  },\n  {\n    \"code\": \"99MV\",\n    \"name\": \"Maldives\",\n    \"icelandicName\": \"Maldíveyjar\"\n  },\n  {\n    \"code\": \"99ML\",\n    \"name\": \"Mali\",\n    \"icelandicName\": \"Malí\"\n  },\n  {\n    \"code\": \"99MT\",\n    \"name\": \"Malta\",\n    \"icelandicName\": \"Malta\"\n  },\n  {\n    \"code\": \"99MA\",\n    \"name\": \"Morocco\",\n    \"icelandicName\": \"Marokkó\"\n  },\n  {\n    \"code\": \"99MH\",\n    \"name\": \"Marshall Islands\",\n    \"icelandicName\": \"Marshallseyjar\"\n  },\n  {\n    \"code\": \"99MQ\",\n    \"name\": \"Martinique\",\n    \"icelandicName\": \"Martiník\"\n  },\n  {\n    \"code\": \"99YT\",\n    \"name\": \"Mayotte\",\n    \"icelandicName\": \"Mayotte\"\n  },\n  {\n    \"code\": \"99MR\",\n    \"name\": \"Maritania\",\n    \"icelandicName\": \"Máritanía\"\n  },\n  {\n    \"code\": \"99MU\",\n    \"name\": \"Mauritius\",\n    \"icelandicName\": \"Máritíus\"\n  },\n  {\n    \"code\": \"99MX\",\n    \"name\": \"Mexico\",\n    \"icelandicName\": \"Mexíkó\"\n  },\n  {\n    \"code\": \"99CF\",\n    \"name\": \"Central African Republic\",\n    \"icelandicName\": \"Miðafríka\"\n  },\n  {\n    \"code\": \"99GQ\",\n    \"name\": \"Equatorial Guinea\",\n    \"icelandicName\": \"Miðbaugs-Gínea\"\n  },\n  {\n    \"code\": \"99FM\",\n    \"name\": \"Micronesia\",\n    \"icelandicName\": \"Míkrónesía\"\n  },\n  {\n    \"code\": \"99MD\",\n    \"name\": \"Moldova\",\n    \"icelandicName\": \"Moldóva\"\n  },\n  {\n    \"code\": \"99MN\",\n    \"name\": \"Mongolia\",\n    \"icelandicName\": \"Mongólía\"\n  },\n  {\n    \"code\": \"99MS\",\n    \"name\": \"Montserrat\",\n    \"icelandicName\": \"Montserrat\"\n  },\n  {\n    \"code\": \"99MC\",\n    \"name\": \"Monaco\",\n    \"icelandicName\": \"Mónakó\"\n  },\n  {\n    \"code\": \"99MZ\",\n    \"name\": \"Mozambique\",\n    \"icelandicName\": \"Mósambík\"\n  },\n  {\n    \"code\": \"99MM\",\n    \"name\": \"Myanmar\",\n    \"icelandicName\": \"Mýanmar\"\n  },\n  {\n    \"code\": \"99IM\",\n    \"name\": \"Isle of Man\",\n    \"icelandicName\": \"Mön\"\n  },\n  {\n    \"code\": \"99NA\",\n    \"name\": \"Namibia\",\n    \"icelandicName\": \"Namibía\"\n  },\n  {\n    \"code\": \"99NR\",\n    \"name\": \"Nauru\",\n    \"icelandicName\": \"Naúrú\"\n  },\n  {\n    \"code\": \"99NP\",\n    \"name\": \"Nepal\",\n    \"icelandicName\": \"Nepal\"\n  },\n  {\n    \"code\": \"99NU\",\n    \"name\": \"Niue\",\n    \"icelandicName\": \"Niue\"\n  },\n  {\n    \"code\": \"99NE\",\n    \"name\": \"Niger\",\n    \"icelandicName\": \"Níger\"\n  },\n  {\n    \"code\": \"99NG\",\n    \"name\": \"Nigeria\",\n    \"icelandicName\": \"Nígería\"\n  },\n  {\n    \"code\": \"99NI\",\n    \"name\": \"Nicaragua\",\n    \"icelandicName\": \"Níkaragva\"\n  },\n  {\n    \"code\": \"99KP\",\n    \"name\": \"North-Korea\",\n    \"icelandicName\": \"Norður-Kórea\"\n  },\n  {\n    \"code\": \"99NO\",\n    \"name\": \"Norway\",\n    \"icelandicName\": \"Noregur\"\n  },\n  {\n    \"code\": \"99NF\",\n    \"name\": \"Norfolk Island\",\n    \"icelandicName\": \"Norfolkey\"\n  },\n  {\n    \"code\": \"99MP\",\n    \"name\": \"Northern Mariana Islands\",\n    \"icelandicName\": \"Northern Mariana Islands\"\n  },\n  {\n    \"code\": \"99NC\",\n    \"name\": \"New Caledonia\",\n    \"icelandicName\": \"Nýja-Kaledónía\"\n  },\n  {\n    \"code\": \"99NZ\",\n    \"name\": \"New Zealand\",\n    \"icelandicName\": \"Nýja-Sjáland\"\n  },\n  {\n    \"code\": \"99OM\",\n    \"name\": \"Oman\",\n    \"icelandicName\": \"Óman\"\n  },\n  {\n    \"code\": \"99XY\",\n    \"name\": \"Undefined\",\n    \"icelandicName\": \"Óþekkt ríkisfang\"\n  },\n  {\n    \"code\": \"99PK\",\n    \"name\": \"Pakistan\",\n    \"icelandicName\": \"Pakistan\"\n  },\n  {\n    \"code\": \"99PW\",\n    \"name\": \"Palau\",\n    \"icelandicName\": \"Palaú\"\n  },\n  {\n    \"code\": \"99PS\",\n    \"name\": \"Palestine\",\n    \"icelandicName\": \"Palestína\"\n  },\n  {\n    \"code\": \"99PA\",\n    \"name\": \"Panama\",\n    \"icelandicName\": \"Panama\"\n  },\n  {\n    \"code\": \"99PG\",\n    \"name\": \"Papua New Guinea\",\n    \"icelandicName\": \"Papúa Nýja-Gínea\"\n  },\n  {\n    \"code\": \"99PY\",\n    \"name\": \"Paraguay\",\n    \"icelandicName\": \"Paraguay\"\n  },\n  {\n    \"code\": \"99VA\",\n    \"name\": \"Vatican City State\",\n    \"icelandicName\": \"Páfagarður\"\n  },\n  {\n    \"code\": \"99PE\",\n    \"name\": \"Peru\",\n    \"icelandicName\": \"Perú\"\n  },\n  {\n    \"code\": \"99PN\",\n    \"name\": \"Pitcairn\",\n    \"icelandicName\": \"Pitcairn\"\n  },\n  {\n    \"code\": \"99PT\",\n    \"name\": \"Portugal\",\n    \"icelandicName\": \"Portúgal\"\n  },\n  {\n    \"code\": \"99PL\",\n    \"name\": \"Poland\",\n    \"icelandicName\": \"Pólland\"\n  },\n  {\n    \"code\": \"99PR\",\n    \"name\": \"Puerto Rico\",\n    \"icelandicName\": \"Púerto-Ríco\"\n  },\n  {\n    \"code\": \"99RE\",\n    \"name\": \"Reunion\",\n    \"icelandicName\": \"Reunion\"\n  },\n  {\n    \"code\": \"99XZ\",\n    \"name\": \"Undefined\",\n    \"icelandicName\": \"Ríkisfangslaus\"\n  },\n  {\n    \"code\": \"99RW\",\n    \"name\": \"Rwanda\",\n    \"icelandicName\": \"Rúanda\"\n  },\n  {\n    \"code\": \"99RO\",\n    \"name\": \"Romania\",\n    \"icelandicName\": \"Rúmenía\"\n  },\n  {\n    \"code\": \"99RU\",\n    \"name\": \"Russia\",\n    \"icelandicName\": \"Rússland\"\n  },\n  {\n    \"code\": \"99ZR\",\n    \"name\": \"Zaire\",\n    \"icelandicName\": \"Saír\"\n  },\n  {\n    \"code\": \"99SB\",\n    \"name\": \"Solomon Islands\",\n    \"icelandicName\": \"Salómonseyjar\"\n  },\n  {\n    \"code\": \"99ZM\",\n    \"name\": \"Zambia\",\n    \"icelandicName\": \"Sambía\"\n  },\n  {\n    \"code\": \"99AE\",\n    \"name\": \"United Arab Emitates\",\n    \"icelandicName\": \"Sameinuð Arabafurstad\"\n  },\n  {\n    \"code\": \"99WS\",\n    \"name\": \"Samoa\",\n    \"icelandicName\": \"Samóa\"\n  },\n  {\n    \"code\": \"99SM\",\n    \"name\": \"San Marino\",\n    \"icelandicName\": \"San Marínó\"\n  },\n  {\n    \"code\": \"99ST\",\n    \"name\": \"Sao Tome and Principe\",\n    \"icelandicName\": \"Saó Tóme Og Principe\"\n  },\n  {\n    \"code\": \"99SA\",\n    \"name\": \"Saudi Arabia\",\n    \"icelandicName\": \"Sádi-Arabía\"\n  },\n  {\n    \"code\": \"99SN\",\n    \"name\": \"Senegal\",\n    \"icelandicName\": \"Senegal\"\n  },\n  {\n    \"code\": \"99RS\",\n    \"name\": \"Serbia\",\n    \"icelandicName\": \"Serbía\"\n  },\n  {\n    \"code\": \"99CS\",\n    \"name\": \"Serbia & Montenegro\",\n    \"icelandicName\": \"Serbía og Svartfjland\"\n  },\n  {\n    \"code\": \"99SC\",\n    \"name\": \"Seychelles\",\n    \"icelandicName\": \"Seychelleseyjar\"\n  },\n  {\n    \"code\": \"99ZW\",\n    \"name\": \"Zimbabwe\",\n    \"icelandicName\": \"Simbabve\"\n  },\n  {\n    \"code\": \"99SG\",\n    \"name\": \"Singapore\",\n    \"icelandicName\": \"Singapúr\"\n  },\n  {\n    \"code\": \"99SX\",\n    \"name\": \"Sint Maarten (Dutch part)\",\n    \"icelandicName\": \"Sint Maarten, hollenski hlutinn\"\n  },\n  {\n    \"code\": \"99SL\",\n    \"name\": \"Sierra Leone\",\n    \"icelandicName\": \"Síerra Leóne\"\n  },\n  {\n    \"code\": \"99SK\",\n    \"name\": \"Slovakia\",\n    \"icelandicName\": \"Slóvakía\"\n  },\n  {\n    \"code\": \"99SI\",\n    \"name\": \"Slovenia\",\n    \"icelandicName\": \"Slóvenía\"\n  },\n  {\n    \"code\": \"99SU\",\n    \"name\": \"Soviet Union\",\n    \"icelandicName\": \"Sovétríkin\"\n  },\n  {\n    \"code\": \"99SO\",\n    \"name\": \"Somalia\",\n    \"icelandicName\": \"Sómalía\"\n  },\n  {\n    \"code\": \"99ES\",\n    \"name\": \"Spain\",\n    \"icelandicName\": \"Spánn\"\n  },\n  {\n    \"code\": \"99LK\",\n    \"name\": \"Sri Lanka\",\n    \"icelandicName\": \"Srí Lanka\"\n  },\n  {\n    \"code\": \"99BL\",\n    \"name\": \"Saint Barthélemy\",\n    \"icelandicName\": \"St. Barthélemy\"\n  },\n  {\n    \"code\": \"99SH\",\n    \"name\": \"Saint Helena, Ascension and Tr.\",\n    \"icelandicName\": \"St. Helena, Ascension og Trist.\"\n  },\n  {\n    \"code\": \"99KN\",\n    \"name\": \"Saint Kitts and Nevis\",\n    \"icelandicName\": \"St. Kitts og Nevis\"\n  },\n  {\n    \"code\": \"99LC\",\n    \"name\": \"Saint Lusia\",\n    \"icelandicName\": \"St. Lúsía\"\n  },\n  {\n    \"code\": \"99MF\",\n    \"name\": \"Saint Martin (French part)\",\n    \"icelandicName\": \"St. Martin (Franski hlutinn)\"\n  },\n  {\n    \"code\": \"99PM\",\n    \"name\": \"Saint Pierre and Miquelon\",\n    \"icelandicName\": \"St. Pierre og Miquelon\"\n  },\n  {\n    \"code\": \"99VC\",\n    \"name\": \"St.Vincent/Grenadines\",\n    \"icelandicName\": \"St.Vincent/Grenadines\"\n  },\n  {\n    \"code\": \"99GS\",\n    \"name\": \"S-Georgia and the S-Sandwich I.\",\n    \"icelandicName\": \"Suður Georgia og s-samlokueyjar\"\n  },\n  {\n    \"code\": \"99SS\",\n    \"name\": \"Suður Súdan\",\n    \"icelandicName\": \"Suður Súdan\"\n  },\n  {\n    \"code\": \"99ZA\",\n    \"name\": \"South Africa\",\n    \"icelandicName\": \"Suður-Afríka\"\n  },\n  {\n    \"code\": \"99AQ\",\n    \"name\": \"Antarctica\",\n    \"icelandicName\": \"Suðurheimskautslandið\"\n  },\n  {\n    \"code\": \"99YD\",\n    \"name\": \"South Yemen\",\n    \"icelandicName\": \"Suður-Jemen\"\n  },\n  {\n    \"code\": \"99KR\",\n    \"name\": \"South Korea\",\n    \"icelandicName\": \"Suður-Kórea\"\n  },\n  {\n    \"code\": \"99SD\",\n    \"name\": \"Sudan\",\n    \"icelandicName\": \"Súdan\"\n  },\n  {\n    \"code\": \"99SR\",\n    \"name\": \"Suriname\",\n    \"icelandicName\": \"Súrínam\"\n  },\n  {\n    \"code\": \"99SJ\",\n    \"name\": \"Svalb. and Jan Mayen\",\n    \"icelandicName\": \"Svalb. Og Jan Mayen\"\n  },\n  {\n    \"code\": \"99ME\",\n    \"name\": \"Montenegro\",\n    \"icelandicName\": \"Svartfjallaland\"\n  },\n  {\n    \"code\": \"99SZ\",\n    \"name\": \"Swasiland\",\n    \"icelandicName\": \"Svasíland\"\n  },\n  {\n    \"code\": \"99CH\",\n    \"name\": \"Switzerland\",\n    \"icelandicName\": \"Sviss\"\n  },\n  {\n    \"code\": \"99SE\",\n    \"name\": \"Sweden\",\n    \"icelandicName\": \"Svíþjóð\"\n  },\n  {\n    \"code\": \"99SY\",\n    \"name\": \"Syria\",\n    \"icelandicName\": \"Sýrland\"\n  },\n  {\n    \"code\": \"99TJ\",\n    \"name\": \"Tajikistan\",\n    \"icelandicName\": \"Tadsjikistan\"\n  },\n  {\n    \"code\": \"99TH\",\n    \"name\": \"Thailand\",\n    \"icelandicName\": \"Taíland\"\n  },\n  {\n    \"code\": \"99TW\",\n    \"name\": \"Taiwan\",\n    \"icelandicName\": \"Taívan\"\n  },\n  {\n    \"code\": \"99TZ\",\n    \"name\": \"Tanzania\",\n    \"icelandicName\": \"Tansanía\"\n  },\n  {\n    \"code\": \"99CZ\",\n    \"name\": \"Czech Republic\",\n    \"icelandicName\": \"Tékkland\"\n  },\n  {\n    \"code\": \"99QZ\",\n    \"name\": \"Czechoslovakia\",\n    \"icelandicName\": \"Tékkóslóvakía\"\n  },\n  {\n    \"code\": \"99TO\",\n    \"name\": \"Tonga\",\n    \"icelandicName\": \"Tonga\"\n  },\n  {\n    \"code\": \"99TG\",\n    \"name\": \"Tógó\",\n    \"icelandicName\": \"Tógó\"\n  },\n  {\n    \"code\": \"99TK\",\n    \"name\": \"Tokelau\",\n    \"icelandicName\": \"Tókelaú\"\n  },\n  {\n    \"code\": \"99TT\",\n    \"name\": \"Trinidad and Tobago\",\n    \"icelandicName\": \"Trínidad og Tobagó\"\n  },\n  {\n    \"code\": \"99TM\",\n    \"name\": \"Turkmenistan\",\n    \"icelandicName\": \"Turkmenistan\"\n  },\n  {\n    \"code\": \"99TC\",\n    \"name\": \"Turks and Caicos Islands\",\n    \"icelandicName\": \"Turks- og Caicoseyjar\"\n  },\n  {\n    \"code\": \"99TN\",\n    \"name\": \"Tunisia\",\n    \"icelandicName\": \"Túnis\"\n  },\n  {\n    \"code\": \"99TV\",\n    \"name\": \"Tuvalu\",\n    \"icelandicName\": \"Túvalú\"\n  },\n  {\n    \"code\": \"99TR\",\n    \"name\": \"Turkey\",\n    \"icelandicName\": \"Tyrkland\"\n  },\n  {\n    \"code\": \"99HU\",\n    \"name\": \"Hungary\",\n    \"icelandicName\": \"Ungverjaland\"\n  },\n  {\n    \"code\": \"99UM\",\n    \"name\": \"United States Minor Outlying I.\",\n    \"icelandicName\": \"United States Minor Outlying ey\"\n  },\n  {\n    \"code\": \"99UG\",\n    \"name\": \"Uganda\",\n    \"icelandicName\": \"Úganda\"\n  },\n  {\n    \"code\": \"99UA\",\n    \"name\": \"Ukraine\",\n    \"icelandicName\": \"Úkraína\"\n  },\n  {\n    \"code\": \"99UY\",\n    \"name\": \"Uruguay\",\n    \"icelandicName\": \"Úrúguay\"\n  },\n  {\n    \"code\": \"99UZ\",\n    \"name\": \"Uzbekistan\",\n    \"icelandicName\": \"Úsbekistan\"\n  },\n  {\n    \"code\": \"99XX\",\n    \"name\": \"Undefined\",\n    \"icelandicName\": \"Útlönd\"\n  },\n  {\n    \"code\": \"99VU\",\n    \"name\": \"Vanuatu\",\n    \"icelandicName\": \"Vanúatú\"\n  },\n  {\n    \"code\": \"99VE\",\n    \"name\": \"Venzsuela\",\n    \"icelandicName\": \"Venezúela\"\n  },\n  {\n    \"code\": \"99EH\",\n    \"name\": \"Western Sahara\",\n    \"icelandicName\": \"Vestur-Sahara\"\n  },\n  {\n    \"code\": \"99VN\",\n    \"name\": \"Vietnam\",\n    \"icelandicName\": \"Víetnam\"\n  },\n  {\n    \"code\": \"99WF\",\n    \"name\": \"Wallis and Futuna\",\n    \"icelandicName\": \"Wallis og Futuna\"\n  },\n  {\n    \"code\": \"99DE\",\n    \"name\": \"Germany\",\n    \"icelandicName\": \"Þýskaland\"\n  }\n]",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-security-policy",
+              "value": "frame-ancestors 'self' *.sjukra.is"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 28 Aug 2024 09:46:49 GMT"
+            },
+            {
+              "key": "permissions-policy",
+              "value": "camera=(), microphone=(), geolocation=(), interest-cohort=()"
+            },
+            {
+              "key": "referrer-policy",
+              "value": "strict-origin-when-cross-origin"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=31536000;"
+            },
+            {
+              "key": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "key": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "testapp04"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-fd8d791f-c152-4dc9-a9e9-aa1e7a2fa6e3"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "8K8NPI6kiMAVLCwullrE0pqSmDYsi0LFbsjwad+ww8Iif//VqdTsbVNTyVuqjiUVvhYrZKNJZvn8mU+/x2a/xQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "cbe2630e-2cc3-4e0c-baab-3010355e860e"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/minarsidur"
+            },
+            {
+              "key": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "key": "content-length",
+              "value": "23144"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    }
+  ],
+  "rootChildren": [
+    {
+      "type": "route",
+      "uuid": "24c30259-dd87-4c40-9c4b-f6ba87b4a427"
+    },
+    {
+      "type": "route",
+      "uuid": "2a4bd937-d20f-48aa-bc0a-0b6b17e2e7a9"
+    },
+    {
+      "type": "route",
+      "uuid": "720734e5-28bd-4360-964c-30b2102e04f1"
+    },
+    {
+      "type": "route",
+      "uuid": "e524ba42-097a-4b2d-8b60-8e7e8c6e2cfa"
+    },
+    {
+      "type": "route",
+      "uuid": "802741ec-af17-478a-9602-d107aa36b795"
+    },
+    {
+      "type": "route",
+      "uuid": "c065ec07-878d-4d3f-8a02-1f2f2f2e4be2"
+    },
+    {
+      "type": "route",
+      "uuid": "dbdf359e-c145-4e93-a5ad-9fcd0f76df00"
+    },
+    {
+      "type": "route",
+      "uuid": "4cc6b066-6773-484c-8623-f7fd7cec42b4"
+    },
+    {
+      "type": "route",
+      "uuid": "1e6fcb51-8b25-432b-a55b-329f4c8d83c4"
+    },
+    {
+      "type": "route",
+      "uuid": "ea8cf045-2a07-44d6-949e-f9711e681e6c"
+    },
+    {
+      "type": "route",
+      "uuid": "5a1659fa-04ca-45dc-921d-fc61eefc5569"
+    },
+    {
+      "type": "route",
+      "uuid": "c01222ce-0e25-4d4a-8843-213ecefd3d12"
+    },
+    {
+      "type": "route",
+      "uuid": "73a840d6-66ec-441a-8599-56f11ea0ba11"
+    },
+    {
+      "type": "route",
+      "uuid": "51b3a70c-3ca7-41f4-98ca-dffca855ab30"
+    },
+    {
+      "type": "route",
+      "uuid": "466acf25-b822-407a-a42b-1fc0e09e11ee"
+    },
+    {
+      "type": "route",
+      "uuid": "7661781d-90c6-4769-88b0-99933a79ac07"
+    },
+    {
+      "type": "route",
+      "uuid": "e7206e1d-4bee-489f-88a0-c5f29687cf20"
+    }
+  ],
+  "proxyMode": true,
+  "proxyHost": "http://localhost:8082",
+  "proxyRemovePrefix": false,
+  "tlsOptions": {
+    "enabled": false,
+    "type": "CERT",
+    "pfxPath": "",
+    "certPath": "",
+    "keyPath": "",
+    "caPath": "",
+    "passphrase": ""
+  },
+  "cors": true,
+  "headers": [
+    {
+      "key": "Content-Type",
+      "value": "application/json"
+    },
+    {
+      "key": "Access-Control-Allow-Origin",
+      "value": "*"
+    },
+    {
+      "key": "Access-Control-Allow-Methods",
+      "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+    },
+    {
+      "key": "Access-Control-Allow-Headers",
+      "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+    }
+  ],
+  "proxyReqHeaders": [
+    {
+      "key": "",
+      "value": ""
+    }
+  ],
+  "proxyResHeaders": [
+    {
+      "key": "",
+      "value": ""
+    }
+  ],
+  "data": [],
+  "callbacks": []
+}
diff --git a/libs/application/templates/health-insurance-declaration/src/forms/HealthInsuranceDeclarationForm.ts b/libs/application/templates/health-insurance-declaration/src/forms/HealthInsuranceDeclarationForm.ts
index 518d2b4a7bd6..90d4a79d1590 100644
--- a/libs/application/templates/health-insurance-declaration/src/forms/HealthInsuranceDeclarationForm.ts
+++ b/libs/application/templates/health-insurance-declaration/src/forms/HealthInsuranceDeclarationForm.ts
@@ -46,6 +46,7 @@ import {
   removeCountryCode,
 } from '@island.is/application/ui-components'
 import format from 'date-fns/format'
+import sub from 'date-fns/sub'
 import { ApplicantType } from '../shared/constants'
 
 export const HealthInsuranceDeclarationForm: Form = buildForm({
@@ -378,6 +379,11 @@ export const HealthInsuranceDeclarationForm: Form = buildForm({
           children: [
             buildDateField({
               id: 'period.dateFieldFrom',
+              minDate: (application) =>
+                application.answers.studentOrTouristRadioFieldTourist ===
+                ApplicantType.STUDENT
+                  ? sub(new Date(), { years: 1 })
+                  : new Date(0),
               title: m.application.date.dateFromTitle,
               placeholder: m.application.date.datePlaceholderText,
               required: true,
@@ -392,6 +398,15 @@ export const HealthInsuranceDeclarationForm: Form = buildForm({
               width: 'half',
               defaultValue: '',
             }),
+            buildAlertMessageField({
+              id: 'dateAlertMessage',
+              alertType: 'warning',
+              title: m.application.date.studentMinDateWarningTitle,
+              message: m.application.date.studentMinDateWarning,
+              condition: (answers) =>
+                answers.studentOrTouristRadioFieldTourist ===
+                ApplicantType.STUDENT,
+            }),
           ],
         }),
       ],
diff --git a/libs/application/templates/health-insurance-declaration/src/lib/messages/application.ts b/libs/application/templates/health-insurance-declaration/src/lib/messages/application.ts
index 17274c793cd7..b1d5596b7170 100644
--- a/libs/application/templates/health-insurance-declaration/src/lib/messages/application.ts
+++ b/libs/application/templates/health-insurance-declaration/src/lib/messages/application.ts
@@ -174,6 +174,17 @@ export const application = {
       defaultMessage: 'Veldu dagsetningu',
       description: 'Date field placeholder text',
     },
+    studentMinDateWarningTitle: {
+      id: 'hid.application:date.section.student.minDateWarningTitle',
+      defaultMessage: 'Athugið',
+      description: 'Student minimum date warning title',
+    },
+    studentMinDateWarning: {
+      id: 'hid.application:date.section.student.minDateWarning',
+      defaultMessage: `Athugið að hámarkstímabil fyrir tryggingaryfirlýsingar námsmanna er eitt ár í senn. Sækja þarf um nýja
+        tryggingaryfirlýsingu á hverju ári með nýrri/uppfærðri námsstaðfestingu á meðan nemandi er erlendis í námi.`,
+      description: 'Student minimum date warning',
+    },
   }),
   overview: defineMessages({
     sectionTitle: {
diff --git a/libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx b/libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx
index ed9c36f38bc4..3a2f0e735eff 100644
--- a/libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx
@@ -225,22 +225,24 @@ export const CalculateShare: FC<React.PropsWithChildren<FieldBaseProps>> = ({
 
     const realEstate: CalcShared = (
       (answers.assets as unknown as EstateAssets)?.realEstate?.data ?? []
-    ).map((item) => {
-      const value = valueToNumber(item.propertyValuation)
-      const deceasedShare = valueToNumber(item.deceasedShare)
-      const { shareValue, deceasedShareValue } = getShareValue(
-        value,
-        deceasedShare,
-      )
-      const deduction = deceasedWasInCohabitation ? value - shareValue : 0
-      return {
-        value,
-        deduction,
-        shareValue,
-        deceasedShareValue,
-        deceasedShare,
-      }
-    })
+    )
+      .filter((item) => item?.enabled)
+      .map((item) => {
+        const value = valueToNumber(item.propertyValuation)
+        const deceasedShare = valueToNumber(item.deceasedShare)
+        const { shareValue, deceasedShareValue } = getShareValue(
+          value,
+          deceasedShare,
+        )
+        const deduction = deceasedWasInCohabitation ? value - shareValue : 0
+        return {
+          value,
+          deduction,
+          shareValue,
+          deceasedShareValue,
+          deceasedShare,
+        }
+      })
 
     const stocks: CalcShared = (
       (answers.assets as unknown as EstateAssets)?.stocks?.data ?? []
diff --git a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx
index e65882288c9b..ecee1cf537ff 100644
--- a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx
@@ -5,6 +5,7 @@ import {
   CheckboxController,
   DatePickerController,
   InputController,
+  PhoneInputController,
   SelectController,
 } from '@island.is/shared/form-fields'
 import * as kennitala from 'kennitala'
@@ -229,13 +230,12 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={phoneField}
                 name={phoneField}
                 label={formatMessage(m.phone)}
                 defaultValue={field.phone || ''}
                 backgroundColor="blue"
-                format={'###-####'}
                 error={error?.phone}
                 required
               />
@@ -354,12 +354,11 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={advocatePhoneField}
                 name={advocatePhoneField}
                 label={formatMessage(m.phone)}
                 backgroundColor="blue"
-                format="###-####"
                 error={(error?.advocate as unknown as ErrorValue)?.phone}
                 size="sm"
                 required
@@ -409,12 +408,11 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={advocatePhoneField2}
                 name={advocatePhoneField2}
                 label={formatMessage(m.phone)}
                 backgroundColor="blue"
-                format="###-####"
                 size="sm"
               />
             </GridColumn>
diff --git a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx
index d3cd7016606b..72d982430c49 100644
--- a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx
@@ -17,7 +17,10 @@ import { formatCurrency } from '@island.is/application/ui-components'
 import { Answers, EstateMember, heirAgeValidation } from '../../types'
 import { AdditionalHeir } from './AdditionalHeir'
 import { getValueViaPath } from '@island.is/application/core'
-import { InputController } from '@island.is/shared/form-fields'
+import {
+  InputController,
+  PhoneInputController,
+} from '@island.is/shared/form-fields'
 import { format as formatNationalId, info } from 'kennitala'
 import intervalToDuration from 'date-fns/intervalToDuration'
 import {
@@ -404,13 +407,12 @@ export const HeirsRepeater: FC<
                       />
                     </GridColumn>
                     <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                      <InputController
+                      <PhoneInputController
                         id={`${fieldIndex}.phone`}
                         name={`${fieldIndex}.phone`}
                         label={formatMessage(m.phone)}
                         backgroundColor="blue"
                         disabled={!member.enabled}
-                        format="###-####"
                         defaultValue={member.phone || ''}
                         error={
                           error && error[mainIndex] && error[mainIndex].phone
@@ -529,13 +531,12 @@ export const HeirsRepeater: FC<
                       />
                     </GridColumn>
                     <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                      <InputController
+                      <PhoneInputController
                         id={`${fieldIndex}.advocate.phone`}
                         name={`${fieldIndex}.advocate.phone`}
                         label={formatMessage(m.phone)}
                         backgroundColor="blue"
                         disabled={!member.enabled}
-                        format="###-####"
                         defaultValue={member.advocate?.phone || ''}
                         error={
                           error &&
diff --git a/libs/application/templates/inheritance-report/src/fields/Overview/OverviewAssets/index.tsx b/libs/application/templates/inheritance-report/src/fields/Overview/OverviewAssets/index.tsx
index 9554f49a4e7c..021c0afc6024 100644
--- a/libs/application/templates/inheritance-report/src/fields/Overview/OverviewAssets/index.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/Overview/OverviewAssets/index.tsx
@@ -163,10 +163,6 @@ export const OverviewAssets: FC<React.PropsWithChildren<FieldBaseProps>> = ({
 
   return (
     <Box>
-      <Box marginTop={2} as="p">
-        <Text>{formatMessage(m.assetOverviewDescription)}</Text>
-      </Box>
-      <Box marginTop={6} />
       {sections.map(
         ({ data, title, total, totalTitle, showTotalFirst }, index) => {
           const totalRow = totalTitle && total && (
diff --git a/libs/application/templates/inheritance-report/src/forms/done.ts b/libs/application/templates/inheritance-report/src/forms/done.ts
index c9f7cee7b329..53181716609a 100644
--- a/libs/application/templates/inheritance-report/src/forms/done.ts
+++ b/libs/application/templates/inheritance-report/src/forms/done.ts
@@ -17,7 +17,14 @@ export const done: Form = buildForm({
         answers.applicationFor === PREPAID_INHERITANCE
           ? m.doneTitlePrepaidEFS
           : m.doneTitleEFS,
-      expandableHeader: m.nextSteps,
+      expandableHeader: ({ answers }) =>
+        answers.applicationFor === PREPAID_INHERITANCE
+          ? m.expandableHeaderPrepaid
+          : m.expandableHeaderEFS,
+      expandableIntro: ({ answers }) =>
+        answers.applicationFor === PREPAID_INHERITANCE
+          ? m.expandableIntroPrepaid
+          : m.expandableIntroEFS,
       expandableDescription: ({ answers }) =>
         answers.applicationFor === PREPAID_INHERITANCE
           ? m.doneDescriptionPrepaidEFS
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts b/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts
index 382810ca009c..1a79447e2b9e 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts
@@ -1,5 +1,6 @@
 import {
   buildMultiField,
+  buildPhoneField,
   buildSection,
   buildSelectField,
   buildTextField,
@@ -48,12 +49,12 @@ export const applicant = buildSection({
             return externalData.nationalRegistry?.data.address.streetAddress
           },
         }),
-        buildTextField({
+        buildPhoneField({
           id: 'applicant.phone',
           title: m.phone,
           width: 'half',
           required: true,
-          format: '###-####',
+          disableDropdown: false,
           defaultValue: (application: Application) => {
             const phone =
               (
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/assets.ts b/libs/application/templates/inheritance-report/src/forms/sections/assets.ts
index 24c3c4be42c9..623d6042f2db 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/assets.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/assets.ts
@@ -1,4 +1,5 @@
 import {
+  buildCheckboxField,
   buildCustomField,
   buildDescriptionField,
   buildMultiField,
@@ -679,12 +680,30 @@ export const assets = buildSection({
       id: 'assetOverview',
       title: m.assetOverview,
       children: [
-        buildCustomField({
+        buildMultiField({
+          id: 'assetOverview',
           title: m.assetOverview,
           description: m.assetOverviewDescription,
-          id: 'overviewAssets',
-          doesNotRequireAnswer: true,
-          component: 'OverviewAssets',
+          children: [
+            buildCustomField({
+              title: '',
+              id: 'overviewAssets',
+              doesNotRequireAnswer: true,
+              component: 'OverviewAssets',
+            }),
+            buildDescriptionField({
+              id: 'space',
+              title: '',
+              marginBottom: 'containerGutter',
+            }),
+            buildCheckboxField({
+              id: 'assetsConfirmation',
+              title: '',
+              large: false,
+              backgroundColor: 'white',
+              options: [{ value: YES, label: m.assetsOverviewConfirmation }],
+            }),
+          ],
         }),
       ],
     }),
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts b/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
index 8315cd166b40..1c8bd124c2db 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
@@ -1,9 +1,11 @@
 import {
+  buildCheckboxField,
   buildCustomField,
   buildDescriptionField,
   buildMultiField,
   buildSection,
   buildSubSection,
+  YES,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
 import { DebtTypes } from '../../types'
@@ -182,6 +184,18 @@ export const debtsAndFuneralCost = buildSection({
               doesNotRequireAnswer: true,
               component: 'CalculateTotalDebts',
             }),
+            buildDescriptionField({
+              id: 'space',
+              title: '',
+              marginBottom: 'containerGutter',
+            }),
+            buildCheckboxField({
+              id: 'debtsConfirmation',
+              title: '',
+              large: false,
+              backgroundColor: 'white',
+              options: [{ value: YES, label: m.debtsOverviewConfirmation }],
+            }),
           ],
         }),
       ],
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts b/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts
index 805a0d26036c..ae58219582d3 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts
@@ -1,4 +1,5 @@
 import {
+  buildCheckboxField,
   buildCustomField,
   buildDescriptionField,
   buildDividerField,
@@ -9,6 +10,7 @@ import {
   buildSubSection,
   buildTextField,
   getValueViaPath,
+  YES,
 } from '@island.is/application/core'
 import { formatCurrency } from '@island.is/application/ui-components'
 import { InheritanceReport } from '../../lib/dataSchema'
@@ -394,6 +396,18 @@ export const heirs = buildSection({
                 return files.map((file: any) => file.name).join(', ')
               },
             }),
+            buildDescriptionField({
+              id: 'heirs_space7',
+              title: '',
+              marginBottom: 'containerGutter',
+            }),
+            buildCheckboxField({
+              id: 'heirsConfirmation',
+              title: '',
+              large: false,
+              backgroundColor: 'white',
+              options: [{ value: YES, label: m.heirsOverviewConfirmation }],
+            }),
             buildCustomField({
               title: '',
               id: 'overviewPrint',
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts b/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts
index b56e3f8332d2..220bcc1c12c7 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts
@@ -1,12 +1,11 @@
 import {
   buildMultiField,
   buildNationalIdWithNameField,
+  buildPhoneField,
   buildSection,
   buildSelectField,
   buildTextField,
 } from '@island.is/application/core'
-import { UserProfile, Application } from '@island.is/api/schema'
-import { removeCountryCode } from '@island.is/application/ui-components'
 import { m } from '../../../lib/messages'
 import { RelationEnum } from '../../../types'
 
@@ -25,32 +24,18 @@ export const prePaidApplicant = buildSection({
           width: 'full',
           required: true,
         }),
-        buildTextField({
+        buildPhoneField({
           id: 'prePaidApplicant.phone',
           title: m.phone,
           width: 'half',
           required: true,
-          format: '###-####',
-          defaultValue: (application: Application) => {
-            const phone =
-              (
-                application.externalData.userProfile?.data as {
-                  mobilePhoneNumber?: string
-                }
-              )?.mobilePhoneNumber ?? ''
-
-            return removeCountryCode(phone)
-          },
+          disableDropdown: false,
         }),
         buildTextField({
           id: 'prePaidApplicant.email',
           title: m.email,
           width: 'half',
           required: true,
-          defaultValue: ({ externalData }: Application) => {
-            const data = externalData.userProfile?.data as UserProfile
-            return data?.email
-          },
         }),
         buildSelectField({
           id: 'prePaidApplicant.relation',
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts b/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts
index f66bfb20b3a6..1ae4e8202e29 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts
@@ -41,6 +41,7 @@ export const inheritanceExecutor = buildSection({
           title: m.phone,
           width: 'half',
           required: true,
+          disableDropdown: false,
         }),
         buildDescriptionField({
           id: 'description_empty',
diff --git a/libs/application/templates/inheritance-report/src/lib/dataSchema.ts b/libs/application/templates/inheritance-report/src/lib/dataSchema.ts
index 000dee79f701..6f6c355b68ee 100644
--- a/libs/application/templates/inheritance-report/src/lib/dataSchema.ts
+++ b/libs/application/templates/inheritance-report/src/lib/dataSchema.ts
@@ -15,7 +15,6 @@ import {
   PrePaidInheritanceOptions,
   RelationSpouse,
 } from './constants'
-import { DebtTypes } from '../types'
 
 const deceasedShare = {
   deceasedShare: z.string().nonempty().optional(),
@@ -782,6 +781,9 @@ export const inheritanceReportSchema = z.object({
       },
     ),
   confirmAction: z.array(z.enum([YES])).length(1),
+  assetsConfirmation: z.array(z.enum([YES])).length(1),
+  debtsConfirmation: z.array(z.enum([YES])).length(1),
+  heirsConfirmation: z.array(z.enum([YES])).length(1),
 })
 
 export type InheritanceReport = z.TypeOf<typeof inheritanceReportSchema>
diff --git a/libs/application/templates/inheritance-report/src/lib/messages.ts b/libs/application/templates/inheritance-report/src/lib/messages.ts
index 32050063c7f0..6e5341b35271 100644
--- a/libs/application/templates/inheritance-report/src/lib/messages.ts
+++ b/libs/application/templates/inheritance-report/src/lib/messages.ts
@@ -669,7 +669,7 @@ export const m = defineMessages({
     description: '',
   },
   stocksDescriptionPrePaid: {
-    id: 'ir.application:stocksDescriptionPrePaid',
+    id: 'ir.application:stocksDescriptionPrePaid#markdown',
     defaultMessage:
       'Upplýsingar um nafnverð hlutabréfa má finna í síðasta skattframtali. Upplýsingar um gengi hlutabréfa er hægt að fá hjá bönkum, félaginu sjálfu eða miða við síðasta ársreikning félagsins sem sækja má á heimasíðu Skattsins, www.skatturinn.is/fyrirtaekjaskra',
     description: '',
@@ -832,6 +832,24 @@ export const m = defineMessages({
       'Vinsamlegast farðu yfir upplýsingarnar og gakktu úr skugga um að þær séu réttar.',
     description: '',
   },
+  assetsOverviewConfirmation: {
+    id: 'ir.application:assetsOverviewConfirmation',
+    defaultMessage:
+      'Ég staðfesti að hafa fært inn upplýsingar um eignir eftir minni bestu vitund.',
+    description: '',
+  },
+  debtsOverviewConfirmation: {
+    id: 'ir.application:debtsOverviewConfirmation',
+    defaultMessage:
+      'Ég staðfesti að hafa fært inn upplýsingar um skuldir eftir minni bestu vitund.',
+    description: '',
+  },
+  heirsOverviewConfirmation: {
+    id: 'ir.application:heirsOverviewConfirmation',
+    defaultMessage:
+      'Ég staðfesti að hafa fært inn upplýsingar um eign til skipta og erfingja eftir minni bestu vitund.',
+    description: '',
+  },
   realEstateEstimation: {
     id: 'ir.application:realEstateEstimation',
     defaultMessage: 'Fasteignamat samtals á dánardegi',
@@ -1713,16 +1731,31 @@ export const m = defineMessages({
       'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed sit amet urna nec nunc ultricies ultricies.',
     description: '',
   },
-  nextSteps: {
-    id: 'ir.application:nextSteps',
-    defaultMessage: 'Næstu skref',
-    description: '',
-  },
   errorRelation: {
     id: 'ir.application:error.errorRelation',
     defaultMessage: 'Tengsl virðast ekki vera rétt',
     description: 'Relation is invalid',
   },
+  expandableHeaderEFS: {
+    id: 'ir.application:expandableHeaderEFS',
+    defaultMessage: 'Næstu skref',
+    description: '',
+  },
+  expandableHeaderPrepaid: {
+    id: 'ir.application:expandableHeaderPrepaid',
+    defaultMessage: 'Næstu skref',
+    description: '',
+  },
+  expandableIntroEFS: {
+    id: 'ir.application:expandableIntroEFS',
+    defaultMessage: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+    description: '',
+  },
+  expandableIntroPrepaid: {
+    id: 'ir.application:expandableIntroPrepaid',
+    defaultMessage: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+    description: '',
+  },
 
   // Tax Free Limit
   // This will be fetched from sýslumaður API when ready
diff --git a/libs/application/templates/official-journal-of-iceland/src/components/comments/CommentList.tsx b/libs/application/templates/official-journal-of-iceland/src/components/comments/CommentList.tsx
index 73ea02ee2a7a..8e8a85500685 100644
--- a/libs/application/templates/official-journal-of-iceland/src/components/comments/CommentList.tsx
+++ b/libs/application/templates/official-journal-of-iceland/src/components/comments/CommentList.tsx
@@ -1,12 +1,20 @@
 import type { Props as CommentProps } from './Comment'
+import { Text } from '@island.is/island-ui/core'
 import { Comment } from './Comment'
 import * as styles from './Comments.css'
+import { useLocale } from '@island.is/localization'
+import { comments as messages } from '../../lib/messages/comments'
 
 type Props = {
   comments: CommentProps[]
 }
 
 export const CommentsList = ({ comments }: Props) => {
+  const { formatMessage: f } = useLocale()
+  if (!comments.length) {
+    return <Text>{f(messages.errors.emptyComments)}</Text>
+  }
+
   return (
     <ul className={styles.commentsList}>
       {comments.map((comment, index) => (
diff --git a/libs/application/templates/official-journal-of-iceland/src/fields/Comments.tsx b/libs/application/templates/official-journal-of-iceland/src/fields/Comments.tsx
index f5429e223fc0..2106b0d876b1 100644
--- a/libs/application/templates/official-journal-of-iceland/src/fields/Comments.tsx
+++ b/libs/application/templates/official-journal-of-iceland/src/fields/Comments.tsx
@@ -1,11 +1,41 @@
-import { Box } from '@island.is/island-ui/core'
+import { AlertMessage, Box, SkeletonLoader } from '@island.is/island-ui/core'
 import { OJOIFieldBaseProps } from '../lib/types'
 import { CommentsList } from '../components/comments/CommentList'
-import { useState } from 'react'
 import { FormGroup } from '../components/form/FormGroup'
+import { useComments } from '../hooks/useComments'
+import { useLocale } from '@island.is/localization'
+import { comments as messages } from '../lib/messages/comments'
 
-export const Comments = (props: OJOIFieldBaseProps) => {
-  const [comments, setComments] = useState([])
+export const Comments = ({ application }: OJOIFieldBaseProps) => {
+  const { formatMessage: f } = useLocale()
+  const { comments, error, loading } = useComments({
+    applicationId: application.id,
+  })
+
+  if (error) {
+    return (
+      <FormGroup>
+        <AlertMessage
+          type="error"
+          title={f(messages.errors.fetchComments)}
+          message={f(messages.errors.fetchCommentsMessage)}
+        />
+      </FormGroup>
+    )
+  }
+
+  if (loading) {
+    return (
+      <FormGroup>
+        <SkeletonLoader
+          height={32}
+          repeat={4}
+          borderRadius="standard"
+          space={2}
+        />
+      </FormGroup>
+    )
+  }
 
   return (
     <FormGroup title="Athugasemdir">
diff --git a/libs/application/templates/official-journal-of-iceland/src/graphql/queries.ts b/libs/application/templates/official-journal-of-iceland/src/graphql/queries.ts
index 7306d1e9a21d..92555efea10d 100644
--- a/libs/application/templates/official-journal-of-iceland/src/graphql/queries.ts
+++ b/libs/application/templates/official-journal-of-iceland/src/graphql/queries.ts
@@ -7,6 +7,29 @@ export const GET_PRICE_QUERY = gql`
     }
   }
 `
+
+export const GET_APPLICATION_COMMENTS_QUERY = gql`
+  query GetApplicationComments(
+    $input: OfficialJournalOfIcelandApplicationGetCommentsInput!
+  ) {
+    officialJournalOfIcelandApplicationGetComments(input: $input) {
+      comments {
+        id
+        createdAt
+        internal
+        type
+        caseStatus
+        task {
+          from
+          to
+          title
+          comment
+        }
+      }
+    }
+  }
+`
+
 export const ADVERTS_QUERY = gql`
   query Adverts($input: OfficialJournalOfIcelandAdvertsInput!) {
     officialJournalOfIcelandAdverts(input: $input) {
diff --git a/libs/application/templates/official-journal-of-iceland/src/hooks/useComments.ts b/libs/application/templates/official-journal-of-iceland/src/hooks/useComments.ts
new file mode 100644
index 000000000000..d3d3485748c4
--- /dev/null
+++ b/libs/application/templates/official-journal-of-iceland/src/hooks/useComments.ts
@@ -0,0 +1,21 @@
+import { useQuery } from '@apollo/client'
+import { GET_APPLICATION_COMMENTS_QUERY } from '../graphql/queries'
+
+type Props = {
+  applicationId: string
+}
+export const useComments = ({ applicationId }: Props) => {
+  const { data, loading, error } = useQuery(GET_APPLICATION_COMMENTS_QUERY, {
+    variables: {
+      input: {
+        id: applicationId,
+      },
+    },
+  })
+
+  return {
+    comments: data?.officialJournalOfIcelandApplicationGetComments.comments,
+    loading,
+    error,
+  }
+}
diff --git a/libs/application/templates/official-journal-of-iceland/src/lib/messages/comments.ts b/libs/application/templates/official-journal-of-iceland/src/lib/messages/comments.ts
index 0e156b38257a..80697969e702 100644
--- a/libs/application/templates/official-journal-of-iceland/src/lib/messages/comments.ts
+++ b/libs/application/templates/official-journal-of-iceland/src/lib/messages/comments.ts
@@ -19,6 +19,28 @@ export const comments = {
       description: 'Title of comments section',
     },
   }),
+  errors: defineMessages({
+    fetchComments: {
+      id: 'ojoi.application:comments.errors.fetchComments',
+      defaultMessage: 'Villa kom upp við að sækja athugasemdir',
+      description: 'Error fetching comments',
+    },
+    fetchCommentsMessage: {
+      id: 'ojoi.application:comments.errors.fetchCommentsMessage',
+      defaultMessage: 'Ekki tókst að sækja athugasemdir, reynið aftur síðar',
+      description: 'Error fetching comments message',
+    },
+    addComment: {
+      id: 'ojoi.application:comments.errors.addComment',
+      defaultMessage: 'Ekki tókst að vista athugasemd',
+      description: 'Error adding comment',
+    },
+    emptyComments: {
+      id: 'ojoi.application:comments.errors.emptyComments',
+      defaultMessage: 'Engar athugasemdir eru á þessari umsókn',
+      description: 'No comments on this application',
+    },
+  }),
   dates: defineMessages({
     today: {
       id: 'ojoi.application:comments.dates.today',
diff --git a/libs/application/templates/passport/src/forms/Draft.ts b/libs/application/templates/passport/src/forms/Draft.ts
index 06f4a3e02f81..96cd1b108435 100644
--- a/libs/application/templates/passport/src/forms/Draft.ts
+++ b/libs/application/templates/passport/src/forms/Draft.ts
@@ -52,6 +52,7 @@ export const Draft: Form = buildForm({
           title: m.dataCollectionTitle,
           subTitle: m.dataCollectionSubtitle,
           checkboxLabel: m.dataCollectionCheckboxLabel,
+          enableMockPayment: true,
           dataProviders: [
             buildDataProviderItem({
               provider: NationalRegistryUser,
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/dataProviders/index.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/dataProviders/index.ts
index bfcd5dc59242..2aa7077f3479 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/dataProviders/index.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/dataProviders/index.ts
@@ -1,9 +1,9 @@
 import { defineTemplateApi } from '@island.is/application/types'
 
-export const OwnerRequirementsApi = defineTemplateApi({
-  action: 'ownerRequirements',
+export const CandidateApi = defineTemplateApi({
+  action: 'candidate',
 })
 
-export const CurrentCollectionApi = defineTemplateApi({
-  action: 'currentCollection',
+export const ParliamentaryCollectionApi = defineTemplateApi({
+  action: 'parliamentaryCollection',
 })
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/CopyLink/index.tsx b/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/CopyLink/index.tsx
new file mode 100644
index 000000000000..b551805ad303
--- /dev/null
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/CopyLink/index.tsx
@@ -0,0 +1,20 @@
+import { Box, Text } from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import { CopyLink as Copy } from '@island.is/application/ui-components'
+import { m } from '../../lib/messages'
+import { FieldBaseProps } from '@island.is/application/types'
+import { FC } from 'react'
+
+export const CopyLink: FC<FieldBaseProps> = ({ application }) => {
+  const { formatMessage } = useLocale()
+  return (
+    <Box>
+      <Text variant="h4" marginBottom={2}>
+        {formatMessage(m.shareList)}
+      </Text>
+      <Copy linkUrl={'TBD'} buttonTitle={formatMessage(m.copyLink)} />
+    </Box>
+  )
+}
+
+export default CopyLink
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/index.tsx b/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/index.tsx
new file mode 100644
index 000000000000..44cdfdaa735d
--- /dev/null
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/fields/index.tsx
@@ -0,0 +1 @@
+export { CopyLink } from './CopyLink'
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Done.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Done.ts
index b256225e90b3..b649ebb9d418 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Done.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Done.ts
@@ -4,6 +4,7 @@ import {
   buildSection,
   buildMessageWithLinkButtonField,
   buildDescriptionField,
+  buildCustomField,
 } from '@island.is/application/core'
 import { Form, FormModes } from '@island.is/application/types'
 import { m } from '../lib/messages'
@@ -50,9 +51,14 @@ export const Done: Form = buildForm({
               id: 'nextStepsDescription',
               title: '',
               description: m.nextStepsDescription,
-              titleVariant: 'h3',
+              titleVariant: 'h4',
               marginBottom: 5,
             }),
+            buildCustomField({
+              id: 'copyLink',
+              title: '',
+              component: 'CopyLink',
+            }),
             buildMessageWithLinkButtonField({
               id: 'done.goToServicePortal',
               title: '',
@@ -60,16 +66,6 @@ export const Done: Form = buildForm({
               buttonTitle: m.linkFieldButtonTitle,
               message: m.linkFieldMessage,
             }),
-            buildDescriptionField({
-              id: 'space',
-              title: '',
-              space: 'containerGutter',
-            }),
-            buildDescriptionField({
-              id: 'space1',
-              title: '',
-              space: 'containerGutter',
-            }),
           ],
         }),
       ],
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Draft.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Draft.ts
index a848d94c0a84..dbcc301df618 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Draft.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Draft.ts
@@ -1,7 +1,6 @@
 import {
   buildActionCardListField,
   buildCheckboxField,
-  buildCustomField,
   buildDescriptionField,
   buildDividerField,
   buildForm,
@@ -21,7 +20,9 @@ import Logo from '../../assets/Logo'
 
 import { m } from '../lib/messages'
 import { formatPhone } from '../lib/utils'
-import { Constituencies, Manager, Supervisor } from '../lib/constants'
+import { Manager, Supervisor } from '../lib/constants'
+import { Collection } from '@island.is/clients/signature-collection'
+import { Signee } from '@island.is/clients/signature-collection'
 
 export const Draft: Form = buildForm({
   id: 'ParliamentaryListCreationDraft',
@@ -60,14 +61,18 @@ export const Draft: Form = buildForm({
               title: m.listName,
               width: 'full',
               readOnly: true,
-              defaultValue: 'Flokkur 1',
+              defaultValue: (application: Application) =>
+                (application.externalData.candidate.data as Signee)
+                  .partyBallotLetterInfo?.name ?? '',
             }),
             buildTextField({
               id: 'list.letter',
               title: m.listLetter,
               width: 'half',
               readOnly: true,
-              defaultValue: 'F',
+              defaultValue: (application: Application) =>
+                (application.externalData.candidate.data as Signee)
+                  .partyBallotLetterInfo?.letter ?? '',
             }),
             buildTextField({
               id: 'list.nationalId',
@@ -145,16 +150,31 @@ export const Draft: Form = buildForm({
               id: 'constituency',
               title: '',
               large: true,
-              defaultValue: Constituencies,
-              options: Constituencies.map((constituency) => ({
-                label: constituency,
-                value: constituency,
-              })),
+              defaultValue: (application: Application) => {
+                const collection = application.externalData
+                  .parliamentaryCollection.data as Collection
+
+                if (!collection?.areas) {
+                  return []
+                }
+
+                return collection.areas.map((area) => `${area.id}|${area.name}`)
+              },
+              options: (application) => {
+                return (
+                  application.externalData.parliamentaryCollection
+                    .data as Collection
+                )?.areas.map((area) => ({
+                  value: `${area.id}|${area.name}`,
+                  label: area.name,
+                }))
+              },
             }),
           ],
         }),
       ],
     }),
+    /* Hiding this screen as for now
     buildSection({
       id: 'managers',
       title: m.managersAndSupervisors,
@@ -209,10 +229,15 @@ export const Draft: Form = buildForm({
                   label: m.constituency,
                   width: 'full',
                   isMulti: true,
-                  options: Constituencies.map((constituency) => ({
-                    label: constituency,
-                    value: constituency,
-                  })),
+                  options: (application) => {
+                    return (
+                      application.externalData.parliamentaryCollection
+                        .data as Collection
+                    )?.areas.map((area) => ({
+                      value: `${area.id}|${area.name}`,
+                      label: area.name,
+                    }))
+                  },
                 },
               },
               table: {
@@ -220,13 +245,18 @@ export const Draft: Form = buildForm({
                 rows: ['nationalId', 'name', 'constituency'],
                 format: {
                   nationalId: (v) => formatNationalId(v),
+                  constituency: (v) => {
+                    return (v as unknown as string[])
+                      .map((e) => e.split('|')[1])
+                      .join(', ')
+                  },
                 },
               },
             }),
           ],
         }),
       ],
-    }),
+    }),*/
     buildSection({
       id: 'overview',
       title: m.overview,
@@ -246,16 +276,10 @@ export const Draft: Form = buildForm({
             }),
             buildKeyValueField({
               label: m.listName,
-              width: 'half',
+              width: 'full',
               value: ({ answers }) =>
                 getValueViaPath(answers, 'list.name') ?? '',
             }),
-            buildKeyValueField({
-              label: m.nationalId,
-              width: 'half',
-              value: ({ answers }) =>
-                getValueViaPath(answers, 'list.nationalId') ?? '',
-            }),
             buildDescriptionField({
               id: 'space',
               title: '',
@@ -267,6 +291,12 @@ export const Draft: Form = buildForm({
               value: ({ answers }) =>
                 getValueViaPath(answers, 'list.letter') ?? '',
             }),
+            buildKeyValueField({
+              label: m.nationalId,
+              width: 'half',
+              value: ({ answers }) =>
+                getValueViaPath(answers, 'list.nationalId') ?? '',
+            }),
             buildDescriptionField({
               id: 'space1',
               title: '',
@@ -325,7 +355,6 @@ export const Draft: Form = buildForm({
               title: m.listsOverviewHeader,
               titleVariant: 'h3',
               space: 'gutter',
-              marginBottom: 5,
             }),
             buildActionCardListField({
               id: 'listsInOverview',
@@ -333,7 +362,7 @@ export const Draft: Form = buildForm({
               title: '',
               items: ({ answers }) => {
                 return (answers.constituency as string[]).map((c: string) => ({
-                  heading: 'Flokkur 1 - ' + c,
+                  heading: 'Flokkur 1 - ' + c.split('|')[1],
                   progressMeter: {
                     currentProgress: 0,
                     maxProgress: 350,
@@ -342,7 +371,7 @@ export const Draft: Form = buildForm({
                 }))
               },
             }),
-            buildDescriptionField({
+            /*buildDescriptionField({
               id: 'space4',
               title: '',
               space: 'gutter',
@@ -397,11 +426,13 @@ export const Draft: Form = buildForm({
                       ' - ' +
                       formatNationalId(s.supervisor.nationalId) +
                       ' - ' +
-                      s.constituency,
+                      (s.constituency as unknown as string[])
+                        .map((c) => c.split('|')[1])
+                        .join(', '),
                   )
                   .join('\n')
               },
-            }),
+            }),*/
             buildSubmitField({
               id: 'submit',
               placement: 'footer',
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Prerequisites.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Prerequisites.ts
index 7a8397a7aada..cf5183b4e9b1 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Prerequisites.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Prerequisites.ts
@@ -17,6 +17,7 @@ import {
 
 import { m } from '../lib/messages'
 import Logo from '../../assets/Logo'
+import { ParliamentaryCollectionApi, CandidateApi } from '../dataProviders'
 
 export const Prerequisites: Form = buildForm({
   id: 'CreateListPrerequisites',
@@ -81,6 +82,16 @@ export const Prerequisites: Form = buildForm({
               title: '',
               subTitle: '',
             }),
+            buildDataProviderItem({
+              provider: ParliamentaryCollectionApi,
+              title: '',
+              subTitle: '',
+            }),
+            buildDataProviderItem({
+              provider: CandidateApi,
+              title: '',
+              subTitle: '',
+            }),
           ],
         }),
       ],
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/index.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/index.ts
index 419d486d3844..87dcce721524 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/index.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/index.ts
@@ -2,6 +2,7 @@ import createCollectionTemplate from './lib/createCollectionTemplate'
 import { z } from 'zod'
 import { dataSchema } from './lib/dataSchema'
 
+export const getFields = () => import('./fields')
 export * from './lib/errors'
 
 export default createCollectionTemplate
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/constants.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/constants.ts
index 3b301f662be4..c3839e0b5108 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/constants.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/constants.ts
@@ -17,7 +17,7 @@ export type SubmitResponse = {
 }
 
 export enum ApiActions {
-  submitApplication = 'createLists',
+  submitApplication = 'submit',
 }
 
 export type Manager = {
@@ -35,13 +35,3 @@ export type Supervisor = {
   }
   constituency: string
 }
-
-// These will be fetched later
-export const Constituencies = [
-  'Norðvesturkjördæmi',
-  'Norðausturkjördæmi',
-  'Suðurkjördæmi',
-  'Suðvesturkjördæmi',
-  'Reykjavíkurkjördæmi suður',
-  'Reykjavíkurkjördæmi norður',
-]
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/createCollectionTemplate.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/createCollectionTemplate.ts
index 9369d20c0e66..42d7c9327ba5 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/createCollectionTemplate.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/createCollectionTemplate.ts
@@ -7,15 +7,18 @@ import {
   ApplicationTemplate,
   ApplicationTypes,
   DefaultEvents,
+  defineTemplateApi,
   NationalRegistryUserApi,
   StateLifeCycle,
   UserProfileApi,
 } from '@island.is/application/types'
-import { Events, Roles, States } from './constants'
+import { ApiActions, Events, Roles, States } from './constants'
 import { dataSchema } from './dataSchema'
 import { m } from './messages'
 import { EphemeralStateLifeCycle } from '@island.is/application/core'
 import { Features } from '@island.is/feature-flags'
+import { ParliamentaryCollectionApi, CandidateApi } from '../dataProviders'
+import { AuthDelegationType } from '@island.is/shared/types'
 
 const WeekLifeCycle: StateLifeCycle = {
   shouldBeListed: false,
@@ -37,6 +40,11 @@ const createListTemplate: ApplicationTemplate<
     ApplicationConfigurations[ApplicationTypes.PARLIAMENTARY_LIST_CREATION]
       .translation,
   ],
+  allowedDelegations: [
+    {
+      type: AuthDelegationType.ProcurationHolder,
+    },
+  ],
   stateMachineConfig: {
     initial: States.PREREQUISITES,
     states: {
@@ -66,8 +74,8 @@ const createListTemplate: ApplicationTemplate<
               api: [
                 NationalRegistryUserApi,
                 UserProfileApi,
-                //OwnerRequirementsApi,
-                //CurrentCollectionApi,
+                CandidateApi,
+                ParliamentaryCollectionApi,
               ],
             },
           ],
@@ -120,11 +128,11 @@ const createListTemplate: ApplicationTemplate<
           status: 'completed',
           progress: 1,
           lifecycle: WeekLifeCycle,
-          /*onEntry: defineTemplateApi({
+          onEntry: defineTemplateApi({
             action: ApiActions.submitApplication,
             shouldPersistToExternalData: true,
             throwOnError: true,
-          }),*/
+          }),
           roles: [
             {
               id: Roles.APPLICANT,
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/errors.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/errors.ts
index fff0ad6b6e4a..1087cbe59ec2 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/errors.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/errors.ts
@@ -3,74 +3,99 @@ import { defineMessages } from 'react-intl'
 export const errorMessages = {
   age: defineMessages({
     title: {
-      id: 'slc.application:error.age.title',
+      id: 'plc.application:error.age.title',
       defaultMessage: 'Aldur uppfyllir ekki skilyrði',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.age.summary#markdown',
+      id: 'plc.application:error.age.summary#markdown',
       defaultMessage: '35 ára aldursmarki er ekki náð',
       description: '',
     },
   }),
+  partyBallotLetter: defineMessages({
+    title: {
+      id: 'plc.application:error.partyBallotLetter.title',
+      defaultMessage: 'Ekki er hægt að stofna meðmælasöfnun',
+      description: '',
+    },
+    summary: {
+      id: 'plc.application:error.partyBallotLetter.summary',
+      defaultMessage:
+        'Innskráður notandi/fyrirtæki vantar framboð eða listabókstaf',
+      description: '',
+    },
+  }),
   citizenship: defineMessages({
     title: {
-      id: 'slc.application:error.citizenship.title',
+      id: 'plc.application:error.citizenship.title',
       defaultMessage: 'Ekki með íslenkst ríkisfang',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.citizenship.summary#markdown',
+      id: 'plc.application:error.citizenship.summary#markdown',
       defaultMessage: 'Þú þarft að vera með íslenkst ríkisfang',
       description: '',
     },
   }),
   residency: defineMessages({
     title: {
-      id: 'slc.application:error.residency.title',
+      id: 'plc.application:error.residency.title',
       defaultMessage: 'Ekki með búsetu á Íslandi',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.residency.summary#markdown',
+      id: 'plc.application:error.residency.summary#markdown',
       defaultMessage: 'Skilyrði um búsetu á Íslandi eru ekki uppfyllt',
       description: '',
     },
   }),
   active: defineMessages({
     title: {
-      id: 'slc.application:error.active.title',
+      id: 'plc.application:error.active.title',
       defaultMessage: 'Engin söfnun meðmæla er virk',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.active.summary',
+      id: 'plc.application:error.active.summary',
       defaultMessage: 'Ekki er hægt að stofna söfnun meðmæla.',
       description: '',
     },
   }),
   owner: defineMessages({
     title: {
-      id: 'slc.application:error.owner.title',
+      id: 'plc.application:error.owner.title',
       defaultMessage: 'Þú átt nú þegar lista í öllum söfnunarsvæðum',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.owner.summary#markdown',
+      id: 'plc.application:error.owner.summary#markdown',
       defaultMessage: 'Ekki er hægt að stofna söfnun meðmæla.',
       description: '',
     },
   }),
   deniedByService: defineMessages({
     title: {
-      id: 'slc.application:error.deniedByService.title',
+      id: 'plc.application:error.deniedByService.title',
       defaultMessage: 'Eitthvað fór úrskeiðis',
       description: '',
     },
     summary: {
-      id: 'slc.application:error.deniedByService.summary',
+      id: 'plc.application:error.deniedByService.summary',
       defaultMessage: 'Ekki er hægt að stofna söfnun meðmæla.',
       description: '',
     },
   }),
+  currentCollectionNotParliamentary: defineMessages({
+    title: {
+      id: 'plc.application:error.currentCollectionNotParliamentary.title',
+      defaultMessage: 'Söfnun fyrir Alþingiskosningar er ekki virk',
+      description: '',
+    },
+    summary: {
+      id: 'plc.application:error.currentCollectionNotParliamentary.summary',
+      defaultMessage: 'Ekki er hægt að stofna söfnun meðmæla',
+      description: '',
+    },
+  }),
 }
diff --git a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/messages.ts b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/messages.ts
index cc9b1bf6991d..4f60d4be84ac 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/messages.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/messages.ts
@@ -82,8 +82,7 @@ export const m = defineMessages({
   },
   listInformationDescription: {
     id: 'plc.application:listInformationDescription#markdown',
-    defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce aliquet imperdiet odio.',
+    defaultMessage: 'Vinsamlegast yfirfarið að upplýsingarnar séu réttar.',
     description: '',
   },
   information: {
@@ -225,7 +224,7 @@ export const m = defineMessages({
   overviewDescription: {
     id: 'plc.application:overviewDescription#markdown',
     defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce aliquet imperdiet odio, id ornare ante tincidunt ac. Phasellus massa velit, condimentum quis est id, tristique vestibulum lectus.',
+      'Vinsamlegast yfirfarið upplýsingar áður en meðmælasöfnun er stofnuð.',
     description: '',
   },
   applicantOverviewHeader: {
diff --git a/libs/application/templates/signature-collection/parliamentary-list-signing/src/forms/Done.ts b/libs/application/templates/signature-collection/parliamentary-list-signing/src/forms/Done.ts
index 8b0d43a43c8e..2ea826edf840 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-signing/src/forms/Done.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-signing/src/forms/Done.ts
@@ -34,20 +34,6 @@ export const Done: Form = buildForm({
           title: m.listSigned,
           description: m.listSignedDescription,
           children: [
-            buildDescriptionField({
-              id: 'nextStepsTitle',
-              title: m.nextSteps,
-              titleVariant: 'h3',
-              marginBottom: 1,
-            }),
-            //Set up separately for even spacing
-            buildDescriptionField({
-              id: 'nextStepsDescription',
-              title: '',
-              description: m.nextStepsDescription,
-              titleVariant: 'h3',
-              marginBottom: 5,
-            }),
             buildMessageWithLinkButtonField({
               id: 'done.goToServicePortal',
               title: '',
diff --git a/libs/application/templates/signature-collection/parliamentary-list-signing/src/lib/messages.ts b/libs/application/templates/signature-collection/parliamentary-list-signing/src/lib/messages.ts
index 4a1b359316ef..dd4a9b2af3d3 100644
--- a/libs/application/templates/signature-collection/parliamentary-list-signing/src/lib/messages.ts
+++ b/libs/application/templates/signature-collection/parliamentary-list-signing/src/lib/messages.ts
@@ -26,7 +26,7 @@ export const m = defineMessages({
   introDescription: {
     id: 'pls.application:introDescription#markdown',
     defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec pharetra euismod nibh, non ornare urna auctor vitae. Sed eget viverra erat. Praesent venenatis orci nec faucibus tincidunt. Nam ultrices metus nec tortor euismod fermentum. Vivamus efficitur leo eget ultricies pellentesque.',
+      'Á næstu síðu getur þú mælt með þeim framboðum sem ætla að bjóða fram til Alþingis í því kjördæmi sem þú átt lögheimili. Meðmæli eru yfirlýsing um stuðning við tiltekið framboð og aðeins er hægt að mæla með einu framboði. Hægt er að afturkalla meðmæli þangað til söfnun lokar og mæla með öðru framboði. Einungis þau sem hafa kosningarétt geta verið meðmælendur.',
     description: '',
   },
 
@@ -83,7 +83,7 @@ export const m = defineMessages({
   signListViewDescription: {
     id: 'pls.application:signListViewDescription#markdown',
     defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce aliquet imperdiet odio.',
+      'Vinsamlegast farðu yfir upplýsingarnar og gakktu úr skugga um að þær séu réttar.',
     description: '',
   },
   information: {
@@ -145,13 +145,12 @@ export const m = defineMessages({
   /* Búið að mæla með */
   listSigned: {
     id: 'pls.application:listSigned',
-    defaultMessage: 'Mælt með framboði',
+    defaultMessage: 'Þú hefur mælt með framboði',
     description: '',
   },
   listSignedDescription: {
     id: 'pls.application:listSignedDescription',
-    defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus feugiat lacus at nisl dignissim, ut scelerisque eros rhoncus. Donec maximus gravida sapien, sit amet hendrerit diam dignissim ut.',
+    defaultMessage: 'Stjórnmálasamtök sem þú mæltir með: TBD',
     description: '',
   },
   nextSteps: {
@@ -187,8 +186,7 @@ export const m = defineMessages({
   },
   linkFieldMessage: {
     id: 'pls.application:linkFieldMessage',
-    defaultMessage:
-      'Á mínum síðum sést hve mörgum meðmælum hefur verið safnað í hverjum landsfjórðungi.',
+    defaultMessage: 'Á Mínum síðum geturðu séð hvaða framboði þú mældir með',
     description: '',
   },
 
diff --git a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/README.md b/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/README.md
index e649a5eb3bd8..13554c6cad76 100644
--- a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/README.md
+++ b/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/README.md
@@ -4,7 +4,7 @@
 
 This application template allows applicants to apply for additional support for the elderly.
 
-![](./assets/additional-support-for-the-elderly-flow-chart.png)
+![](../core/assets/tr-applications-flow-chart.png)
 
 ### States
 
diff --git a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.png b/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.png
deleted file mode 100644
index d5278a3c18dd..000000000000
Binary files a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.png and /dev/null differ
diff --git a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.drawio b/libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.drawio
similarity index 51%
rename from libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.drawio
rename to libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.drawio
index c79273a3eced..2775c1dffbf9 100644
--- a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/assets/additional-support-for-the-elderly-flow-chart.drawio
+++ b/libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.drawio
@@ -1,28 +1,28 @@
 <mxfile host="65bd71144e">
-    <diagram id="2TvxPNVq2NB_tCsKO4EG" name="Page-1">
-        <mxGraphModel dx="1058" dy="1502" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <diagram id="6M_5M6iSPN1SZYVTYRzS" name="Page-1">
+        <mxGraphModel dx="1653" dy="2139" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
-                <mxCell id="23" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" vertex="1" parent="1">
+                <mxCell id="2" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" vertex="1" parent="1">
                     <mxGeometry x="-40" y="-90" width="720" height="810" as="geometry"/>
                 </mxCell>
-                <mxCell id="24" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="3" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="260" y="90" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="25" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="200" y="210" width="120" height="60" as="geometry"/>
+                <mxCell id="4" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="260" y="210" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="26" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="5" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="260" y="465" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="27" value="Additional documents required" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="6" value="Additional documents required" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="120" y="585" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="28" value="Approved" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="7" value="Approved" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="260" y="585" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="29" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="26" target="27">
+                <mxCell id="8" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="5" target="6">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
                         <mxPoint x="320" y="525" as="sourcePoint"/>
                         <mxPoint x="320" y="585" as="targetPoint"/>
@@ -31,7 +31,7 @@
                         </Array>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="30" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="27" target="26">
+                <mxCell id="9" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="6" target="5">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
                         <mxPoint x="70" y="615" as="sourcePoint"/>
                         <mxPoint x="70" y="675" as="targetPoint"/>
@@ -41,7 +41,7 @@
                         </Array>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="31" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="24">
+                <mxCell id="10" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="4" target="3">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
                         <mxPoint x="200" y="240" as="sourcePoint"/>
                         <mxPoint x="140" y="120" as="targetPoint"/>
@@ -51,28 +51,28 @@
                         </Array>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="32" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="11" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="100" y="165" width="40" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="33" value="Reject" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="12" value="Reject" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="460" y="535" width="60" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="34" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="230" y="165" width="60" height="30" as="geometry"/>
+                <mxCell id="13" value="Submit / Abort" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="165" width="100" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="35" value="Additional&#10;documents &#10;required" style="text;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="14" value="Additional&#10;documents &#10;required" style="text;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="110" y="515" width="65" height="50" as="geometry"/>
                 </mxCell>
-                <mxCell id="36" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="15" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="250" y="535" width="70" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="37" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="16" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="10" y="535" width="60" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="38" value="Rejected" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="17" value="Rejected" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="400" y="585" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="39" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="26" target="38">
+                <mxCell id="18" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="5" target="17">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
                         <mxPoint x="340" y="545" as="sourcePoint"/>
                         <mxPoint x="200" y="605" as="targetPoint"/>
@@ -81,73 +81,39 @@
                         </Array>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="40" value="TR makes a&lt;br&gt;state change" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="295" width="90" height="40" as="geometry"/>
+                <mxCell id="19" value="TR makes a&lt;br&gt;state change" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                    <mxGeometry x="230" y="310" width="90" height="40" as="geometry"/>
                 </mxCell>
-                <mxCell id="41" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="25">
+                <mxCell id="20" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="4">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
                         <mxPoint x="319" y="350" as="sourcePoint"/>
-                        <mxPoint x="318.8899999999999" y="465" as="targetPoint"/>
+                        <mxPoint x="318.8900000000003" y="465" as="targetPoint"/>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="42" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                <mxCell id="21" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
                     <mxGeometry x="260" y="-30" width="120" height="60" as="geometry"/>
                 </mxCell>
-                <mxCell id="43" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                <mxCell id="22" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
                     <mxGeometry x="320" y="45" width="60" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="44" value="Tryggingastofnun abort" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="330" y="210" width="120" height="60" as="geometry"/>
+                <mxCell id="23" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
+                    <mxGeometry x="250" y="350" width="70" height="30" as="geometry"/>
                 </mxCell>
-                <mxCell id="45" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="44" target="24">
+                <mxCell id="24" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="570" y="240" as="sourcePoint"/>
-                        <mxPoint x="630" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="510" y="240"/>
-                            <mxPoint x="510" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="46" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="510" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="47" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" target="26">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="391.1099999999999" y="270" as="sourcePoint"/>
-                        <mxPoint x="449.9999999999999" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="48" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="215" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="49" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="50" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="30" as="sourcePoint"/>
-                        <mxPoint x="320" y="90" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="51" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="150" as="sourcePoint"/>
-                        <mxPoint x="390" y="210" as="targetPoint"/>
+                        <mxPoint x="320.00000000000045" y="30" as="sourcePoint"/>
+                        <mxPoint x="320.00000000000045" y="90" as="targetPoint"/>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="52" value="Abort" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="165" width="50" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="53" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
+                <mxCell id="25" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" target="4">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="150" as="sourcePoint"/>
+                        <mxPoint x="320.00000000000045" y="150" as="sourcePoint"/>
                         <mxPoint x="260" y="210" as="targetPoint"/>
                     </mxGeometry>
                 </mxCell>
-                <mxCell id="54" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" target="28">
+                <mxCell id="26" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" target="7">
                     <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="525" as="sourcePoint"/>
+                        <mxPoint x="320.00000000000045" y="525" as="sourcePoint"/>
                         <mxPoint x="400" y="615" as="targetPoint"/>
                         <Array as="points"/>
                     </mxGeometry>
diff --git a/libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.png b/libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.png
new file mode 100644
index 000000000000..19bb17b895b3
Binary files /dev/null and b/libs/application/templates/social-insurance-administration/core/assets/tr-applications-flow-chart.png differ
diff --git a/libs/application/templates/social-insurance-administration/core/src/lib/constants.ts b/libs/application/templates/social-insurance-administration/core/src/lib/constants.ts
index ca5296dbb8bf..ebbc11f6c559 100644
--- a/libs/application/templates/social-insurance-administration/core/src/lib/constants.ts
+++ b/libs/application/templates/social-insurance-administration/core/src/lib/constants.ts
@@ -27,6 +27,7 @@ export enum States {
 
   REJECTED = 'rejected', // SYNJAD = 1281
   APPROVED = 'approved', // AFGREIDD = 563
+  COMPLETED = 'completed',
 }
 
 export enum OAPEvents {
diff --git a/libs/application/templates/social-insurance-administration/core/src/lib/messages.ts b/libs/application/templates/social-insurance-administration/core/src/lib/messages.ts
index ba767b3d3e5d..a33e92b37f35 100644
--- a/libs/application/templates/social-insurance-administration/core/src/lib/messages.ts
+++ b/libs/application/templates/social-insurance-administration/core/src/lib/messages.ts
@@ -48,16 +48,16 @@ export const socialInsuranceAdministrationMessage: MessageDir = {
       description:
         'I understand that the above information will be collected during the application process',
     },
-    contactInfoTitle: {
-      id: 'sia.application:prerequisites.contact.info.title',
-      defaultMessage: 'Mínar upplýsingar á Mínum síðum Ísland.is',
-      description: 'My information on My pages Ísland.is',
-    },
     skraInformationTitle: {
       id: 'sia.application:prerequisites.national.registry.title',
       defaultMessage: 'Upplýsingar frá Þjóðskrá',
       description: 'Information from Registers Iceland',
     },
+    contactInfoTitle: {
+      id: 'sia.application:prerequisites.contact.info.title',
+      defaultMessage: 'Mínar upplýsingar á Mínum síðum Ísland.is',
+      description: 'My information on My pages Ísland.is',
+    },
     contactInfoDescription: {
       id: 'sia.application:prerequisites.contact.info.description',
       defaultMessage:
@@ -678,4 +678,9 @@ export const statesMessages = defineMessages({
     defaultMessage: 'Í bið',
     description: 'Pending',
   },
+  inProgressTag: {
+    id: 'sia.application:in.progress.tag',
+    defaultMessage: 'Í vinnslu',
+    description: 'In progress',
+  },
 })
diff --git a/libs/application/templates/social-insurance-administration/core/src/lib/socialInsuranceAdministrationUtils.ts b/libs/application/templates/social-insurance-administration/core/src/lib/socialInsuranceAdministrationUtils.ts
index de025e723e5c..f7f0cf0db644 100644
--- a/libs/application/templates/social-insurance-administration/core/src/lib/socialInsuranceAdministrationUtils.ts
+++ b/libs/application/templates/social-insurance-administration/core/src/lib/socialInsuranceAdministrationUtils.ts
@@ -90,12 +90,17 @@ export const shouldNotUpdateBankAccount = (
   }
 }
 
-export const getCurrencies = (currencies: string[]) => {
+export const getCurrencies = (
+  currencies: string[],
+  hideISKCurrency?: string,
+) => {
   return (
-    currencies.map((i) => ({
-      label: i,
-      value: i,
-    })) ?? []
+    currencies
+      .filter((i) => i !== hideISKCurrency)
+      .map((i) => ({
+        label: i,
+        value: i,
+      })) ?? []
   )
 }
 
diff --git a/libs/application/templates/social-insurance-administration/household-supplement/README.md b/libs/application/templates/social-insurance-administration/household-supplement/README.md
index 9dbc0707cd29..a794f4291a06 100644
--- a/libs/application/templates/social-insurance-administration/household-supplement/README.md
+++ b/libs/application/templates/social-insurance-administration/household-supplement/README.md
@@ -4,7 +4,7 @@
 
 This application template allows applicants to apply for household supplement.
 
-![](./assets/household-supplement-flow-chart.png)
+![](../core/assets/tr-applications-flow-chart.png)
 
 ### States
 
diff --git a/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.drawio b/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.drawio
deleted file mode 100644
index c79273a3eced..000000000000
--- a/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.drawio
+++ /dev/null
@@ -1,158 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="2TvxPNVq2NB_tCsKO4EG" name="Page-1">
-        <mxGraphModel dx="1058" dy="1502" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="23" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" vertex="1" parent="1">
-                    <mxGeometry x="-40" y="-90" width="720" height="810" as="geometry"/>
-                </mxCell>
-                <mxCell id="24" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="90" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="25" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="200" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="26" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="465" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="27" value="Additional documents required" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="120" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="28" value="Approved" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="29" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="26" target="27">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="525" as="sourcePoint"/>
-                        <mxPoint x="320" y="585" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="180" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="30" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="27" target="26">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="70" y="615" as="sourcePoint"/>
-                        <mxPoint x="70" y="675" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="70" y="615"/>
-                            <mxPoint x="70" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="31" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="24">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="200" y="240" as="sourcePoint"/>
-                        <mxPoint x="140" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="140" y="240"/>
-                            <mxPoint x="140" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="32" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="100" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="33" value="Reject" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="460" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="34" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="230" y="165" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="35" value="Additional&#10;documents &#10;required" style="text;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="110" y="515" width="65" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="36" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="250" y="535" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="37" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="10" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="38" value="Rejected" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="400" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="39" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="26" target="38">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="340" y="545" as="sourcePoint"/>
-                        <mxPoint x="200" y="605" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="460" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="40" value="TR makes a&lt;br&gt;state change" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="295" width="90" height="40" as="geometry"/>
-                </mxCell>
-                <mxCell id="41" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="25">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="319" y="350" as="sourcePoint"/>
-                        <mxPoint x="318.8899999999999" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="42" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="-30" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="43" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="320" y="45" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="44" value="Tryggingastofnun abort" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="330" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="45" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="44" target="24">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="570" y="240" as="sourcePoint"/>
-                        <mxPoint x="630" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="510" y="240"/>
-                            <mxPoint x="510" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="46" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="510" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="47" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" target="26">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="391.1099999999999" y="270" as="sourcePoint"/>
-                        <mxPoint x="449.9999999999999" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="48" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="215" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="49" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="50" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="30" as="sourcePoint"/>
-                        <mxPoint x="320" y="90" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="51" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="150" as="sourcePoint"/>
-                        <mxPoint x="390" y="210" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="52" value="Abort" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="165" width="50" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="53" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="150" as="sourcePoint"/>
-                        <mxPoint x="260" y="210" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="54" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" target="28">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="525" as="sourcePoint"/>
-                        <mxPoint x="400" y="615" as="targetPoint"/>
-                        <Array as="points"/>
-                    </mxGeometry>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>
\ No newline at end of file
diff --git a/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.png b/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.png
deleted file mode 100644
index d5278a3c18dd..000000000000
Binary files a/libs/application/templates/social-insurance-administration/household-supplement/assets/household-supplement-flow-chart.png and /dev/null differ
diff --git a/libs/application/templates/social-insurance-administration/income-plan/.babelrc b/libs/application/templates/social-insurance-administration/income-plan/.babelrc
new file mode 100644
index 000000000000..1ea870ead410
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/.babelrc
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@nx/react/babel",
+      {
+        "runtime": "automatic",
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
+  "plugins": []
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/.eslintrc.json b/libs/application/templates/social-insurance-administration/income-plan/.eslintrc.json
new file mode 100644
index 000000000000..e347fe4f7816
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/.eslintrc.json
@@ -0,0 +1,19 @@
+{
+  "extends": ["plugin:@nx/react", "../../../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "rules": {},
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/README.md b/libs/application/templates/social-insurance-administration/income-plan/README.md
new file mode 100644
index 000000000000..93345662a138
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/README.md
@@ -0,0 +1,50 @@
+# Application Templates Income Plan
+
+## Description
+
+This application template allows for submitting an income plan following an application.
+
+![](./assets/income-plan-flow-chart.png)
+
+### States
+
+#### Prerequisites
+
+This state is a temporary state that all new income plans will be created in. It has a short lifespan and is unlisted.
+
+The purpose of this state is to be a guard into the actual income plan. There is an external data step which fetches data from Þjóðskrá and TR. The applicant cannot advance if they have a previous income plan that has been in progress at TR for fewer than 10 days.
+
+#### Draft
+
+Valid applicants will be able to advance to this state where they can start to review their pre-filled income plan and make changes. If they already have an income plan at TR, they can make changes to it and see a temporary calculation before sending in the updated income plan.
+
+#### Tryggingastofnun submitted
+
+When an applicant has sent in the income plan to TR, the application is in this state. Here, the income plan can be edited.
+
+#### Tryggingastofnun in review
+
+For the income plan to be in this state, TR needs to make a state change when they start reviewing the income plan. Here, the application cannot be edited.
+
+#### Approved (Processed)
+
+The income plan has been processed by TR.
+
+### Localisation
+
+All localization can be found on Contentful.
+
+- [Income plan translations](https://app.contentful.com/spaces/8k0h54kbe6bj/entries/ip.application)
+- [Application system translations](https://app.contentful.com/spaces/8k0h54kbe6bj/entries/application.system)
+
+When creating new text strings in the messages.ts file for the application, be sure to update Contentful. See [message extraction](../../../../localization/README.md#message-extraction).
+
+## Setup
+
+See [application-system](../../../../../apps/application-system/README.md) setup on how to get started.
+
+Once you have everything running, you can navigate to [http://localhost:4242/umsoknir/tekjuaaetlun](http://localhost:4242/umsoknir/tekjuaaetlun) and start developing.
+
+## Running unit tests
+
+Run `nx test application-templates-social-insurance-administration-income-plan` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.drawio b/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.drawio
new file mode 100644
index 000000000000..acbc779241dc
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.drawio
@@ -0,0 +1,83 @@
+<mxfile host="65bd71144e">
+    <diagram id="lqEHqnM0KQjVWkPkSSZl" name="Page-1">
+        <mxGraphModel dx="1278" dy="1873" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="3" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" parent="1" vertex="1">
+                    <mxGeometry x="-40" y="-165" width="720" height="810" as="geometry"/>
+                </mxCell>
+                <mxCell id="4" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="260" y="90" width="120" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="260" y="210" width="120" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="6" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="260" y="330" width="120" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="8" value="Completed" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="260" y="450" width="120" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="165" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="16" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="250" y="400" width="70" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="20" value="TR makes these&lt;br&gt;state changes" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="90" y="340" width="110" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="22" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="260" y="-30" width="120" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="23" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="45" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" source="5" target="4" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="450" y="240" as="sourcePoint"/>
+                        <mxPoint x="630" y="120" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="440" y="240"/>
+                            <mxPoint x="440" y="120"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="26" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="440" y="165" width="40" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="28" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
+                    <mxGeometry x="250" y="290" width="70" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="30" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="320" y="30" as="sourcePoint"/>
+                        <mxPoint x="320" y="90" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="33" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" target="5" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="320" y="150" as="sourcePoint"/>
+                        <mxPoint x="260" y="210" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="35" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="320" y="390" as="sourcePoint"/>
+                        <mxPoint x="320" y="450" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="36" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="318.75" y="270" as="sourcePoint"/>
+                        <mxPoint x="318.75" y="330" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="42" value="&lt;font style=&quot;font-size: 200px;&quot;&gt;{&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;fontFamily=Courier New;" parent="1" vertex="1">
+                    <mxGeometry x="160" y="230" width="140" height="250" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>
\ No newline at end of file
diff --git a/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.png b/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.png
new file mode 100644
index 000000000000..e99cebe7ff5a
Binary files /dev/null and b/libs/application/templates/social-insurance-administration/income-plan/assets/income-plan-flow-chart.png differ
diff --git a/libs/application/templates/social-insurance-administration/income-plan/codegen.yml b/libs/application/templates/social-insurance-administration/income-plan/codegen.yml
new file mode 100644
index 000000000000..0006f81cf2ce
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/codegen.yml
@@ -0,0 +1,11 @@
+schema:
+  - apps/api/src/api.graphql
+documents: libs/application/templates/social-insurance-administration/income-plan/src/graphql/queries.ts
+generates:
+  libs/application/templates/social-insurance-administration/income-plan/src/types/schema.ts:
+    plugins:
+      - typescript
+      - typescript-operations
+hooks:
+  afterAllFileWrite:
+    - prettier --write
diff --git a/libs/application/templates/social-insurance-administration/income-plan/jest.config.ts b/libs/application/templates/social-insurance-administration/income-plan/jest.config.ts
new file mode 100644
index 000000000000..d0c9870ad5d3
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/jest.config.ts
@@ -0,0 +1,13 @@
+/* eslint-disable */
+export default {
+  displayName:
+    'application-templates-social-insurance-administration-income-plan',
+  preset: '../../../../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory:
+    '../../../../../coverage/libs/application/templates/social-insurance-administration/income-plan',
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/project.json b/libs/application/templates/social-insurance-administration/income-plan/project.json
new file mode 100644
index 000000000000..51ae5d3aa909
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/project.json
@@ -0,0 +1,46 @@
+{
+  "name": "application-templates-social-insurance-administration-income-plan",
+  "$schema": "../../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/application/templates/social-insurance-administration/income-plan/src",
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "libs/application/templates/social-insurance-administration/income-plan/**/*.{ts,tsx,js,jsx}"
+        ]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": [
+        "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/income-plan"
+      ],
+      "options": {
+        "jestConfig": "libs/application/templates/social-insurance-administration/income-plan/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    },
+    "extract-strings": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/income-plan/src/lib/messages.ts'"
+      }
+    },
+    "codegen/frontend-client": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "graphql-codegen --config libs/application/templates/social-insurance-administration/income-plan/codegen.yml"
+      }
+    }
+  },
+  "tags": ["scope:application-system", "lib:application-system"]
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/dataProviders/index.ts b/libs/application/templates/social-insurance-administration/income-plan/src/dataProviders/index.ts
new file mode 100644
index 000000000000..403142744023
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/dataProviders/index.ts
@@ -0,0 +1,44 @@
+import { defineTemplateApi } from '@island.is/application/types'
+
+export { UserProfileApi } from '@island.is/application/types'
+
+export const SocialInsuranceAdministrationCategorizedIncomeTypesApi =
+  defineTemplateApi({
+    action: 'getCategorizedIncomeTypes',
+    externalDataId: 'socialInsuranceAdministrationCategorizedIncomeTypes',
+    namespace: 'SocialInsuranceAdministration',
+  })
+
+export const SocialInsuranceAdministrationCurrenciesApi = defineTemplateApi({
+  action: 'getCurrencies',
+  externalDataId: 'socialInsuranceAdministrationCurrencies',
+  namespace: 'SocialInsuranceAdministration',
+})
+
+export const SocialInsuranceAdministrationWithholdingTaxApi = defineTemplateApi(
+  {
+    action: 'getWithholdingTax',
+    externalDataId: 'socialInsuranceAdministrationWithholdingTax',
+    namespace: 'SocialInsuranceAdministration',
+  },
+)
+
+export const SocialInsuranceAdministrationLatestIncomePlan = defineTemplateApi({
+  action: 'getLatestIncomePlan',
+  externalDataId: 'socialInsuranceAdministrationLatestIncomePlan',
+  namespace: 'SocialInsuranceAdministration',
+})
+
+export const SocialInsuranceAdministrationIsApplicantEligibleApi =
+  defineTemplateApi({
+    action: 'getIsEligible',
+    externalDataId: 'socialInsuranceAdministrationIsApplicantEligible',
+    namespace: 'SocialInsuranceAdministration',
+  })
+
+export const SocialInsuranceAdministrationIncomePlanConditionsApi =
+  defineTemplateApi({
+    action: 'getIncomePlanConditions',
+    externalDataId: 'socialInsuranceAdministrationIncomePlanConditions',
+    namespace: 'SocialInsuranceAdministration',
+  })
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/fields/Review/index.tsx b/libs/application/templates/social-insurance-administration/income-plan/src/fields/Review/index.tsx
new file mode 100644
index 000000000000..09323c06371b
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/fields/Review/index.tsx
@@ -0,0 +1,184 @@
+import {
+  Application,
+  Field,
+  FieldComponents,
+  FieldTypes,
+  RecordObject,
+} from '@island.is/application/types'
+import {
+  Box,
+  Text,
+  Button,
+  GridRow,
+  GridColumn,
+} from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import { FC, useMemo } from 'react'
+import { useMutation } from '@apollo/client'
+import {
+  Label,
+  ReviewGroup,
+  formatCurrencyWithoutSuffix,
+  handleServerError,
+} from '@island.is/application/ui-components'
+import { StaticTableFormField } from '@island.is/application/ui-fields'
+import { SUBMIT_APPLICATION } from '@island.is/application/graphql'
+import { inReviewFormMessages, incomePlanFormMessage } from '../../lib/messages'
+import { getApplicationAnswers } from '../../lib/incomePlanUtils'
+import { States } from '@island.is/application/templates/social-insurance-administration-core/lib/constants'
+import { socialInsuranceAdministrationMessage } from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
+
+interface ReviewScreenProps {
+  application: Application
+  field: Field & { props?: { editable?: boolean } }
+  goToScreen?: (id: string) => void
+  refetch?: () => void
+  errors?: RecordObject
+  editable?: boolean
+}
+export const Review: FC<ReviewScreenProps> = ({
+  application,
+  field,
+  goToScreen,
+  refetch,
+}) => {
+  const editable = field.props?.editable ?? false
+  const { formatMessage } = useLocale()
+  const { incomePlan } = getApplicationAnswers(application.answers)
+  const { state } = application
+  const [submitApplication, { loading: loadingSubmit }] = useMutation(
+    SUBMIT_APPLICATION,
+    {
+      onError: (e) => handleServerError(e, formatMessage),
+    },
+  )
+
+  const handleSubmit = async (event: string) => {
+    const res = await submitApplication({
+      variables: {
+        input: {
+          id: application.id,
+          event,
+          answers: application.answers,
+        },
+      },
+    })
+
+    if (res?.data) {
+      // Takes them to the next state (which loads the relevant form)
+      refetch?.()
+    }
+  }
+
+  const rows = useMemo(
+    () =>
+      incomePlan.map((e) => [
+        e.incomeType,
+        formatCurrencyWithoutSuffix(e.incomePerYear),
+        e.currency,
+      ]),
+    [incomePlan],
+  )
+
+  return (
+    <>
+      {state === `${States.DRAFT}` ? (
+        <Box display="flex" justifyContent="spaceBetween">
+          <Box>
+            <Box marginBottom={2}>
+              <Text variant="h2">
+                {formatMessage(incomePlanFormMessage.confirm.title)}
+              </Text>
+            </Box>
+            <Box marginBottom={10}>
+              <Text variant="default">
+                {formatMessage(incomePlanFormMessage.confirm.description)}
+              </Text>
+            </Box>
+          </Box>
+          <Box>
+            <Button
+              variant="utility"
+              icon="print"
+              onClick={(e) => {
+                e.preventDefault()
+                window.print()
+              }}
+            />
+          </Box>
+        </Box>
+      ) : (
+        <Box display="flex" justifyContent="spaceBetween">
+          <Box>
+            <Box marginBottom={2}>
+              <Text variant="h2">
+                {formatMessage(
+                  socialInsuranceAdministrationMessage.confirm.overviewTitle,
+                )}
+              </Text>
+            </Box>
+            <Box marginBottom={10}>
+              <Text variant="default">
+                {formatMessage(inReviewFormMessages.description)}
+              </Text>
+            </Box>
+          </Box>
+          <Box display="flex" columnGap={2} alignItems="center">
+            {state === `${States.TRYGGINGASTOFNUN_SUBMITTED}` && (
+              <Button
+                colorScheme="default"
+                iconType="filled"
+                size="small"
+                type="button"
+                variant="text"
+                icon="pencil"
+                loading={loadingSubmit}
+                disabled={loadingSubmit}
+                onClick={() => handleSubmit('EDIT')}
+              >
+                {formatMessage(incomePlanFormMessage.confirm.buttonEdit)}
+              </Button>
+            )}
+            <Button
+              variant="utility"
+              icon="print"
+              onClick={(e) => {
+                e.preventDefault()
+                window.print()
+              }}
+            />
+          </Box>
+        </Box>
+      )}
+      <ReviewGroup
+        isLast
+        isEditable={editable}
+        editAction={() => goToScreen?.('incomePlanTable')}
+      >
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '12/12', '12/12']}>
+            <Label>{formatMessage(incomePlanFormMessage.info.section)}</Label>
+            <Box paddingTop={3}>
+              <StaticTableFormField
+                application={application}
+                field={{
+                  type: FieldTypes.STATIC_TABLE,
+                  component: FieldComponents.STATIC_TABLE,
+                  children: undefined,
+                  id: 'incomePlan',
+                  title: '',
+                  header: [
+                    incomePlanFormMessage.incomePlan.incomeType,
+                    incomePlanFormMessage.incomePlan.incomePerYear,
+                    incomePlanFormMessage.incomePlan.currency,
+                  ],
+                  rows,
+                }}
+              />
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </ReviewGroup>
+    </>
+  )
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/fields/TemporaryCalculationTable/index.tsx b/libs/application/templates/social-insurance-administration/income-plan/src/fields/TemporaryCalculationTable/index.tsx
new file mode 100644
index 000000000000..0b3dff970eb3
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/fields/TemporaryCalculationTable/index.tsx
@@ -0,0 +1,243 @@
+import { useQuery } from '@apollo/client'
+import { coreErrorMessages } from '@island.is/application/core'
+import { socialInsuranceAdministrationMessage } from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
+import { FieldBaseProps } from '@island.is/application/types'
+import { formatCurrency } from '@island.is/application/ui-components'
+import {
+  AlertMessage,
+  Box,
+  Button,
+  SkeletonLoader,
+  Stack,
+  Table as T,
+} from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import React, { FC } from 'react'
+import { TemporaryCalculationQuery } from '../../graphql/queries'
+import { INCOME, RatioType, YES } from '../../lib/constants'
+import {
+  getApplicationAnswers,
+  getApplicationExternalData,
+} from '../../lib/incomePlanUtils'
+import { incomePlanFormMessage } from '../../lib/messages'
+import { SocialInsuranceTemporaryCalculationGroup } from '../../types/schema'
+
+export const TemporaryCalculationTable: FC<
+  React.PropsWithChildren<FieldBaseProps>
+> = ({ application }) => {
+  const { formatMessage } = useLocale()
+
+  const { incomePlan } = getApplicationAnswers(application.answers)
+  const { categorizedIncomeTypes, incomePlanConditions } =
+    getApplicationExternalData(application.externalData)
+
+  const input = {
+    incomeYear: incomePlanConditions.incomePlanYear,
+    incomeTypes: incomePlan.map((income) => {
+      const incomeType = categorizedIncomeTypes.find(
+        (item) => item.incomeTypeName === income.incomeType,
+      )
+
+      return {
+        incomeTypeNumber: incomeType?.incomeTypeNumber,
+        incomeTypeCode: incomeType?.incomeTypeCode,
+        incomeTypeName: income.incomeType,
+        currencyCode: income.currency,
+        incomeCategoryNumber: incomeType?.categoryNumber,
+        incomeCategoryCode: incomeType?.categoryCode,
+        incomeCategoryName: income.incomeCategory,
+        ...(income.income === RatioType.MONTHLY &&
+        income?.incomeCategory === INCOME &&
+        income?.unevenIncomePerYear?.[0] === YES
+          ? {
+              amountJan: Number(income.january),
+              amountFeb: Number(income.february),
+              amountMar: Number(income.march),
+              amountApr: Number(income.april),
+              amountMay: Number(income.may),
+              amountJun: Number(income.june),
+              amountJul: Number(income.july),
+              amountAug: Number(income.august),
+              amountSep: Number(income.september),
+              amountOct: Number(income.october),
+              amountNov: Number(income.november),
+              amountDec: Number(income.december),
+            }
+          : {
+              amountJan: Math.round(Number(income.incomePerYear) / 12),
+              amountFeb: Math.round(Number(income.incomePerYear) / 12),
+              amountMar: Math.round(Number(income.incomePerYear) / 12),
+              amountApr: Math.round(Number(income.incomePerYear) / 12),
+              amountMay: Math.round(Number(income.incomePerYear) / 12),
+              amountJun: Math.round(Number(income.incomePerYear) / 12),
+              amountJul: Math.round(Number(income.incomePerYear) / 12),
+              amountAug: Math.round(Number(income.incomePerYear) / 12),
+              amountSep: Math.round(Number(income.incomePerYear) / 12),
+              amountOct: Math.round(Number(income.incomePerYear) / 12),
+              amountNov: Math.round(Number(income.incomePerYear) / 12),
+              amountDec: Math.round(Number(income.incomePerYear) / 12),
+            }),
+      }
+    }),
+  }
+
+  const { data, loading, error } = useQuery(TemporaryCalculationQuery, {
+    variables: {
+      input,
+    },
+    skip: !incomePlanConditions.showTemporaryCalculations,
+  })
+
+  if (!incomePlanConditions.showTemporaryCalculations) {
+    return (
+      <Box marginY={3}>
+        <AlertMessage
+          type="warning"
+          title={formatMessage(
+            socialInsuranceAdministrationMessage.shared.alertTitle,
+          )}
+          message={formatMessage(
+            incomePlanFormMessage.info.noAvailablePrerequisites,
+            {
+              incomePlanYear: incomePlanConditions.incomePlanYear,
+            },
+          )}
+        />
+      </Box>
+    )
+  }
+
+  if (loading) {
+    return (
+      <Box marginY={3}>
+        <Stack space={3}>
+          <SkeletonLoader height={50} />
+          <SkeletonLoader height={150} />
+          <SkeletonLoader height={50} />
+        </Stack>
+      </Box>
+    )
+  }
+
+  if (error) {
+    return (
+      <Box marginY={3}>
+        <AlertMessage
+          type="error"
+          title={formatMessage(
+            socialInsuranceAdministrationMessage.shared.alertTitle,
+          )}
+          message={formatMessage(coreErrorMessages.failedDataProvider)}
+        />
+      </Box>
+    )
+  }
+
+  if (!data?.getTemporaryCalculations?.paidOut) {
+    return (
+      <Box marginY={3}>
+        <AlertMessage
+          type="warning"
+          title={formatMessage(
+            socialInsuranceAdministrationMessage.shared.alertTitle,
+          )}
+          message={formatMessage(incomePlanFormMessage.info.noPayments)}
+        />
+      </Box>
+    )
+  }
+
+  return (
+    <Box>
+      <Box display="flex" justifyContent="flexEnd">
+        <Button
+          variant="utility"
+          icon="print"
+          onClick={(e) => {
+            e.preventDefault()
+            window.print()
+          }}
+        />
+      </Box>
+      <Box marginY={3}>
+        <Stack space={3}>
+          <T.Table>
+            <T.Head>
+              <T.Row>
+                <T.HeadData width="50%">
+                  {formatMessage(incomePlanFormMessage.info.tableHeaderOne)}
+                </T.HeadData>
+                <T.HeadData width="25%" align="right" box={{ paddingRight: 0 }}>
+                  {formatMessage(incomePlanFormMessage.info.tableHeaderTwo)}
+                </T.HeadData>
+                <T.HeadData width="25%" align="right">
+                  {formatMessage(incomePlanFormMessage.info.tableHeaderThree)}
+                </T.HeadData>
+              </T.Row>
+            </T.Head>
+          </T.Table>
+          {data?.getTemporaryCalculations?.groups.map(
+            (
+              group: SocialInsuranceTemporaryCalculationGroup,
+              index: number,
+            ) => (
+              <T.Table key={index}>
+                <T.Head>
+                  <T.Row>
+                    <T.HeadData width="50%">{group.group}</T.HeadData>
+                    <T.HeadData
+                      width="25%"
+                      align="right"
+                      box={{ paddingRight: 0 }}
+                    >
+                      {group.total &&
+                        formatCurrency(Math.round(group.total / 12).toString())}
+                    </T.HeadData>
+                    <T.HeadData width="25%" align="right">
+                      {group.total && formatCurrency(group.total.toString())}
+                    </T.HeadData>
+                  </T.Row>
+                </T.Head>
+                <T.Body>
+                  {group?.rows?.map((row, rowIndex) => (
+                    <T.Row key={`row-${rowIndex}`}>
+                      <T.Data>{row.name}</T.Data>
+                      <T.Data align="right" box={{ paddingRight: 0 }}>
+                        {row.total &&
+                          formatCurrency(Math.round(row.total / 12).toString())}
+                      </T.Data>
+                      <T.Data align="right">
+                        {row.total && formatCurrency(row.total.toString())}
+                      </T.Data>
+                    </T.Row>
+                  ))}
+                </T.Body>
+              </T.Table>
+            ),
+          )}
+          <T.Table>
+            <T.Head>
+              <T.Row>
+                <T.HeadData width="50%">
+                  {formatMessage(incomePlanFormMessage.info.paidTableHeader)}
+                </T.HeadData>
+                <T.HeadData width="25%" align="right" box={{ paddingRight: 0 }}>
+                  {formatCurrency(
+                    Math.round(
+                      data?.getTemporaryCalculations?.paidOut / 12,
+                    ).toString(),
+                  )}
+                </T.HeadData>
+                <T.HeadData width="25%" align="right">
+                  {formatCurrency(
+                    data?.getTemporaryCalculations?.paidOut.toString(),
+                  )}
+                </T.HeadData>
+              </T.Row>
+            </T.Head>
+          </T.Table>
+        </Stack>
+      </Box>
+    </Box>
+  )
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/fields/index.ts b/libs/application/templates/social-insurance-administration/income-plan/src/fields/index.ts
new file mode 100644
index 000000000000..920c7e39e0e1
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/fields/index.ts
@@ -0,0 +1,2 @@
+export { Review } from './Review'
+export { TemporaryCalculationTable } from './TemporaryCalculationTable'
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/forms/InReview.ts b/libs/application/templates/social-insurance-administration/income-plan/src/forms/InReview.ts
new file mode 100644
index 000000000000..97ed6f6a54f1
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/forms/InReview.ts
@@ -0,0 +1,27 @@
+import {
+  buildCustomField,
+  buildForm,
+  buildSection,
+} from '@island.is/application/core'
+import { Form } from '@island.is/application/types'
+import { inReviewFormMessages } from '../lib/messages'
+import Logo from '@island.is/application/templates/social-insurance-administration-core/assets/Logo'
+
+export const InReview: Form = buildForm({
+  id: 'IncomePlanInReview',
+  title: inReviewFormMessages.formTitle,
+  logo: Logo,
+  children: [
+    buildSection({
+      id: 'review',
+      title: '',
+      children: [
+        buildCustomField({
+          id: 'InReview',
+          title: '',
+          component: 'Review',
+        }),
+      ],
+    }),
+  ],
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts b/libs/application/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts
new file mode 100644
index 000000000000..8020c80820d1
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts
@@ -0,0 +1,640 @@
+import {
+  buildCustomField,
+  buildDescriptionField,
+  buildForm,
+  buildMultiField,
+  buildSection,
+  buildSubSection,
+  buildSubmitField,
+  buildTableRepeaterField,
+} from '@island.is/application/core'
+import Logo from '@island.is/application/templates/social-insurance-administration-core/assets/Logo'
+import { socialInsuranceAdministrationMessage } from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
+import { getCurrencies } from '@island.is/application/templates/social-insurance-administration-core/lib/socialInsuranceAdministrationUtils'
+import {
+  Application,
+  DefaultEvents,
+  Form,
+  FormModes,
+} from '@island.is/application/types'
+import { formatCurrencyWithoutSuffix } from '@island.is/application/ui-components'
+import { buildFormConclusionSection } from '@island.is/application/ui-forms'
+import isEmpty from 'lodash/isEmpty'
+import {
+  FOREIGN_BASIC_PENSION,
+  INCOME,
+  ISK,
+  RatioType,
+  YES,
+} from '../lib/constants'
+import {
+  getApplicationExternalData,
+  getCategoriesOptions,
+  getTypesOptions,
+} from '../lib/incomePlanUtils'
+import { incomePlanFormMessage } from '../lib/messages'
+
+export const IncomePlanForm: Form = buildForm({
+  id: 'IncomePlanDraft',
+  title: incomePlanFormMessage.pre.formTitle,
+  logo: Logo,
+  mode: FormModes.DRAFT,
+  children: [
+    buildSection({
+      id: 'incomePlan',
+      title: incomePlanFormMessage.info.section,
+      children: [
+        buildSubSection({
+          id: 'incomePlanInstructions',
+          title: incomePlanFormMessage.info.instructionsShortTitle,
+          children: [
+            buildDescriptionField({
+              id: 'instructions',
+              title: incomePlanFormMessage.info.instructionsTitle,
+              description: incomePlanFormMessage.info.instructionsDescription,
+              space: 'containerGutter',
+              doesNotRequireAnswer: false,
+            }),
+          ],
+        }),
+        buildSubSection({
+          id: 'incomePlan',
+          title: incomePlanFormMessage.info.section,
+          children: [
+            buildTableRepeaterField({
+              id: 'incomePlanTable',
+              title: incomePlanFormMessage.info.section,
+              description: (application: Application) => {
+                const { incomePlanConditions, latestIncomePlan } =
+                  getApplicationExternalData(application.externalData)
+                const hasLatestIncomePlan = !isEmpty(latestIncomePlan)
+                const baseMessage = hasLatestIncomePlan
+                  ? incomePlanFormMessage.incomePlan
+                      .currentIncomePlanDescription
+                  : incomePlanFormMessage.incomePlan.description
+
+                return {
+                  ...baseMessage,
+                  values: {
+                    incomePlanYear: incomePlanConditions.incomePlanYear,
+                  },
+                }
+              },
+              formTitle: incomePlanFormMessage.incomePlan.registerIncome,
+              addItemButtonText: incomePlanFormMessage.incomePlan.addIncome,
+              saveItemButtonText: incomePlanFormMessage.incomePlan.saveIncome,
+              editField: true,
+              editButtonTooltipText:
+                incomePlanFormMessage.incomePlan.editIncome,
+              removeButtonTooltipText:
+                incomePlanFormMessage.incomePlan.removeIncome,
+              fields: {
+                incomeCategory: {
+                  component: 'select',
+                  label: incomePlanFormMessage.incomePlan.incomeCategory,
+                  placeholder:
+                    incomePlanFormMessage.incomePlan.selectIncomeCategory,
+                  displayInTable: false,
+                  width: 'half',
+                  isSearchable: true,
+                  options: (application) => {
+                    return getCategoriesOptions(application.externalData)
+                  },
+                },
+                incomeType: {
+                  component: 'select',
+                  label: incomePlanFormMessage.incomePlan.incomeType,
+                  placeholder:
+                    incomePlanFormMessage.incomePlan.selectIncomeType,
+                  width: 'half',
+                  isSearchable: true,
+                  updateValueObj: {
+                    valueModifier: (_) => '',
+                    watchValues: 'incomeCategory',
+                  },
+                  options: (application, activeField) => {
+                    return getTypesOptions(
+                      application.externalData,
+                      activeField?.incomeCategory,
+                    )
+                  },
+                },
+                currency: {
+                  component: 'select',
+                  label: incomePlanFormMessage.incomePlan.currency,
+                  placeholder: incomePlanFormMessage.incomePlan.selectCurrency,
+                  isSearchable: true,
+                  updateValueObj: {
+                    valueModifier: (activeField) => {
+                      const defaultCurrency =
+                        activeField?.incomeType === FOREIGN_BASIC_PENSION
+                          ? ''
+                          : ISK
+
+                      return defaultCurrency
+                    },
+                    watchValues: 'incomeType',
+                  },
+                  options: (application, activeField) => {
+                    const { currencies } = getApplicationExternalData(
+                      application.externalData,
+                    )
+
+                    const hideISKCurrency =
+                      activeField?.incomeType === FOREIGN_BASIC_PENSION
+                        ? ISK
+                        : ''
+
+                    return getCurrencies(currencies, hideISKCurrency)
+                  },
+                },
+                income: {
+                  component: 'radio',
+                  displayInTable: false,
+                  largeButtons: false,
+                  options: [
+                    {
+                      value: RatioType.YEARLY,
+                      label: incomePlanFormMessage.incomePlan.annualIncome,
+                    },
+                    {
+                      value: RatioType.MONTHLY,
+                      label: incomePlanFormMessage.incomePlan.monthlyIncome,
+                    },
+                  ],
+                },
+                equalForeignIncomePerMonth: {
+                  component: 'input',
+                  label:
+                    incomePlanFormMessage.incomePlan.equalForeignIncomePerMonth,
+                  width: 'half',
+                  type: 'number',
+                  displayInTable: false,
+                  currency: true,
+                  defaultValue: (_, activeField) => {
+                    if (activeField?.incomePerYear) {
+                      return Math.round(
+                        Number(activeField?.incomePerYear) / 12,
+                      ).toString()
+                    }
+                    return ''
+                  },
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    const unevenAndEmploymentIncome =
+                      activeField?.unevenIncomePerYear?.[0] !== YES ||
+                      (activeField?.incomeCategory !== INCOME &&
+                        activeField?.unevenIncomePerYear?.[0] === YES)
+
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.currency !== ISK &&
+                      unevenAndEmploymentIncome
+                    )
+                  },
+                },
+                equalIncomePerMonth: {
+                  component: 'input',
+                  label: incomePlanFormMessage.incomePlan.equalIncomePerMonth,
+                  width: 'half',
+                  type: 'number',
+                  displayInTable: false,
+                  currency: true,
+                  defaultValue: (_, activeField) => {
+                    if (activeField?.incomePerYear) {
+                      return Math.round(
+                        Number(activeField?.incomePerYear) / 12,
+                      ).toString()
+                    }
+                    return ''
+                  },
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    const unevenAndEmploymentIncome =
+                      activeField?.unevenIncomePerYear?.[0] !== YES ||
+                      (activeField?.incomeCategory !== INCOME &&
+                        activeField?.unevenIncomePerYear?.[0] === YES)
+
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.currency === ISK &&
+                      unevenAndEmploymentIncome
+                    )
+                  },
+                },
+                incomePerYear: {
+                  component: 'input',
+                  label: incomePlanFormMessage.incomePlan.incomePerYear,
+                  width: 'half',
+                  type: 'number',
+                  currency: true,
+                  readonly: (_, activeField) => {
+                    return activeField?.income === RatioType.MONTHLY
+                  },
+                  updateValueObj: {
+                    valueModifier: (activeField) => {
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.incomeCategory === INCOME &&
+                        activeField?.unevenIncomePerYear?.[0] === YES
+                      ) {
+                        return (
+                          Number(activeField?.january ?? 0) +
+                          Number(activeField?.february ?? 0) +
+                          Number(activeField?.march ?? 0) +
+                          Number(activeField?.april ?? 0) +
+                          Number(activeField?.may ?? 0) +
+                          Number(activeField?.june ?? 0) +
+                          Number(activeField?.july ?? 0) +
+                          Number(activeField?.august ?? 0) +
+                          Number(activeField?.september ?? 0) +
+                          Number(activeField?.october ?? 0) +
+                          Number(activeField?.november ?? 0) +
+                          Number(activeField?.december ?? 0)
+                        ).toString()
+                      }
+
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.currency === ISK
+                      ) {
+                        return (
+                          Number(activeField?.equalIncomePerMonth) * 12
+                        ).toString()
+                      }
+
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.currency !== ISK
+                      ) {
+                        return (
+                          Number(activeField?.equalForeignIncomePerMonth) * 12
+                        ).toString()
+                      }
+
+                      return undefined
+                    },
+                    watchValues: (activeField) => {
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.incomeCategory === INCOME &&
+                        activeField?.unevenIncomePerYear?.[0] === YES
+                      ) {
+                        return [
+                          'january',
+                          'february',
+                          'march',
+                          'april',
+                          'may',
+                          'june',
+                          'july',
+                          'august',
+                          'september',
+                          'october',
+                          'november',
+                          'december',
+                        ]
+                      }
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.currency === ISK
+                      ) {
+                        return 'equalIncomePerMonth'
+                      }
+                      if (
+                        activeField?.income === RatioType.MONTHLY &&
+                        activeField?.currency !== ISK
+                      ) {
+                        return 'equalForeignIncomePerMonth'
+                      }
+                      return undefined
+                    },
+                  },
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.YEARLY ||
+                      activeField?.income === RatioType.MONTHLY
+                    )
+                  },
+                },
+                unevenIncomePerYear: {
+                  component: 'checkbox',
+                  large: true,
+                  width: 'full',
+                  options: [
+                    {
+                      value: YES,
+                      label:
+                        incomePlanFormMessage.incomePlan
+                          .monthlyDistributionOfIncome,
+                      tooltip:
+                        incomePlanFormMessage.incomePlan
+                          .monthlyDistributionOfIncomeTooltip,
+                    },
+                  ],
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME
+                    )
+                  },
+                },
+                january: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.january,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                february: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.february,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                march: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.march,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                april: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.april,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                may: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.may,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                june: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.june,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                july: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.july,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                august: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.august,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                september: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.september,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                october: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.october,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                november: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.november,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+                december: {
+                  component: 'input',
+                  label: socialInsuranceAdministrationMessage.months.desember,
+                  width: 'third',
+                  type: 'number',
+                  backgroundColor: 'blue',
+                  displayInTable: false,
+                  currency: true,
+                  suffix: '',
+                  condition: (_, activeField) => {
+                    return (
+                      activeField?.income === RatioType.MONTHLY &&
+                      activeField?.incomeCategory === INCOME &&
+                      activeField?.unevenIncomePerYear?.[0] === YES
+                    )
+                  },
+                },
+              },
+              table: {
+                format: {
+                  incomePerYear: (value) =>
+                    value && formatCurrencyWithoutSuffix(value),
+                },
+                header: [
+                  incomePlanFormMessage.incomePlan.incomeType,
+                  incomePlanFormMessage.incomePlan.incomePerYear,
+                  incomePlanFormMessage.incomePlan.currency,
+                ],
+                rows: ['incomeType', 'incomePerYear', 'currency'],
+              },
+            }),
+          ],
+        }),
+      ],
+    }),
+    buildSection({
+      id: 'temporaryCalculationSection',
+      title: incomePlanFormMessage.info.temporaryCalculationTitle,
+      condition: (_, externalData) => {
+        const { latestIncomePlan } = getApplicationExternalData(externalData)
+        return !isEmpty(latestIncomePlan)
+      },
+      children: [
+        buildMultiField({
+          id: 'temporaryCalculation',
+          title: incomePlanFormMessage.info.temporaryCalculationTitle,
+          description: incomePlanFormMessage.info.tableDescription,
+          children: [
+            buildCustomField({
+              id: 'temporaryCalculationTable',
+              title: '',
+              component: 'TemporaryCalculationTable',
+            }),
+            buildDescriptionField({
+              id: 'assumptions',
+              title: '',
+              description: incomePlanFormMessage.info.assumptions,
+            }),
+          ],
+        }),
+      ],
+    }),
+    buildSection({
+      id: 'confirm',
+      title: socialInsuranceAdministrationMessage.confirm.overviewTitle,
+      children: [
+        buildMultiField({
+          id: 'confirm',
+          title: '',
+          description: '',
+          children: [
+            buildCustomField(
+              {
+                id: 'confirmScreen',
+                title: '',
+                component: 'Review',
+              },
+              {
+                editable: true,
+              },
+            ),
+            buildSubmitField({
+              id: 'submit',
+              placement: 'footer',
+              title: socialInsuranceAdministrationMessage.confirm.submitButton,
+              actions: [
+                {
+                  event: DefaultEvents.SUBMIT,
+                  name: incomePlanFormMessage.confirm.title,
+                  type: 'primary',
+                },
+              ],
+            }),
+          ],
+        }),
+      ],
+    }),
+    buildFormConclusionSection({
+      multiFieldTitle: incomePlanFormMessage.conclusionScreen.receivedTitle,
+      alertTitle: incomePlanFormMessage.conclusionScreen.alertTitle,
+      alertMessage: '',
+      expandableDescription: incomePlanFormMessage.conclusionScreen.bulletList,
+      expandableIntro: '',
+      bottomButtonMessage:
+        incomePlanFormMessage.conclusionScreen.bottomButtonMessage,
+      bottomButtonLink: '/minarsidur/framfaersla/tekjuaaetlun',
+    }),
+  ],
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/forms/Prerequisites.ts b/libs/application/templates/social-insurance-administration/income-plan/src/forms/Prerequisites.ts
new file mode 100644
index 000000000000..992990fa09dc
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/forms/Prerequisites.ts
@@ -0,0 +1,133 @@
+import {
+  buildDataProviderItem,
+  buildDescriptionField,
+  buildExternalDataProvider,
+  buildForm,
+  buildMultiField,
+  buildSection,
+  buildSubmitField,
+} from '@island.is/application/core'
+import Logo from '@island.is/application/templates/social-insurance-administration-core/assets/Logo'
+import { socialInsuranceAdministrationMessage } from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
+import {
+  Application,
+  DefaultEvents,
+  Form,
+  FormModes,
+  UserProfileApi,
+} from '@island.is/application/types'
+import {
+  SocialInsuranceAdministrationCategorizedIncomeTypesApi,
+  SocialInsuranceAdministrationCurrenciesApi,
+  SocialInsuranceAdministrationIncomePlanConditionsApi,
+  SocialInsuranceAdministrationIsApplicantEligibleApi,
+  SocialInsuranceAdministrationLatestIncomePlan,
+  SocialInsuranceAdministrationWithholdingTaxApi,
+} from '../dataProviders'
+import { eligibleText, isEligible } from '../lib/incomePlanUtils'
+import { incomePlanFormMessage } from '../lib/messages'
+
+export const PrerequisitesForm: Form = buildForm({
+  id: 'IncomePlanPrerequisites',
+  title: incomePlanFormMessage.pre.formTitle,
+  logo: Logo,
+  mode: FormModes.NOT_STARTED,
+  renderLastScreenButton: true,
+  children: [
+    buildSection({
+      id: 'externalData',
+      title: socialInsuranceAdministrationMessage.pre.externalDataSection,
+      children: [
+        buildExternalDataProvider({
+          id: 'approveExternalData',
+          title: socialInsuranceAdministrationMessage.pre.externalDataSection,
+          subTitle:
+            socialInsuranceAdministrationMessage.pre.externalDataDescription,
+          checkboxLabel: incomePlanFormMessage.pre.checkboxProvider,
+          submitField: buildSubmitField({
+            id: 'submit',
+            placement: 'footer',
+            title: socialInsuranceAdministrationMessage.pre.startApplication,
+            refetchApplicationAfterSubmit: true,
+            actions: [
+              {
+                event: DefaultEvents.SUBMIT,
+                name: incomePlanFormMessage.pre.startIncomePlan,
+                type: 'primary',
+              },
+            ],
+          }),
+          dataProviders: [
+            buildDataProviderItem({
+              provider: UserProfileApi,
+              title: socialInsuranceAdministrationMessage.pre.contactInfoTitle,
+              subTitle: incomePlanFormMessage.pre.contactInfoDescription,
+            }),
+            buildDataProviderItem({
+              id: 'sia.data',
+              title:
+                socialInsuranceAdministrationMessage.pre
+                  .socialInsuranceAdministrationInformationTitle,
+              subTitle: incomePlanFormMessage.pre.incomePlanDataDescription,
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationCategorizedIncomeTypesApi,
+              title: '',
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationCurrenciesApi,
+              title: '',
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationWithholdingTaxApi,
+              title: '',
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationLatestIncomePlan,
+              title: '',
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationIsApplicantEligibleApi,
+              title: '',
+            }),
+            buildDataProviderItem({
+              provider: SocialInsuranceAdministrationIncomePlanConditionsApi,
+              title: '',
+            }),
+            buildDataProviderItem({
+              id: 'sia.privacy',
+              title:
+                socialInsuranceAdministrationMessage.pre
+                  .socialInsuranceAdministrationPrivacyTitle,
+              subTitle:
+                socialInsuranceAdministrationMessage.pre
+                  .socialInsuranceAdministrationPrivacyDescription,
+            }),
+          ],
+        }),
+        buildMultiField({
+          id: 'isNotEligible',
+          title: incomePlanFormMessage.pre.isNotEligibleTitle,
+          condition: (_, externalData) => {
+            // Show if applicant is not eligible
+            return !isEligible(externalData)
+          },
+          children: [
+            buildDescriptionField({
+              id: 'isNotEligible10Days',
+              title: '',
+              description: (application: Application) =>
+                eligibleText(application.externalData),
+            }),
+            // Empty submit field to hide all buttons in the footer
+            buildSubmitField({
+              id: '',
+              title: '',
+              actions: [],
+            }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/graphql/queries.ts b/libs/application/templates/social-insurance-administration/income-plan/src/graphql/queries.ts
new file mode 100644
index 000000000000..c9ef0ed3f26e
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/graphql/queries.ts
@@ -0,0 +1,30 @@
+import gql from 'graphql-tag'
+
+export const TemporaryCalculationQuery = gql`
+  query TemporaryCalculation(
+    $input: SocialInsuranceTemporaryCalculationInput!
+  ) {
+    getTemporaryCalculations(input: $input) {
+      totalPayment
+      subtracted
+      paidOut
+      groups {
+        group
+        groupId
+        total
+        monthTotals {
+          month
+          amount
+        }
+        rows {
+          name
+          total
+          months {
+            month
+            amount
+          }
+        }
+      }
+    }
+  }
+`
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/index.ts b/libs/application/templates/social-insurance-administration/income-plan/src/index.ts
new file mode 100644
index 000000000000..d9faff89c084
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/index.ts
@@ -0,0 +1,10 @@
+import template from './lib/IncomePlanTemplate'
+
+export const getDataProviders = () => import('./dataProviders/')
+export const getFields = () => import('./fields')
+
+export default template
+
+export * from './lib/incomePlanUtils'
+export * from './lib/messages'
+export * from './lib/constants'
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.spec.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.spec.ts
new file mode 100644
index 000000000000..5c0a071ff1d3
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.spec.ts
@@ -0,0 +1,374 @@
+import { ApplicationTemplateHelper } from '@island.is/application/core'
+import {
+  Application,
+  ApplicationStatus,
+  ApplicationTypes,
+  DefaultEvents,
+  ExternalData,
+  FormValue,
+} from '@island.is/application/types'
+import IncomePlanTemplate from './IncomePlanTemplate'
+import { RatioType, YES } from './constants'
+
+const buildApplication = (data: {
+  answers?: FormValue
+  externalData?: ExternalData
+  state?: string
+}): Application => {
+  const { answers = {}, externalData = {}, state = 'draft' } = data
+
+  return {
+    id: '12345',
+    assignees: [],
+    applicant: '1234567890',
+    typeId: ApplicationTypes.INCOME_PLAN,
+    created: new Date(),
+    modified: new Date(),
+    applicantActors: [],
+    answers,
+    state,
+    externalData,
+    status: ApplicationStatus.IN_PROGRESS,
+  }
+}
+
+describe('Income Plan Template', () => {
+  describe('state transitions', () => {
+    it('should transition from draft to tryggingastofnunSubmitted on submit', () => {
+      const helper = new ApplicationTemplateHelper(
+        buildApplication({
+          answers: {
+            confirmCorrectInfo: true,
+          },
+        }),
+        IncomePlanTemplate,
+      )
+      const [hasChanged, newState] = helper.changeState({
+        type: DefaultEvents.SUBMIT,
+      })
+      expect(hasChanged).toBe(true)
+      expect(newState).toBe('tryggingastofnunSubmitted')
+    })
+  })
+
+  describe('state transitions', () => {
+    it('should transition from draft to tryggingastofnunSubmitted on abort', () => {
+      const helper = new ApplicationTemplateHelper(
+        buildApplication({
+          answers: {
+            confirmCorrectInfo: true,
+          },
+        }),
+        IncomePlanTemplate,
+      )
+      const [hasChanged, newState] = helper.changeState({
+        type: DefaultEvents.ABORT,
+      })
+      expect(hasChanged).toBe(true)
+      expect(newState).toBe('tryggingastofnunSubmitted')
+    })
+  })
+
+  describe('state transitions', () => {
+    it('should transition from tryggingastofnunSubmitted to draft on edit', () => {
+      const helper = new ApplicationTemplateHelper(
+        buildApplication({
+          state: 'tryggingastofnunSubmitted',
+        }),
+        IncomePlanTemplate,
+      )
+
+      const [hasChanged, newState] = helper.changeState({
+        type: DefaultEvents.EDIT,
+      })
+      expect(hasChanged).toBe(true)
+      expect(newState).toBe('draft')
+    })
+  })
+
+  describe('Income plan table', () => {
+    describe('equalForeignIncomePerMonth', () => {
+      it('should unset equalForeignIncomePerMonth if income is MONTHLY and unevenIncomePerYear is YES', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.MONTHLY,
+                  currency: 'ZAR',
+                  january: '100',
+                  february: '100',
+                  march: '100',
+                  november: '100',
+                  incomeType: 'Laun',
+                  incomePerYear: '400',
+                  incomeCategory: 'Atvinnutekjur',
+                  unevenIncomePerYear: [YES],
+                  equalForeignIncomePerMonth: '999',
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.MONTHLY,
+              currency: 'ZAR',
+              january: '100',
+              february: '100',
+              march: '100',
+              november: '100',
+              incomeType: 'Laun',
+              incomePerYear: '400',
+              incomeCategory: 'Atvinnutekjur',
+              unevenIncomePerYear: [YES],
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+      it('should unset equalForeignIncomePerMonth if income is YEARLY', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.YEARLY,
+                  currency: 'ZAR',
+                  incomeType: 'Laun',
+                  incomePerYear: '400',
+                  incomeCategory: 'Atvinnutekjur',
+                  equalForeignIncomePerMonth: '999',
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.YEARLY,
+              currency: 'ZAR',
+              incomeType: 'Laun',
+              incomePerYear: '400',
+              incomeCategory: 'Atvinnutekjur',
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+    })
+
+    describe('equalIncomePerMonth', () => {
+      it('should unset equalIncomePerMonth if income is MONTHLY and unevenIncomePerYear is YES', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.MONTHLY,
+                  currency: 'IKR',
+                  january: '100',
+                  february: '100',
+                  march: '100',
+                  november: '100',
+                  incomeType: 'Laun',
+                  incomePerYear: '400',
+                  incomeCategory: 'Atvinnutekjur',
+                  unevenIncomePerYear: [YES],
+                  equalIncomePerMonth: '999',
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.MONTHLY,
+              currency: 'IKR',
+              january: '100',
+              february: '100',
+              march: '100',
+              november: '100',
+              incomeType: 'Laun',
+              incomePerYear: '400',
+              incomeCategory: 'Atvinnutekjur',
+              unevenIncomePerYear: [YES],
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+      it('should unset equalIncomePerMonth if income is YEARLY', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.YEARLY,
+                  currency: 'IKR',
+                  incomeType: 'Laun',
+                  incomePerYear: '400',
+                  incomeCategory: 'Atvinnutekjur',
+                  equalIncomePerMonth: '999',
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.YEARLY,
+              currency: 'IKR',
+              incomeType: 'Laun',
+              incomePerYear: '400',
+              incomeCategory: 'Atvinnutekjur',
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+    })
+
+    describe('months and unevenIncomePerYear', () => {
+      it('should unset months and unevenIncomePerYear if income is YEARLY', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.YEARLY,
+                  january: '999',
+                  february: '999',
+                  march: '999',
+                  april: '999',
+                  may: '999',
+                  june: '999',
+                  july: '999',
+                  august: '999',
+                  september: '999',
+                  october: '999',
+                  november: '999',
+                  december: '999',
+                  currency: 'IKR',
+                  incomeType: 'Laun',
+                  incomePerYear: '1000000',
+                  incomeCategory: 'Atvinnutekjur',
+                  equalIncomePerMonth: '999',
+                  unevenIncomePerYear: [YES],
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.YEARLY,
+              currency: 'IKR',
+              incomeType: 'Laun',
+              incomePerYear: '1000000',
+              incomeCategory: 'Atvinnutekjur',
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+      it('should unset months and unevenIncomePerYear if incomeCategory is not INCOME', () => {
+        const helper = new ApplicationTemplateHelper(
+          buildApplication({
+            answers: {
+              incomePlanTable: [
+                {
+                  income: RatioType.MONTHLY,
+                  january: '999',
+                  february: '999',
+                  march: '999',
+                  april: '999',
+                  may: '999',
+                  june: '999',
+                  july: '999',
+                  august: '999',
+                  september: '999',
+                  october: '999',
+                  november: '999',
+                  december: '999',
+                  currency: 'IKR',
+                  incomeType: 'Skattskyldar tekjur (óskilgreint)',
+                  incomePerYear: '1000000',
+                  incomeCategory: 'Aðrar tekjur',
+                  equalIncomePerMonth: '999',
+                  unevenIncomePerYear: [YES],
+                },
+              ],
+            },
+          }),
+          IncomePlanTemplate,
+        )
+
+        const answer = {
+          incomePlanTable: [
+            {
+              income: RatioType.MONTHLY,
+              currency: 'IKR',
+              incomeType: 'Skattskyldar tekjur (óskilgreint)',
+              incomePerYear: '1000000',
+              incomeCategory: 'Aðrar tekjur',
+              equalIncomePerMonth: '999',
+            },
+          ],
+        }
+
+        const [hasChanged, _, newApplication] = helper.changeState({
+          type: DefaultEvents.SUBMIT,
+        })
+
+        expect(hasChanged).toBe(true)
+        expect(newApplication.answers).toEqual(answer)
+      })
+    })
+  })
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts
new file mode 100644
index 000000000000..6d198db30f5d
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts
@@ -0,0 +1,452 @@
+import {
+  DefaultStateLifeCycle,
+  EphemeralStateLifeCycle,
+  pruneAfterDays,
+} from '@island.is/application/core'
+import {
+  Actions,
+  Events,
+  Roles,
+  States,
+} from '@island.is/application/templates/social-insurance-administration-core/lib/constants'
+import {
+  statesMessages as coreSIAStatesMessages,
+  socialInsuranceAdministrationMessage,
+} from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
+import {
+  Application,
+  ApplicationConfigurations,
+  ApplicationContext,
+  ApplicationRole,
+  ApplicationStateSchema,
+  ApplicationTemplate,
+  ApplicationTypes,
+  DefaultEvents,
+  UserProfileApi,
+  defineTemplateApi,
+} from '@island.is/application/types'
+import { Features } from '@island.is/feature-flags'
+import set from 'lodash/set'
+import unset from 'lodash/unset'
+import { assign } from 'xstate'
+import {
+  SocialInsuranceAdministrationCategorizedIncomeTypesApi,
+  SocialInsuranceAdministrationCurrenciesApi,
+  SocialInsuranceAdministrationIncomePlanConditionsApi,
+  SocialInsuranceAdministrationIsApplicantEligibleApi,
+  SocialInsuranceAdministrationLatestIncomePlan,
+  SocialInsuranceAdministrationWithholdingTaxApi,
+} from '../dataProviders'
+import { INCOME, ISK, RatioType, YES } from './constants'
+import { dataSchema } from './dataSchema'
+import {
+  getApplicationAnswers,
+  getApplicationExternalData,
+  isEligible,
+} from './incomePlanUtils'
+import {
+  historyMessages,
+  incomePlanFormMessage,
+  statesMessages,
+} from './messages'
+
+const IncomePlanTemplate: ApplicationTemplate<
+  ApplicationContext,
+  ApplicationStateSchema<Events>,
+  Events
+> = {
+  type: ApplicationTypes.INCOME_PLAN,
+  name: incomePlanFormMessage.shared.applicationTitle,
+  institution: socialInsuranceAdministrationMessage.shared.institution,
+  featureFlag: Features.IncomePlanEnabled,
+  translationNamespaces: ApplicationConfigurations.IncomePlan.translation,
+  dataSchema,
+  newApplicationButtonLabel: historyMessages.newIncomePlanButtonLabel,
+  applicationText: historyMessages.incomePlanPageTitle,
+  stateMachineConfig: {
+    initial: States.PREREQUISITES,
+    states: {
+      [States.PREREQUISITES]: {
+        exit: ['populateIncomeTable'],
+        meta: {
+          name: States.PREREQUISITES,
+          status: 'draft',
+          actionCard: {
+            historyLogs: [
+              {
+                logMessage: historyMessages.incomePlanStarted,
+                onEvent: DefaultEvents.SUBMIT,
+              },
+            ],
+          },
+          lifecycle: EphemeralStateLifeCycle,
+          roles: [
+            {
+              id: Roles.APPLICANT,
+              formLoader: () =>
+                import('../forms/Prerequisites').then((val) =>
+                  Promise.resolve(val.PrerequisitesForm),
+                ),
+              actions: [
+                {
+                  event: DefaultEvents.SUBMIT,
+                  name: statesMessages.externalDataSubmitButton,
+                  type: 'primary',
+                },
+              ],
+              write: 'all',
+              api: [
+                UserProfileApi.configure({
+                  params: {
+                    validateEmail: true,
+                  },
+                }),
+                SocialInsuranceAdministrationCategorizedIncomeTypesApi,
+                SocialInsuranceAdministrationCurrenciesApi,
+                SocialInsuranceAdministrationWithholdingTaxApi,
+                SocialInsuranceAdministrationLatestIncomePlan,
+                SocialInsuranceAdministrationIsApplicantEligibleApi,
+                SocialInsuranceAdministrationIncomePlanConditionsApi,
+              ],
+              delete: true,
+            },
+          ],
+        },
+        on: {
+          SUBMIT: [
+            {
+              target: States.DRAFT,
+              cond: (application) =>
+                isEligible(application?.application?.externalData),
+            },
+            {
+              actions: 'setApproveExternalData',
+            },
+          ],
+        },
+      },
+      [States.DRAFT]: {
+        exit: ['unsetIncomePlan'],
+        meta: {
+          name: States.DRAFT,
+          status: 'draft',
+          lifecycle: DefaultStateLifeCycle,
+          actionCard: {
+            tag: {
+              label: coreSIAStatesMessages.inProgressTag,
+            },
+            historyLogs: {
+              onEvent: DefaultEvents.SUBMIT,
+              logMessage: historyMessages.incomePlanSent,
+            },
+            historyButton: statesMessages.pendingActionButton,
+          },
+          onExit: defineTemplateApi({
+            action: Actions.SEND_APPLICATION,
+            namespace: 'SocialInsuranceAdministration',
+            triggerEvent: DefaultEvents.SUBMIT,
+            throwOnError: true,
+          }),
+          roles: [
+            {
+              id: Roles.APPLICANT,
+              formLoader: () =>
+                import('../forms/IncomePlanForm').then((val) =>
+                  Promise.resolve(val.IncomePlanForm),
+                ),
+              actions: [
+                {
+                  event: DefaultEvents.SUBMIT,
+                  name: 'Submit',
+                  type: 'primary',
+                },
+              ],
+              write: 'all',
+              delete: true,
+            },
+          ],
+        },
+        on: {
+          SUBMIT: [{ target: States.TRYGGINGASTOFNUN_SUBMITTED }],
+          [DefaultEvents.ABORT]: { target: States.TRYGGINGASTOFNUN_SUBMITTED },
+        },
+      },
+      [States.TRYGGINGASTOFNUN_SUBMITTED]: {
+        meta: {
+          name: States.TRYGGINGASTOFNUN_SUBMITTED,
+          status: 'inprogress',
+          lifecycle: pruneAfterDays(365),
+          actionCard: {
+            tag: {
+              label: coreSIAStatesMessages.pendingTag,
+            },
+            pendingAction: {
+              title: statesMessages.tryggingastofnunSubmittedTitle,
+              content: statesMessages.tryggingastofnunSubmittedContent,
+              displayStatus: 'info',
+              button: statesMessages.pendingActionButton,
+            },
+            historyLogs: [
+              {
+                onEvent: DefaultEvents.EDIT,
+                logMessage: statesMessages.incomePlanEdited,
+              },
+            ],
+          },
+          roles: [
+            {
+              id: Roles.APPLICANT,
+              formLoader: () =>
+                import('../forms/InReview').then((val) =>
+                  Promise.resolve(val.InReview),
+                ),
+              actions: [
+                {
+                  event: DefaultEvents.EDIT,
+                  name: incomePlanFormMessage.confirm.buttonEdit,
+                  type: 'primary',
+                },
+              ],
+              read: 'all',
+              write: 'all',
+            },
+            {
+              id: Roles.ORGANIZATION_REVIEWER,
+              formLoader: () =>
+                import('../forms/InReview').then((val) =>
+                  Promise.resolve(val.InReview),
+                ),
+              write: 'all',
+            },
+          ],
+        },
+        on: {
+          [DefaultEvents.EDIT]: { target: States.DRAFT },
+          INREVIEW: {
+            target: States.TRYGGINGASTOFNUN_IN_REVIEW,
+          },
+        },
+      },
+      [States.TRYGGINGASTOFNUN_IN_REVIEW]: {
+        meta: {
+          name: States.TRYGGINGASTOFNUN_IN_REVIEW,
+          status: 'inprogress',
+          lifecycle: pruneAfterDays(365),
+          actionCard: {
+            pendingAction: {
+              title: statesMessages.tryggingastofnunInReviewTitle,
+              content: statesMessages.tryggingastofnunInReviewContent,
+              displayStatus: 'info',
+            },
+          },
+          roles: [
+            {
+              id: Roles.APPLICANT,
+              formLoader: () =>
+                import('../forms/InReview').then((val) =>
+                  Promise.resolve(val.InReview),
+                ),
+              read: 'all',
+            },
+            {
+              id: Roles.ORGANIZATION_REVIEWER,
+              formLoader: () =>
+                import('../forms/InReview').then((val) =>
+                  Promise.resolve(val.InReview),
+                ),
+              write: 'all',
+            },
+          ],
+        },
+        on: {
+          [DefaultEvents.APPROVE]: { target: States.COMPLETED },
+        },
+      },
+      [States.COMPLETED]: {
+        meta: {
+          name: States.COMPLETED,
+          status: 'completed',
+          lifecycle: DefaultStateLifeCycle,
+          actionCard: {
+            pendingAction: {
+              title: statesMessages.incomePlanProcessed,
+              content: statesMessages.incomePlanProcessedDescription,
+              displayStatus: 'success',
+            },
+          },
+          roles: [
+            {
+              id: Roles.APPLICANT,
+              formLoader: () =>
+                import('../forms/InReview').then((val) =>
+                  Promise.resolve(val.InReview),
+                ),
+              read: 'all',
+            },
+          ],
+        },
+      },
+    },
+  },
+  stateMachineOptions: {
+    actions: {
+      populateIncomeTable: assign((context) => {
+        const { application } = context
+        const { answers } = application
+        const { withholdingTax, latestIncomePlan } = getApplicationExternalData(
+          application.externalData,
+        )
+
+        if (latestIncomePlan && latestIncomePlan.status === 'Accepted') {
+          latestIncomePlan.incomeTypeLines.forEach((income, i) => {
+            set(
+              answers,
+              `incomePlanTable[${i}].incomeType`,
+              income.incomeTypeName,
+            )
+            set(
+              answers,
+              `incomePlanTable[${i}].incomePerYear`,
+              String(income.totalSum),
+            )
+            set(answers, `incomePlanTable[${i}].currency`, income.currency)
+            set(answers, `incomePlanTable[${i}].income`, RatioType.YEARLY)
+            set(
+              answers,
+              `incomePlanTable[${i}].incomeCategory`,
+              income.incomeCategoryName,
+            )
+          })
+        } else {
+          withholdingTax &&
+            withholdingTax.incomeTypes?.forEach((income, i) => {
+              set(
+                answers,
+                `incomePlanTable[${i}].incomeType`,
+                income.incomeTypeName,
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].incomePerYear`,
+                String(income.total),
+              )
+              set(answers, `incomePlanTable[${i}].currency`, ISK)
+              set(answers, `incomePlanTable[${i}].income`, RatioType.YEARLY)
+              set(
+                answers,
+                `incomePlanTable[${i}].incomeCategory`,
+                income.categoryName,
+              )
+
+              set(
+                answers,
+                `incomePlanTable[${i}].january`,
+                String(income.january),
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].february`,
+                String(income.february),
+              )
+              set(answers, `incomePlanTable[${i}].march`, String(income.march))
+              set(answers, `incomePlanTable[${i}].april`, String(income.april))
+              set(answers, `incomePlanTable[${i}].may`, String(income.may))
+              set(answers, `incomePlanTable[${i}].june`, String(income.june))
+              set(answers, `incomePlanTable[${i}].july`, String(income.july))
+              set(
+                answers,
+                `incomePlanTable[${i}].august`,
+                String(income.august),
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].september`,
+                String(income.september),
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].october`,
+                String(income.october),
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].november`,
+                String(income.november),
+              )
+              set(
+                answers,
+                `incomePlanTable[${i}].december`,
+                String(income.december),
+              )
+            })
+        }
+
+        return context
+      }),
+      unsetIncomePlan: assign((context) => {
+        const { application } = context
+        const { answers } = application
+        const { incomePlan } = getApplicationAnswers(answers)
+
+        incomePlan.forEach((income, index) => {
+          if (
+            (income.income === RatioType.MONTHLY &&
+              income.incomeCategory === INCOME &&
+              income.unevenIncomePerYear?.[0] === YES) ||
+            income.income === RatioType.YEARLY
+          ) {
+            unset(
+              application.answers,
+              `incomePlanTable[${index}].equalIncomePerMonth`,
+            )
+            unset(
+              application.answers,
+              `incomePlanTable[${index}].equalForeignIncomePerMonth`,
+            )
+          }
+          if (
+            (income.income === RatioType.MONTHLY &&
+              income.unevenIncomePerYear?.[0] !== YES) ||
+            income.income === RatioType.YEARLY ||
+            income.incomeCategory !== INCOME
+          ) {
+            unset(application.answers, `incomePlanTable[${index}].january`)
+            unset(application.answers, `incomePlanTable[${index}].february`)
+            unset(application.answers, `incomePlanTable[${index}].march`)
+            unset(application.answers, `incomePlanTable[${index}].april`)
+            unset(application.answers, `incomePlanTable[${index}].may`)
+            unset(application.answers, `incomePlanTable[${index}].june`)
+            unset(application.answers, `incomePlanTable[${index}].july`)
+            unset(application.answers, `incomePlanTable[${index}].august`)
+            unset(application.answers, `incomePlanTable[${index}].september`)
+            unset(application.answers, `incomePlanTable[${index}].october`)
+            unset(application.answers, `incomePlanTable[${index}].november`)
+            unset(application.answers, `incomePlanTable[${index}].december`)
+          }
+          if (
+            income.income === RatioType.YEARLY ||
+            income.incomeCategory !== INCOME
+          ) {
+            unset(
+              application.answers,
+              `incomePlanTable[${index}].unevenIncomePerYear`,
+            )
+          }
+        })
+
+        return context
+      }),
+    },
+  },
+  mapUserToRole(
+    id: string,
+    application: Application,
+  ): ApplicationRole | undefined {
+    if (id === application.applicant) {
+      return Roles.APPLICANT
+    }
+    return undefined
+  },
+}
+
+export default IncomePlanTemplate
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/constants.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/constants.ts
new file mode 100644
index 000000000000..3759a2d13ec5
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/constants.ts
@@ -0,0 +1,11 @@
+export const YES = 'yes'
+export const NO = 'no'
+export const FOREIGN_BASIC_PENSION = 'Erlendur grunnlífeyrir'
+export const ISK = 'IKR'
+export const INCOME = 'Atvinnutekjur'
+export const INCOME_PLANS_CLOSED = 'INCOME_PLANS_CLOSED'
+
+export enum RatioType {
+  YEARLY = 'yearly',
+  MONTHLY = 'monthly',
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/dataSchema.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/dataSchema.ts
new file mode 100644
index 000000000000..bf20588b6047
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/dataSchema.ts
@@ -0,0 +1,114 @@
+import { z } from 'zod'
+import { INCOME, ISK, RatioType, YES } from './constants'
+import { errorMessages } from './messages'
+
+export const dataSchema = z.object({
+  approveExternalData: z.boolean().refine((v) => v),
+  incomePlanTable: z
+    .array(
+      z
+        .object({
+          incomeCategory: z.string(),
+          incomeType: z.string().min(1),
+          income: z.enum([RatioType.YEARLY, RatioType.MONTHLY]),
+          incomePerYear: z.string().optional(),
+          equalIncomePerMonth: z.string().optional(),
+          equalForeignIncomePerMonth: z.string().optional(),
+          currency: z.string().min(1),
+          unevenIncomePerYear: z.array(z.enum([YES]).optional()).optional(),
+          january: z.string().optional(),
+          february: z.string().optional(),
+          march: z.string().optional(),
+          april: z.string().optional(),
+          may: z.string().optional(),
+          june: z.string().optional(),
+          july: z.string().optional(),
+          august: z.string().optional(),
+          september: z.string().optional(),
+          october: z.string().optional(),
+          november: z.string().optional(),
+          december: z.string().optional(),
+        })
+        .refine(
+          ({ income, incomePerYear }) =>
+            income === RatioType.YEARLY ? !!incomePerYear : true,
+          {
+            path: ['incomePerYear'],
+          },
+        )
+        .refine(
+          ({
+            income,
+            currency,
+            equalIncomePerMonth,
+            unevenIncomePerYear,
+            incomeCategory,
+          }) => {
+            const unevenAndEmploymentIncome =
+              unevenIncomePerYear?.[0] !== YES ||
+              (incomeCategory !== INCOME && unevenIncomePerYear?.[0] === YES)
+
+            return income === RatioType.MONTHLY &&
+              currency === ISK &&
+              unevenAndEmploymentIncome
+              ? !!equalIncomePerMonth
+              : true
+          },
+          {
+            path: ['equalIncomePerMonth'],
+          },
+        )
+        .refine(
+          ({
+            income,
+            currency,
+            equalForeignIncomePerMonth,
+            unevenIncomePerYear,
+            incomeCategory,
+          }) => {
+            const unevenAndEmploymentIncome =
+              unevenIncomePerYear?.[0] !== YES ||
+              (incomeCategory !== INCOME && unevenIncomePerYear?.[0] === YES)
+
+            return income === RatioType.MONTHLY &&
+              currency !== ISK &&
+              unevenAndEmploymentIncome
+              ? !!equalForeignIncomePerMonth
+              : true
+          },
+          {
+            path: ['equalForeignIncomePerMonth'],
+          },
+        )
+        .refine(
+          (incomePlanTable) =>
+            incomePlanTable.income === RatioType.MONTHLY &&
+            incomePlanTable?.incomeCategory === INCOME &&
+            incomePlanTable.unevenIncomePerYear?.[0] === YES
+              ? ![
+                  incomePlanTable.january,
+                  incomePlanTable.february,
+                  incomePlanTable.march,
+                  incomePlanTable.april,
+                  incomePlanTable.may,
+                  incomePlanTable.june,
+                  incomePlanTable.july,
+                  incomePlanTable.august,
+                  incomePlanTable.september,
+                  incomePlanTable.october,
+                  incomePlanTable.november,
+                  incomePlanTable.december,
+                ].every((value) => value === undefined || value === '')
+              : true,
+          {
+            path: ['incomePerYear'],
+            params: errorMessages.monthsRequired,
+          },
+        ),
+    )
+    .refine((i) => i === undefined || i.length > 0, {
+      params: errorMessages.incomePlanRequired,
+    }),
+})
+
+export type SchemaFormValues = z.infer<typeof dataSchema>
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.spec.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.spec.ts
new file mode 100644
index 000000000000..593d3df51ead
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.spec.ts
@@ -0,0 +1,132 @@
+import {
+  Application,
+  ApplicationStatus,
+  ApplicationTypes,
+  ExternalData,
+  FormValue,
+} from '@island.is/application/types'
+import {
+  getApplicationExternalData,
+  getCategoriesOptions,
+  getOneInstanceOfCategory,
+  getTypesOptions,
+} from './incomePlanUtils'
+
+const buildApplication = (data?: {
+  answers?: FormValue
+  externalData?: ExternalData
+  state?: string
+}): Application => {
+  const { answers = {}, externalData = {}, state = 'draft' } = data ?? {}
+
+  return {
+    id: '12345',
+    assignees: [],
+    applicant: '1234567890',
+    typeId: ApplicationTypes.INCOME_PLAN,
+    created: new Date(),
+    modified: new Date(),
+    applicantActors: [],
+    answers,
+    state,
+    externalData,
+    status: ApplicationStatus.IN_PROGRESS,
+  }
+}
+
+describe('getCategoriesOptions', () => {
+  it('should return income type categories', () => {
+    const application = buildApplication({
+      externalData: {
+        socialInsuranceAdministrationCategorizedIncomeTypes: {
+          data: [
+            {
+              categoryNumber: 1,
+              categoryName: 'Atvinnutekjur',
+              categoryCode: 'ATV01',
+              incomeTypeNumber: 101,
+              incomeTypeName: 'Laun',
+              incomeTypeCode: 'IPC01',
+            },
+            {
+              categoryNumber: 2,
+              categoryName: 'Fjármagnstekjur',
+              categoryCode: 'FJT01',
+              incomeTypeNumber: 201,
+              incomeTypeName: 'Atvinnuleysisbætur',
+              incomeTypeCode: 'IPC02',
+            },
+          ],
+          date: new Date(),
+          status: 'success',
+        },
+      },
+    })
+    const { categorizedIncomeTypes } = getApplicationExternalData(
+      application.externalData,
+    )
+
+    const categories = getOneInstanceOfCategory(categorizedIncomeTypes)
+
+    const res = getCategoriesOptions(application.externalData)
+
+    const expected =
+      categories &&
+      categories.map((item) => {
+        return {
+          value: item.categoryName || '',
+          label: item.categoryName || '',
+        }
+      })
+
+    expect(res).toEqual(expected)
+  })
+})
+
+describe('getTypesOptions', () => {
+  it('should return income type', () => {
+    const application = buildApplication({
+      externalData: {
+        socialInsuranceAdministrationCategorizedIncomeTypes: {
+          data: [
+            {
+              categoryNumber: 1,
+              categoryName: 'Atvinnutekjur',
+              categoryCode: 'ATV01',
+              incomeTypeNumber: 101,
+              incomeTypeName: 'Laun',
+              incomeTypeCode: 'IPC01',
+            },
+            {
+              categoryNumber: 2,
+              categoryName: 'Fjármagnstekjur',
+              categoryCode: 'FJT01',
+              incomeTypeNumber: 201,
+              incomeTypeName: 'Atvinnuleysisbætur',
+              incomeTypeCode: 'IPC02',
+            },
+          ],
+          date: new Date(),
+          status: 'success',
+        },
+      },
+    })
+    const categoryName = 'Atvinnutekjur'
+
+    const { categorizedIncomeTypes } = getApplicationExternalData(
+      application.externalData,
+    )
+
+    const res = getTypesOptions(application.externalData, categoryName)
+    const expected = categorizedIncomeTypes
+      .filter((item) => item.categoryName === categoryName)
+      .map((item) => {
+        return {
+          value: item.incomeTypeName || '',
+          label: item.incomeTypeName || '',
+        }
+      })
+
+    expect(res).toEqual(expected)
+  })
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.ts
new file mode 100644
index 000000000000..a9a021aea627
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/incomePlanUtils.ts
@@ -0,0 +1,140 @@
+import { getValueViaPath } from '@island.is/application/core'
+import { Application, ExternalData } from '@island.is/application/types'
+import {
+  CategorizedIncomeTypes,
+  Eligible,
+  IncomePlanConditions,
+  IncomePlanRow,
+  LatestIncomePlan,
+  WithholdingTax,
+} from '../types'
+import { INCOME_PLANS_CLOSED } from './constants'
+import { incomePlanFormMessage } from './messages'
+
+export const getApplicationExternalData = (
+  externalData: Application['externalData'],
+) => {
+  const categorizedIncomeTypes = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationCategorizedIncomeTypes.data',
+    [],
+  ) as CategorizedIncomeTypes[]
+
+  const currencies = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationCurrencies.data',
+  ) as Array<string>
+
+  const withholdingTax = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationWithholdingTax.data',
+  ) as WithholdingTax
+
+  const latestIncomePlan = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationLatestIncomePlan.data',
+  ) as LatestIncomePlan
+
+  const temporaryCalculation = getValueViaPath(
+    externalData,
+    'SocialInsuranceAdministrationTemporaryCalculation.data',
+  )
+
+  const isEligible = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationIsApplicantEligible.data',
+  ) as Eligible
+
+  const userProfileEmail = getValueViaPath(
+    externalData,
+    'userProfile.data.email',
+  ) as string
+
+  const userProfilePhoneNumber = getValueViaPath(
+    externalData,
+    'userProfile.data.mobilePhoneNumber',
+  ) as string
+
+  const incomePlanConditions = getValueViaPath(
+    externalData,
+    'socialInsuranceAdministrationIncomePlanConditions.data',
+  ) as IncomePlanConditions
+
+  return {
+    categorizedIncomeTypes,
+    currencies,
+    withholdingTax,
+    latestIncomePlan,
+    temporaryCalculation,
+    isEligible,
+    userProfileEmail,
+    userProfilePhoneNumber,
+    incomePlanConditions,
+  }
+}
+
+export const getApplicationAnswers = (answers: Application['answers']) => {
+  const incomePlan = getValueViaPath(
+    answers,
+    'incomePlanTable',
+    [],
+  ) as IncomePlanRow[]
+
+  return { incomePlan }
+}
+
+export const getOneInstanceOfCategory = (
+  categories: CategorizedIncomeTypes[],
+) => {
+  return [
+    ...new Map(
+      categories.map((category) => [category.categoryName, category]),
+    ).values(),
+  ]
+}
+
+export const getCategoriesOptions = (externalData: ExternalData) => {
+  const { categorizedIncomeTypes } = getApplicationExternalData(externalData)
+  const categories = getOneInstanceOfCategory(categorizedIncomeTypes)
+
+  return (
+    categories &&
+    categories.map((item) => {
+      return {
+        value: item.categoryName || '',
+        label: item.categoryName || '',
+      }
+    })
+  )
+}
+
+export const getTypesOptions = (
+  externalData: ExternalData,
+  categoryName: string | undefined,
+) => {
+  const { categorizedIncomeTypes } = getApplicationExternalData(externalData)
+  if (categoryName === undefined) return []
+
+  return categorizedIncomeTypes
+    .filter((item) => item.categoryName === categoryName)
+    .map((item) => {
+      return {
+        value: item.incomeTypeName || '',
+        label: item.incomeTypeName || '',
+      }
+    })
+}
+
+export const isEligible = (externalData: ExternalData): boolean => {
+  const { isEligible } = getApplicationExternalData(externalData)
+
+  return isEligible?.isEligible
+}
+
+export const eligibleText = (externalData: ExternalData) => {
+  const { isEligible } = getApplicationExternalData(externalData)
+
+  return isEligible.reasonCode === INCOME_PLANS_CLOSED
+    ? incomePlanFormMessage.pre.isNotEligibleClosedDescription
+    : incomePlanFormMessage.pre.isNotEligibleDescription
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/messages.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/messages.ts
new file mode 100644
index 000000000000..1fd0c4c269c2
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/messages.ts
@@ -0,0 +1,405 @@
+import { defineMessages, MessageDescriptor } from 'react-intl'
+type MessageDir = Record<string, Record<string, MessageDescriptor>>
+
+export const incomePlanFormMessage: MessageDir = {
+  shared: defineMessages({
+    applicationTitle: {
+      id: 'ip.application:applicationTitle',
+      defaultMessage: 'Tekjuáætlun',
+      description: 'Income Plan',
+    },
+  }),
+
+  pre: defineMessages({
+    formTitle: {
+      id: 'ip.application:form.title',
+      defaultMessage: 'Tekjuáætlun',
+      description: 'Income Plan',
+    },
+    isNotEligibleTitle: {
+      id: 'ip.application:is.not.eligible.title',
+      defaultMessage: 'Ekki er opið fyrir skráningu á tekjuáætlun',
+      description: 'Registration for income plan is not open',
+    },
+    isNotEligibleDescription: {
+      id: 'ip.application:is.not.eligible.description#markdown',
+      defaultMessage:
+        '* Það eru innan við 10 dagar síðan síðasta tekjuáætlun þín var tekin í vinnslu hjá Tryggingastofnun.\n\nEf þú telur það ekki eiga við um þig, vinsamlegast hafið samband við [tr@tr.is](mailto:tr@tr.is)',
+      description:
+        '* It has been less than 10 days since your last income plan was processed by the Social Insurance Administration.\n\nIf you do not think that apply to you, please contact [tr@tr.is](mailto:tr @tr.is)',
+    },
+    isNotEligibleClosedDescription: {
+      id: 'ip.application:is.not.eligible.closed.description#markdown',
+      defaultMessage:
+        '* Tryggingastofnun tekur ekki við nýjum tekjuáætlum eins og er.\n\nEf þú telur það ekki eiga við um þig, vinsamlegast hafið samband við [tr@tr.is](mailto:tr@tr.is)',
+      description:
+        '* The Social Insurance Administration is currently not accepting any new income plans.\n\nIf you do not think that apply to you, please contact [tr@tr.is](mailto:tr @tr.is)',
+    },
+    contactInfoDescription: {
+      id: 'ip.application:prerequisites.contact.info.description',
+      defaultMessage:
+        'Upplýsingar um símanúmer og netfang til að auðvelda ferlið.',
+      description:
+        'Information about your telephone number and email address to facilitate the process.',
+    },
+    incomePlanDataDescription: {
+      id: 'ip.application:prerequisites.socialInsuranceAdministration.data.description',
+      defaultMessage:
+        'Tryggingastofnun sækir nauðsynlegar upplýsingar til úrvinnslu tekjuáætlunar, varðandi tekjur og aðrar ástæður.',
+      description:
+        'The Social Insurance Administration collects necessary information, regarding income and other circumstances, to process the income plan.',
+    },
+    checkboxProvider: {
+      id: 'ip.application:prerequisites.checkbox.provider',
+      defaultMessage:
+        'Ég skil að ofangreindra upplýsinga verður aflað í ferlinu',
+      description:
+        'I understand that the above information will be collected during the process',
+    },
+    startIncomePlan: {
+      id: 'ip.application:prerequisites.start.income.plan',
+      defaultMessage: 'Hefja tekjuáætlun',
+      description: 'Start income plan',
+    },
+  }),
+
+  info: defineMessages({
+    section: {
+      id: 'ip.application:section',
+      defaultMessage: 'Tekjuáætlun',
+      description: 'Income Plan',
+    },
+    instructionsTitle: {
+      id: 'ip.application:instructions.title',
+      defaultMessage: 'Leiðbeiningar um skráningu tekjuáætlunar',
+      description: 'Instructions on filling out your income plan',
+    },
+    instructionsShortTitle: {
+      id: 'ip.application:instructions.short.title',
+      defaultMessage: 'Leiðbeiningar',
+      description: 'Instructions',
+    },
+    instructionsDescription: {
+      id: 'ip.application:instructions.description#markdown',
+      defaultMessage:
+        '\n* Á næstu síðu er að finna tillögu að tekjuáætlun. Þar getur þú breytt upphæðum og bætt við tekjum.\n* Skrá skal heildartekjur fyrir skatt í tekjuáætlun.\n* Fjármagnstekjur eru sameignlegar hjá hjónum og skal skrá heildar fjármagnstekjur hjóna í tekjuáætlun.\n* Ef maki er á lífeyri verða greiðslur hans einnig endurreiknaðar ef fjármagnstekjum er breytt.\n* Heimilt er að skrá atvinnutekjur á þá mánuði sem þeirra er aflað. Reiknast þá þær atvinnutekjur eingöngu í þeim mánuði. Vakin er athygli á að það þarf að haka sérstaklega við þann kost að óska mánaðarskiptingu atvinnutekna í tekjuáætlun.\n* Laun / lífeyrisgreiðslur skal skrá í þeim gjaldmiðli sem þau eru greidd.\n* Það er á ábyrgð lífeyrisþega að tekjuáætlun sé rétt og að nauðsynlegar upplýsingar til að hægt sé að ákvarða réttar greiðslur séu fyrirliggjandi.',
+      description:
+        '\n* On the next page you will find your proposed income plan. There you can edit amounts and add income categories.\n* You must submit your total pre-tax income in your income plan.\n* For couples, their total income must be recorded in the income plan, as their income is considered shared.\n* If a spouse is receiving disability, his or her benefits will also be recalculated if there is a change in income.\n* Income may be recorded in the month in which it is earned. The income is then calculated only for that month. Attention, it is necessary to select the option of requesting a monthly distribution of income in the income plan.\n* Salary / pension payments must be recorded in the currency in which they are paid.\n* It is the responsibility of the pensioner that the income plan is correct and that the necessary information for determining the correct payments is available.',
+    },
+    temporaryCalculationTitle: {
+      id: 'ip.application:temorary.calculation.title',
+      defaultMessage: 'Bráðabirgðaútreikningur',
+      description: 'Temporary calculation',
+    },
+    tableHeaderOne: {
+      id: 'ip.application:table.header.one',
+      defaultMessage: 'Greiðslutegundir',
+      description: 'Payment types',
+    },
+    tableHeaderTwo: {
+      id: 'ip.application:table.header.two',
+      defaultMessage: 'Samtals á mánuði',
+      description: 'Montly total',
+    },
+    tableHeaderThree: {
+      id: 'ip.application:table.header.three',
+      defaultMessage: 'Samtals á ári',
+      description: 'Annual total',
+    },
+    tableDescription: {
+      id: 'ip.application:table.description',
+      defaultMessage:
+        'Bráðabirgðareikningi er ætlað að hjálpa umsækjendum að átta sig á mögulegum greiðslum ef breytingar verða á tekjum þeirra. Of- eða vangreiðslur eru ekki sýndar í þessum bráðabirgðaútreikningi en ef um inneign er að ræða verður hún greidd út á meðan ofgreiddar bætur bíða uppgjörs.',
+      description:
+        'Temporary calculation is intended to help the applicant understand possible payments if their income changes. Overpayments or underpayments are not shown in this temporary calculation, but if there is credit, it will be paid out while the overpayment is pending settlement.',
+    },
+    paidTableHeader: {
+      id: 'ip.application:paid.table.header',
+      defaultMessage: 'Útborgað',
+      description: 'Paid',
+    },
+    assumptions: {
+      id: 'ip.application:assumptions.title#markdown',
+      defaultMessage:
+        'Útreikningur staðgreiðslu miðast við eftirfarandi forsendur: \n* Almenna reglan er sú að greiðslur frá Tryggingastofnun eru settar í lægsta mögulega skattþrep miðað við tekjuáætlun. Hægt er að óska eftir breytingu skattþreps inni á mínum síðum TR. \n* Persónuafsláttur miðast við 100% nýtingu skattkorts',
+      description:
+        'Calculations of tax payments are based on the following assumptions: \n*Transl',
+    },
+    noPayments: {
+      id: 'ip.application:no.payments',
+      defaultMessage: 'Engar greiðslur samkvæmt bráðabirgðaútreikningi.',
+      description: 'No payments according to temporary calculation.',
+    },
+    noAvailablePrerequisites: {
+      id: 'ip.application:no.available.prerequisites',
+      defaultMessage:
+        'Engar forsendur eru til staðar til að birta bráðabirgðaútreikning fyrir {incomePlanYear}.',
+      description:
+        'There are no available prerequisites for displaying a temporary calculation for {incomePlanYear}.',
+    },
+  }),
+
+  incomePlan: defineMessages({
+    description: {
+      id: 'ip.application:income.plan.description',
+      defaultMessage:
+        'Hér er tillaga að tekjuáætlun fyrir árið {incomePlanYear}. Upplýsingar um launatekjur eru fengnar úr staðgreiðsluskrá og fjármagnstekjur eru sóttar í nýjasta skattframtal. Þú getur breytt upphæðum, fjarlægt tekjur og/eða bætt við tekjum sem ekki er búið að setja inn. Tekjur á ári eru sýndar í þeim gjaldmiðli sem þær voru greiddar í.',
+      description: 'english translation',
+    },
+    currentIncomePlanDescription: {
+      id: 'ip.application:income.plan.current.income.plandescription',
+      defaultMessage:
+        'Hér fyrir neðan er sú tekjuáætlun sem nú er í gildi fyrir árið {incomePlanYear}. Hér getur þú breytt upphæðum, fjarlægt tekjur og/eða bætt við tekjum sem ekki er búið að setja inn.',
+      description: 'english translation',
+    },
+    registerIncome: {
+      id: 'ip.application:register.income',
+      defaultMessage: 'Skráning tekna',
+      description: 'Registration of income',
+    },
+    addIncome: {
+      id: 'ip.application:add.income',
+      defaultMessage: 'Bæta við tekjum',
+      description: 'Add income',
+    },
+    saveIncome: {
+      id: 'ip.application:save.income',
+      defaultMessage: 'Vista nýjar tekjur',
+      description: 'Save new income',
+    },
+    removeIncome: {
+      id: 'ip.application:remove.income',
+      defaultMessage: 'Eyða tekjum',
+      description: 'Remove income',
+    },
+    editIncome: {
+      id: 'ip.application:edit.income',
+      defaultMessage: 'Breyta tekjum',
+      description: 'Edit income',
+    },
+    incomeCategory: {
+      id: 'ip.application:income.category',
+      defaultMessage: 'Tekjuflokkur',
+      description: 'Income category',
+    },
+    selectIncomeCategory: {
+      id: 'ip.application:select.income.category',
+      defaultMessage: 'Veldu tekjuflokk',
+      description: 'Select income category',
+    },
+    incomeType: {
+      id: 'ip.application:income.type',
+      defaultMessage: 'Tekjutegund',
+      description: 'Income type',
+    },
+    selectIncomeType: {
+      id: 'ip.application:select.income.type',
+      defaultMessage: 'Veldu tekjutegund',
+      description: 'Select income type',
+    },
+    annualIncome: {
+      id: 'ip.application:annual.income',
+      defaultMessage: 'Árstekjur',
+      description: 'Annual income',
+    },
+    monthlyIncome: {
+      id: 'ip.application:yearly.income',
+      defaultMessage: 'Mánaðartekjur',
+      description: 'Monthly income',
+    },
+    incomePerYear: {
+      id: 'ip.application:income.per.year',
+      defaultMessage: 'Tekjur á ári',
+      description: 'Income per year',
+    },
+    foreignIncomePerYear: {
+      id: 'ip.application:foreign.income.per.year',
+      defaultMessage: 'Erlendar tekjur á ári',
+      description: 'Foreign income per year',
+    },
+    equalIncomePerMonth: {
+      id: 'ip.application:equal.income.per.month',
+      defaultMessage: 'Jafnar tekjur á mánuði',
+      description: 'Equal income per month',
+    },
+    equalForeignIncomePerMonth: {
+      id: 'ip.application:equal.foreign.income.per.month',
+      defaultMessage: 'Erlendar tekjur á mánuði',
+      description: 'Foreign income per month',
+    },
+    monthlyDistributionOfIncome: {
+      id: 'ip.application:monthly.distribution.of.income',
+      defaultMessage: 'Óska eftir mánaðarskiptingu atvinnutekna',
+      description: 'Request a monthly distribution of employment income',
+    },
+    monthlyDistributionOfIncomeTooltip: {
+      id: 'ip.application:monthly.distribution.of.income.tooltip',
+      defaultMessage:
+        'Atvinnutekjur hafa einungis áhrif á lífeyrisgreiðslur þess mánaðar sem atvinnutekna er aflað.',
+      description:
+        'Income only affects the pension payments for the month in which income is earned.',
+    },
+    currency: {
+      id: 'ip.application:currency',
+      defaultMessage: 'Gjaldmiðill',
+      description: 'Currency',
+    },
+    selectCurrency: {
+      id: 'ip.application:select.currency',
+      defaultMessage: 'Veldu gjaldmiðil',
+      description: 'Select a currency',
+    },
+  }),
+
+  confirm: defineMessages({
+    section: {
+      id: 'ip.application:confirmation.section',
+      defaultMessage: 'Staðfesting',
+      description: 'Confirmation',
+    },
+    title: {
+      id: 'ip.application:confirmation.title',
+      defaultMessage: 'Senda inn tekjuáætlun',
+      description: 'Review and submit',
+    },
+    description: {
+      id: 'ip.application:confirm.description',
+      defaultMessage:
+        'Vinsamlegast farðu yfir tekjuáætlunina áður en þú sendir hana inn.',
+      description: 'Please review the application before submitting.',
+    },
+    buttonEdit: {
+      id: 'ip.application:button.edit',
+      defaultMessage: 'Breyta tekjuáætlun',
+      description: 'Edit application',
+    },
+  }),
+
+  conclusionScreen: defineMessages({
+    receivedTitle: {
+      id: 'ip.application:conclusionScreen.receivedTitle',
+      defaultMessage: 'Tekjuáætlun móttekin',
+      description: 'Income plan received',
+    },
+    alertTitle: {
+      id: 'ip.application:conclusionScreen.alertTitle',
+      defaultMessage: 'Tekjuáætlun hefur verið send til Tryggingastofnunar',
+      description:
+        'An income plan has been sent to the Social Insurance Administration',
+    },
+    bulletList: {
+      id: `ip.application:conclusionScreen.bulletList#markdown`,
+      defaultMessage: `* Tryggingastofnun fer yfir tekjuáætlun og hefur eftirlit með að tekjur séu í samræmi við rauntekjur og getur verið að tekjuáætlun þinni verði breytt á þeim grundvelli. (Lög um almannatryggingar nr. 100/2007)(https://www.althingi.is/altext/lendu/2007100.html) \n* Hægt er að leiðrétta tekjuáætlun hvenær sem er á árinu en þó aðeins hægt að skila inn breyttri tekjuáætlun á 10 daga fresti. Með vandaðri tekjuáætlun er hægt að koma í veg fyrir of- eða vangreiðslur sem þarf að leiðrétta síðar. \n* Greitt er 1. hvers mánaðar samkvæmt gildandi tekjuáætlun. \n* Greiðslur eru endurreiknaðar þegar framtal vegna greiðsluárs liggur fyrir sem tryggir að allir fá réttar greiðslur í samræmi við endanlegar tekjur.`,
+      description: 'BulletList',
+    },
+    bottomButtonMessage: {
+      id: 'ip.application:conclusionScreen.bottom.button.message',
+      defaultMessage:
+        'Á Mínum síðum Ísland.is getur þú nálgast stöðu tekjuáætlunarinnar og þegar hún hefur verið samþykkt er hún aðgengileg undir framfærslu.',
+      description:
+        'Under My Pages at Ísland.is you can see the status of your income plan, and when it has been approved you can view it under subsistence.',
+    },
+  }),
+}
+
+export const inReviewFormMessages = defineMessages({
+  formTitle: {
+    id: 'ip.application:inReview.form.title',
+    defaultMessage: 'Tekjuáætlun',
+    description: 'Income plan',
+  },
+  description: {
+    id: 'ip.application:inReview.description',
+    defaultMessage: 'Tekjuáætlun þín hefur ekki verið tekin til vinnslu.',
+    description: 'Your income plan has not been processed.',
+  },
+})
+
+export const statesMessages = defineMessages({
+  externalDataSubmitButton: {
+    id: 'ip.application:external.data.submit.button',
+    defaultMessage: 'Stofna tekjuáætlun',
+    description: 'Create an income plan',
+  },
+  tryggingastofnunSubmittedTitle: {
+    id: 'ip.application:tryggingastofnunSubmittedTitle',
+    defaultMessage: 'Tekjuáætlun hefur verið send til Tryggingastofnunnar',
+    description:
+      'Income plan has been sent to the Social Insurance Administration',
+  },
+  tryggingastofnunSubmittedContent: {
+    id: 'ip.application:tryggingastofnunSubmittedContent',
+    defaultMessage:
+      'Tekjuáætlunin þín er í bið eftir yfirferð. Hægt er að breyta tekjuáætlun þar til hún er komin í yfirferð.',
+    description:
+      'Your income plan is awaiting review. It is possible to edit the income plan until it is under review.',
+  },
+  incomePlanEdited: {
+    id: 'ip.application:incomePlanEdited',
+    defaultMessage: 'Tekjuáætlun breytt',
+    description: 'Income plan edited',
+  },
+  pendingActionButton: {
+    id: 'ip.application:pending.action.button',
+    defaultMessage: 'Opna tekjuáætlun',
+    description: 'Open income plan',
+  },
+  tryggingastofnunInReviewTitle: {
+    id: 'ip.application:tryggingastofnun.in.review.title',
+    defaultMessage: 'Verið er að fara yfir tekjuáætlunina',
+    description: 'The income plan is being reviewed',
+  },
+  tryggingastofnunInReviewContent: {
+    id: 'ip.application:tryggingastofnun.in.review.content',
+    defaultMessage:
+      'Tryggingastofnun fer nú yfir tekjuáætlunina og því getur þetta tekið nokkra daga',
+    description:
+      'The Social Insurance Administration is currently reviewing the income plan, this may take a few days',
+  },
+  incomePlanProcessed: {
+    id: 'ip.application:income.plan.processed',
+    defaultMessage: 'Tryggingastofnun hefur afgreitt tekjuáætlunina',
+    description: 'Tryggingastofnun has processed the income plan',
+  },
+  incomePlanProcessedDescription: {
+    id: 'ip.application:income.plan.processed.description',
+    defaultMessage: 'Tekjuáætlun hefur verið afgreidd',
+    description: 'The income plan has been processed',
+  },
+})
+
+export const historyMessages = defineMessages({
+  incomePlanSent: {
+    id: 'ip.application:history.incomePlanSent',
+    defaultMessage: 'Tekjuáætlun send',
+    description: 'Income plan sent',
+  },
+  incomePlanStarted: {
+    id: 'ip.application:history.incomePlanStarted',
+    defaultMessage: 'Tekjuáætlun hafin',
+    description: 'Income plan started',
+  },
+  newIncomePlanButtonLabel: {
+    id: 'ip.application:newIncomePlan',
+    defaultMessage: 'Ný tekjuáætlun',
+    description: 'New income plan',
+  },
+  incomePlanPageTitle: {
+    id: 'ip.application:yourIncomePlans',
+    defaultMessage: 'Þínar tekjuáætlanir',
+    description: 'Your income plans',
+  },
+})
+
+export const errorMessages = defineMessages({
+  monthsRequired: {
+    id: 'ip.application:error.months.required',
+    defaultMessage: 'Nauðsynlegt er að bæta við tekjum fyrir a.m.k einn mánuð',
+    description: 'You must add income for at least one month',
+  },
+  incomePlanRequired: {
+    id: 'ip.application:error.income.plan.required',
+    defaultMessage: 'Nauðsynlegt er að bæta við a.m.k einni tekjutegund',
+    description: 'You must add at least one income type',
+  },
+})
diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/types.ts b/libs/application/templates/social-insurance-administration/income-plan/src/types.ts
new file mode 100644
index 000000000000..b0fad1830f63
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/src/types.ts
@@ -0,0 +1,94 @@
+import { RatioType } from './lib/constants'
+
+export interface CategorizedIncomeTypes {
+  categoryCode?: string | null
+  categoryName?: string | null
+  categoryNumber?: number
+  incomeTypeCode?: string | null
+  incomeTypeName?: string | null
+  incomeTypeNumber?: number
+}
+
+export interface WithholdingTax {
+  year?: number
+  incomeTypes?: Array<WithholdingTaxIncomeType> | null
+}
+
+interface WithholdingTaxIncomeType {
+  incomeTypeNumber?: number | null
+  incomeTypeName?: string | null
+  incomeTypeCode?: string | null
+  categoryNumber?: number | null
+  categoryName?: string | null
+  categoryCode?: string | null
+  january?: number | null
+  february?: number | null
+  march?: number | null
+  april?: number | null
+  may?: number | null
+  june?: number | null
+  july?: number | null
+  august?: number | null
+  september?: number | null
+  october?: number | null
+  november?: number | null
+  december?: number | null
+  total?: number | null
+}
+
+export interface IncomePlanRow {
+  incomeType: string
+  incomeTypeNumber: number
+  incomeTypeCode: string
+  currency: string
+  incomeCategory: string
+  incomeCategoryNumber: number
+  incomeCategoryCode: string
+  income: RatioType
+  equalForeignIncomePerMonth?: string
+  equalIncomePerMonth?: string
+  incomePerYear: string
+  unevenIncomePerYear?: string
+  january?: string
+  february?: string
+  march?: string
+  april?: string
+  may?: string
+  june?: string
+  july?: string
+  august?: string
+  september?: string
+  october?: string
+  november?: string
+  december?: string
+}
+
+export interface LatestIncomePlan {
+  year: number
+  origin: string
+  status: string
+  incomeTypeLines: IncomeType[]
+  registrationDate: string
+}
+
+interface IncomeType {
+  currency: string
+  totalSum: number
+  incomeTypeCode: string
+  incomeTypeName: string
+  incomeTypeNumber: number
+  incomeCategoryCode: string
+  incomeCategoryName: string
+  incomeCategoryNumber: number
+}
+
+export interface Eligible {
+  isEligible: boolean
+  reason: string
+  reasonCode: string
+}
+
+export interface IncomePlanConditions {
+  incomePlanYear: number
+  showTemporaryCalculations: boolean
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/tsconfig.json b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.json
new file mode 100644
index 000000000000..8dc70ca00ce2
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "extends": "../../../../../tsconfig.base.json"
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/tsconfig.lib.json b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.lib.json
new file mode 100644
index 000000000000..cfc356e7214b
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.lib.json
@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../../../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../../../../node_modules/@nx/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx",
+    "jest.config.ts"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/libs/application/templates/social-insurance-administration/income-plan/tsconfig.spec.json b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.spec.json
new file mode 100644
index 000000000000..915013b6a6d4
--- /dev/null
+++ b/libs/application/templates/social-insurance-administration/income-plan/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/application/templates/social-insurance-administration/old-age-pension/README.md b/libs/application/templates/social-insurance-administration/old-age-pension/README.md
index ca610dd918e0..a4ed9f907fd3 100644
--- a/libs/application/templates/social-insurance-administration/old-age-pension/README.md
+++ b/libs/application/templates/social-insurance-administration/old-age-pension/README.md
@@ -4,7 +4,7 @@
 
 This application template allows applicants to apply for old age pension.
 
-![](./assets/old-age-pension-flow-chart.png)
+![](../core/assets/tr-applications-flow-chart.png)
 
 ### States
 
diff --git a/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.drawio b/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.drawio
deleted file mode 100644
index b716c134fe83..000000000000
--- a/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.drawio
+++ /dev/null
@@ -1,157 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="TPfQYejgOXyKDrpABapk" name="Page-1">
-        <mxGraphModel dx="1794" dy="1959" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="none" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="124" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" parent="1" vertex="1">
-                    <mxGeometry x="-40" y="-90" width="720" height="810" as="geometry"/>
-                </mxCell>
-                <mxCell id="2" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="260" y="90" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="3" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="200" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="4" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="260" y="465" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="6" value="Additional documents required" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="120" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="7" value="Approved" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="260" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="11" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" source="2" target="3" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="410" y="650" as="sourcePoint"/>
-                        <mxPoint x="460" y="600" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="13" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="4" target="6" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="525" as="sourcePoint"/>
-                        <mxPoint x="320" y="585" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="180" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="14" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" parent="1" source="6" target="4" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="70" y="615" as="sourcePoint"/>
-                        <mxPoint x="70" y="675" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="70" y="615"/>
-                            <mxPoint x="70" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="15" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="2" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="200" y="240" as="sourcePoint"/>
-                        <mxPoint x="140" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="140" y="240"/>
-                            <mxPoint x="140" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="26" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="100" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="28" value="Reject" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="460" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="30" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="230" y="165" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="32" value="Additional&#10;documents &#10;required" style="text;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="110" y="515" width="65" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="37" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="250" y="535" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="40" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="10" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="48" value="Rejected" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="400" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="50" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="4" target="7" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="330" y="535" as="sourcePoint"/>
-                        <mxPoint x="190" y="595" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="51" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="4" target="48" edge="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="340" y="545" as="sourcePoint"/>
-                        <mxPoint x="200" y="605" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="460" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="53" value="TR makes a&lt;br&gt;state change" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" parent="1" vertex="1">
-                    <mxGeometry x="280" y="295" width="90" height="40" as="geometry"/>
-                </mxCell>
-                <mxCell id="54" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" edge="1" source="3">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="319" y="350" as="sourcePoint"/>
-                        <mxPoint x="318.89" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="125" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="-30" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="127" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="30" as="sourcePoint"/>
-                        <mxPoint x="320" y="90" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="128" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="320" y="45" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="129" value="Tryggingastofnun abort" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="330" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="130" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="129" target="2">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="570" y="240" as="sourcePoint"/>
-                        <mxPoint x="630" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="510" y="240"/>
-                            <mxPoint x="510" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="131" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="510" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="132" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="2" target="129">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="330" y="160" as="sourcePoint"/>
-                        <mxPoint x="270" y="220" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="133" value="Abort" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="165" width="50" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="134" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" target="4">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="391.11" y="270" as="sourcePoint"/>
-                        <mxPoint x="449.9999999999999" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="136" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="215" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="137" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>
\ No newline at end of file
diff --git a/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.png b/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.png
deleted file mode 100644
index 129bd286e0fd..000000000000
Binary files a/libs/application/templates/social-insurance-administration/old-age-pension/assets/old-age-pension-flow-chart.png and /dev/null differ
diff --git a/libs/application/templates/social-insurance-administration/pension-supplement/README.md b/libs/application/templates/social-insurance-administration/pension-supplement/README.md
index d98869da17a1..d7aeed8e7bf8 100644
--- a/libs/application/templates/social-insurance-administration/pension-supplement/README.md
+++ b/libs/application/templates/social-insurance-administration/pension-supplement/README.md
@@ -4,7 +4,7 @@
 
 This application template allows applicants to apply for pension supplement.
 
-![](./assets/pension-supplement-flow-chart.png)
+![](../core/assets/tr-applications-flow-chart.png)
 
 ### States
 
diff --git a/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.drawio b/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.drawio
deleted file mode 100644
index 31c512237e33..000000000000
--- a/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.drawio
+++ /dev/null
@@ -1,157 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="NqZFgfEtZ0fkA-t-eZ1Y" name="Page-1">
-        <mxGraphModel dx="2144" dy="2241" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="22" value="" style="whiteSpace=wrap;html=1;fillColor=#FFFFFF;gradientColor=none;strokeColor=#666666;" vertex="1" parent="1">
-                    <mxGeometry x="-40" y="-90" width="720" height="810" as="geometry"/>
-                </mxCell>
-                <mxCell id="23" value="Draft" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="90" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="24" value="Tryggingastofnun submitted" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="200" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="25" value="Tryggingastofnun in review" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="465" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="26" value="Additional documents required" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="120" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="27" value="Approved" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="28" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="23" target="24">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="410" y="650" as="sourcePoint"/>
-                        <mxPoint x="460" y="600" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="29" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="25" target="26">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="525" as="sourcePoint"/>
-                        <mxPoint x="320" y="585" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="180" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="30" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="26" target="25">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="70" y="615" as="sourcePoint"/>
-                        <mxPoint x="70" y="675" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="70" y="615"/>
-                            <mxPoint x="70" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="31" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="23">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="200" y="240" as="sourcePoint"/>
-                        <mxPoint x="140" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="140" y="240"/>
-                            <mxPoint x="140" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="32" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="100" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="33" value="Reject" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="460" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="34" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="230" y="165" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="35" value="Additional&#10;documents &#10;required" style="text;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="110" y="515" width="65" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="36" value="Approve" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="250" y="535" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="37" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="10" y="535" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="38" value="Rejected" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="400" y="585" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="39" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="25" target="27">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="330" y="535" as="sourcePoint"/>
-                        <mxPoint x="190" y="595" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="40" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="25" target="38">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="340" y="545" as="sourcePoint"/>
-                        <mxPoint x="200" y="605" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="460" y="495"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="41" value="TR makes a&lt;br&gt;state change" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="295" width="90" height="40" as="geometry"/>
-                </mxCell>
-                <mxCell id="42" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="24">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="319" y="350" as="sourcePoint"/>
-                        <mxPoint x="318.8899999999999" y="465.00000000000045" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="43" value="Pre" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="260" y="-30" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="44" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="320" y="30" as="sourcePoint"/>
-                        <mxPoint x="320" y="90" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="45" value="Submit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="320" y="45" width="60" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="46" value="Tryggingastofnun abort" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="330" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="47" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="46" target="23">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="570" y="240" as="sourcePoint"/>
-                        <mxPoint x="630" y="120" as="targetPoint"/>
-                        <Array as="points">
-                            <mxPoint x="510" y="240"/>
-                            <mxPoint x="510" y="120"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="48" value="Edit" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="510" y="165" width="40" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="49" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=#FFFFFF;strokeColor=#000000;" edge="1" parent="1" source="23" target="46">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="330" y="160" as="sourcePoint"/>
-                        <mxPoint x="270" y="220" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="50" value="Abort" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="165" width="50" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="51" value="" style="endArrow=classic;html=1;fontColor=#FFFFFF;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" target="25">
-                    <mxGeometry width="50" height="50" relative="1" as="geometry">
-                        <mxPoint x="391.1100000000001" y="270" as="sourcePoint"/>
-                        <mxPoint x="449.9999999999999" y="465" as="targetPoint"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="52" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="215" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="53" value="In review" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#000000;" vertex="1" parent="1">
-                    <mxGeometry x="359" y="360" width="70" height="30" as="geometry"/>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>
\ No newline at end of file
diff --git a/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.png b/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.png
deleted file mode 100644
index 123bf2cd3546..000000000000
Binary files a/libs/application/templates/social-insurance-administration/pension-supplement/src/assets/pension-supplement-flow-chart.png and /dev/null differ
diff --git a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/forms/TransferOfVehicleOwnershipForm/prerequisitesSection.ts b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/forms/TransferOfVehicleOwnershipForm/prerequisitesSection.ts
index 6c7ebe06b010..59ed0d75f9b0 100644
--- a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/forms/TransferOfVehicleOwnershipForm/prerequisitesSection.ts
+++ b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/src/forms/TransferOfVehicleOwnershipForm/prerequisitesSection.ts
@@ -21,6 +21,7 @@ export const prerequisitesSection = buildSection({
       id: 'approveExternalData',
       subTitle: externalData.dataProvider.subTitle,
       checkboxLabel: externalData.dataProvider.checkboxLabel,
+      enableMockPayment: true,
       dataProviders: [
         buildDataProviderItem({
           provider: IdentityApi,
diff --git a/libs/application/types/src/lib/Application.ts b/libs/application/types/src/lib/Application.ts
index a724a5c60ff7..4a16b79bd664 100644
--- a/libs/application/types/src/lib/Application.ts
+++ b/libs/application/types/src/lib/Application.ts
@@ -40,6 +40,7 @@ export interface ActionCardMetaData {
     displayStatus: PendingActionDisplayType
     title?: string
     content?: string
+    button?: string
   }
   history?: ApplicationHistoryItem[]
   tag?: {
@@ -49,6 +50,7 @@ export interface ActionCardMetaData {
   deleteButton?: boolean
   draftTotalSteps?: number
   draftFinishedSteps?: number
+  historyButton?: string
 }
 
 export interface Application<TAnswers = FormValue> {
diff --git a/libs/application/types/src/lib/ApplicationTemplate.ts b/libs/application/types/src/lib/ApplicationTemplate.ts
index a9f8bbf45190..a40fdd92e722 100644
--- a/libs/application/types/src/lib/ApplicationTemplate.ts
+++ b/libs/application/types/src/lib/ApplicationTemplate.ts
@@ -29,6 +29,8 @@ export interface ApplicationTemplate<
     | ((
         application: Application,
       ) => StaticText | { name: StaticText; value: string })
+  readonly newApplicationButtonLabel?: StaticText
+  readonly applicationText?: StaticText
   readonly institution?: StaticText
   readonly translationNamespaces?: string[]
   readonly allowMultipleApplicationsInDraft?: boolean
diff --git a/libs/application/types/src/lib/ApplicationTypes.ts b/libs/application/types/src/lib/ApplicationTypes.ts
index 8b3f009762ef..d2c45faf5978 100644
--- a/libs/application/types/src/lib/ApplicationTypes.ts
+++ b/libs/application/types/src/lib/ApplicationTypes.ts
@@ -73,6 +73,7 @@ export enum ApplicationTypes {
   ID_CARD = 'IdCard',
   HEALTH_INSURANCE_DECLARATION = 'HealthInsuranceDeclaration',
   STREET_REGISTRATION = 'StreetRegistration',
+  INCOME_PLAN = 'IncomePlan',
   NEW_PRIMARY_SCHOOL = 'NewPrimarySchool',
   MACHINE_REGISTRATION = 'MachineRegistration',
 }
@@ -378,6 +379,10 @@ export const ApplicationConfigurations = {
     slug: 'gotuskraning-taekis',
     translation: 'aosh.sr.application',
   },
+  [ApplicationTypes.INCOME_PLAN]: {
+    slug: 'tekjuaaetlun',
+    translation: ['ip.application', 'sia.application', 'uiForms.application'],
+  },
   [ApplicationTypes.NEW_PRIMARY_SCHOOL]: {
     slug: 'nyr-grunnskoli',
     translation: ['dess.nps.application', 'uiForms.application'],
diff --git a/libs/application/types/src/lib/Fields.ts b/libs/application/types/src/lib/Fields.ts
index d28fa456eb3f..14a5ccc3d75a 100644
--- a/libs/application/types/src/lib/Fields.ts
+++ b/libs/application/types/src/lib/Fields.ts
@@ -68,7 +68,7 @@ type TableRepeaterOptions =
   | RepeaterOption[]
   | ((
       application: Application,
-      activeField: Record<string, string>,
+      activeField?: Record<string, string>,
     ) => RepeaterOption[] | [])
 
 export type TableRepeaterItem = {
@@ -94,6 +94,19 @@ export type TableRepeaterItem = {
         application: Application,
         activeField?: Record<string, string>,
       ) => boolean)
+  updateValueObj?: {
+    valueModifier: (activeField?: Record<string, string>) => unknown
+    watchValues:
+      | string
+      | string[]
+      | ((
+          activeField?: Record<string, string>,
+        ) => string | string[] | undefined)
+  }
+  defaultValue?: (
+    application: Application,
+    activeField?: Record<string, string>,
+  ) => unknown
 } & (
   | {
       component: 'input'
@@ -335,6 +348,8 @@ export interface TextField extends BaseField {
   rightAlign?: boolean
   minLength?: number
   maxLength?: number
+  max?: number
+  min?: number
   placeholder?: FormText
   variant?: TextFieldVariant
   backgroundColor?: InputBackgroundColor
@@ -439,7 +454,7 @@ export interface MessageWithLinkButtonField extends BaseField {
 export interface ExpandableDescriptionField extends BaseField {
   readonly type: FieldTypes.EXPANDABLE_DESCRIPTION
   component: FieldComponents.EXPANDABLE_DESCRIPTION
-  introText?: StaticText
+  introText?: FormText
   description: FormText
   startExpanded?: boolean
 }
diff --git a/libs/application/types/src/lib/Form.ts b/libs/application/types/src/lib/Form.ts
index d0af617c7a7e..5f1279f624e1 100644
--- a/libs/application/types/src/lib/Form.ts
+++ b/libs/application/types/src/lib/Form.ts
@@ -123,6 +123,7 @@ export interface ExternalDataProvider extends FormItem {
   isPartOfRepeater?: boolean
   dataProviders: DataProviderItem[]
   otherPermissions?: DataProviderPermissionItem[]
+  enableMockPayment?: boolean
   checkboxLabel?: StaticText
   subTitle?: StaticText
   description?: StaticText
diff --git a/libs/application/types/src/lib/InstitutionContentfulIds.ts b/libs/application/types/src/lib/InstitutionContentfulIds.ts
new file mode 100644
index 000000000000..23e546757965
--- /dev/null
+++ b/libs/application/types/src/lib/InstitutionContentfulIds.ts
@@ -0,0 +1,26 @@
+export enum InstitutionContentfulIds {
+  FISKISTOFA = '6rXUdfbMD515Z7guowj08E',
+  FJARMALA_EFNAHAGSRADUNEYTID = '6xhVYBCkt30UXNIbPhnuxj',
+  FJARSYSLA_RIKISINS = '6AoSHJJRDHQFfLiwBZvZi2',
+  INNHEIMTUMADUR = '1apt3Oaqom8FtfZVWZCWo3',
+  PERSONUVERND = '5UmQomOeRqkkB1PChUYv3f',
+  RIKISENDURSKODUN = '3yz6wLXMEtpBLFnVLn2eAS',
+  RIKISLOGREGLUSTJORI = '1QXklS0ez93a5YDe2AnCAC',
+  SAMBAND_SVEITARFELAGA = '1e0sTKRZwX8BTtpwLmoPiE',
+  SAMGONGUSTOFA = '6IZT17s7stKJAmtPutjpD7',
+  SJUKRATRYGGINGAR_ISLANDS = '3pZwAagW0UY26giHaxHthe',
+  STAFRAENT_ISLAND = '1JHJe1NDwbBjEr7OVdjuFD',
+  SYSLUMENN = 'kENblMMMvZ3DlyXw1dwxQ',
+  UMBODSMADUR_ALTHINGIS = '15ISIoODnBVuXMO4a91ew3',
+  VINNUMALASTOFNUN = 'co6SSvHZjUpEICpTlJT1B',
+  THJODSKRA = 'i5go5A4ikV8muPfvr9o2v',
+  TRYGGINGASTOFNUN = '3dgsobJuiJXC1oOxhGpcUY',
+  URVINNSLUSJODUR = '1jZFdAD0iL0LpR42BbuoEF',
+  UTLENDINGASTOFNUN = '77rXck3sISbMsUv7BO1PG2',
+  ORKUSTOFNUN = '1g7I83SBjDyHp35Wgc86uZ',
+  EMBAETTI_LANDLAEKNIS = '7qgJZc8vO7ZHWmfSrZp9Kn',
+  VINNUEFTIRLITID = '39S5VumPfb1hXBJm3SnE02',
+  HASKOLARADUNEYTI = '3sehE6LnPfPkS6fR0DkIqK',
+  DOMSMALARADUNEYTID = '26M5901Ntp7GhY14TRYSvw',
+  MIDSTOD_MENNTUNAR_SKOLATHJONUSTU = '48Sa01Rahbo7FAdWPQbRub',
+}
diff --git a/libs/application/types/src/lib/InstitutionMapper.ts b/libs/application/types/src/lib/InstitutionMapper.ts
index 6d05990e411c..1c062d970143 100644
--- a/libs/application/types/src/lib/InstitutionMapper.ts
+++ b/libs/application/types/src/lib/InstitutionMapper.ts
@@ -1,310 +1,392 @@
 import { ApplicationTypes } from './ApplicationTypes'
 import { InstitutionTypes } from './InstitutionTypes'
+import { InstitutionContentfulIds } from './InstitutionContentfulIds'
 import { InstitutionNationalIds } from './InstitutionNationalIds'
 
 export const institutionMapper = {
   [ApplicationTypes.EXAMPLE]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.PASSPORT]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.PASSPORT_ANNULMENT]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.DRIVING_LEARNERS_PERMIT]: {
     nationalId: InstitutionNationalIds.RIKISLOGREGLUSTJORI,
     slug: InstitutionTypes.RIKISLOGREGLUSTJORI,
+    contentfulId: InstitutionContentfulIds.RIKISLOGREGLUSTJORI,
   },
   [ApplicationTypes.DRIVING_LICENSE]: {
     nationalId: InstitutionNationalIds.RIKISLOGREGLUSTJORI,
     slug: InstitutionTypes.RIKISLOGREGLUSTJORI,
+    contentfulId: InstitutionContentfulIds.RIKISLOGREGLUSTJORI,
   },
   [ApplicationTypes.DRIVING_ASSESSMENT_APPROVAL]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.PARENTAL_LEAVE]: {
     nationalId: InstitutionNationalIds.VINNUMALASTOFNUN,
     slug: InstitutionTypes.VINNUMALASTOFNUN,
+    contentfulId: InstitutionContentfulIds.VINNUMALASTOFNUN,
   },
   [ApplicationTypes.DOCUMENT_PROVIDER_ONBOARDING]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.HEALTH_INSURANCE]: {
     nationalId: InstitutionNationalIds.SJUKRATRYGGINGAR_ISLANDS,
     slug: InstitutionTypes.SJUKRATRYGGINGAR_ISLANDS,
+    contentfulId: InstitutionContentfulIds.SJUKRATRYGGINGAR_ISLANDS,
   },
   [ApplicationTypes.CHILDREN_RESIDENCE_CHANGE]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.CHILDREN_RESIDENCE_CHANGE_V2]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.DATA_PROTECTION_AUTHORITY_COMPLAINT]: {
     nationalId: InstitutionNationalIds.PERSONUVERND,
     slug: InstitutionTypes.PERSONUVERND,
+    contentfulId: InstitutionContentfulIds.PERSONUVERND,
   },
   [ApplicationTypes.LOGIN_SERVICE]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.INSTITUTION_COLLABORATION]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.INHERITANCE_REPORT]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.FUNDING_GOVERNMENT_PROJECTS]: {
     nationalId: InstitutionNationalIds.FJARMALA_EFNAHAGSRADUNEYTID,
     slug: InstitutionTypes.FJARMALA_EFNAHAGSRADUNEYTID,
+    contentfulId: InstitutionContentfulIds.FJARMALA_EFNAHAGSRADUNEYTID,
   },
   [ApplicationTypes.PUBLIC_DEBT_PAYMENT_PLAN]: {
     nationalId: InstitutionNationalIds.INNHEIMTUMADUR,
     slug: InstitutionTypes.INNHEIMTUMADUR,
+    contentfulId: InstitutionContentfulIds.INNHEIMTUMADUR,
   },
   [ApplicationTypes.COMPLAINTS_TO_ALTHINGI_OMBUDSMAN]: {
     nationalId: InstitutionNationalIds.UMBODSMADUR_ALTHINGIS,
     slug: InstitutionTypes.UMBODSMADUR_ALTHINGIS,
+    contentfulId: InstitutionContentfulIds.UMBODSMADUR_ALTHINGIS,
   },
   [ApplicationTypes.ACCIDENT_NOTIFICATION]: {
     nationalId: InstitutionNationalIds.SJUKRATRYGGINGAR_ISLANDS,
     slug: InstitutionTypes.SJUKRATRYGGINGAR_ISLANDS,
+    contentfulId: InstitutionContentfulIds.SJUKRATRYGGINGAR_ISLANDS,
   },
   [ApplicationTypes.EUROPEAN_HEALTH_INSURANCE_CARD]: {
     nationalId: InstitutionNationalIds.SJUKRATRYGGINGAR_ISLANDS,
     slug: InstitutionTypes.SJUKRATRYGGINGAR_ISLANDS,
+    contentfulId: InstitutionContentfulIds.SJUKRATRYGGINGAR_ISLANDS,
   },
   [ApplicationTypes.GENERAL_PETITION]: {
     nationalId: InstitutionNationalIds.THJODSKRA,
     slug: InstitutionTypes.THJODSKRA,
+    contentfulId: InstitutionContentfulIds.THJODSKRA,
   },
   [ApplicationTypes.GENERAL_FISHING_LICENSE]: {
     nationalId: InstitutionNationalIds.FISKISTOFA,
     slug: InstitutionTypes.FISKISTOFA,
+    contentfulId: InstitutionContentfulIds.FISKISTOFA,
   },
   [ApplicationTypes.P_SIGN]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.CRIMINAL_RECORD]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.FINANCIAL_AID]: {
     nationalId: InstitutionNationalIds.SAMBAND_SVEITARFELAGA,
     slug: InstitutionTypes.SAMBAND_SVEITARFELAGA,
+    contentfulId: InstitutionContentfulIds.SAMBAND_SVEITARFELAGA,
   },
   [ApplicationTypes.DRIVING_INSTRUCTOR_REGISTRATIONS]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.EXAMPLE_PAYMENT]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.DRIVING_SCHOOL_CONFIRMATION]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.MORTGAGE_CERTIFICATE]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.NO_DEBT_CERTIFICATE]: {
     nationalId: InstitutionNationalIds.FJARSYSLA_RIKISINS,
     slug: InstitutionTypes.FJARSYSLA_RIKISINS,
+    contentfulId: InstitutionContentfulIds.FJARSYSLA_RIKISINS,
   },
   [ApplicationTypes.FINANCIAL_STATEMENT_CEMETERY]: {
     nationalId: InstitutionNationalIds.RIKISENDURSKODUN,
     slug: InstitutionTypes.RIKISENDURSKODUN,
+    contentfulId: InstitutionContentfulIds.RIKISENDURSKODUN,
   },
   [ApplicationTypes.FINANCIAL_STATEMENTS_INAO]: {
     nationalId: InstitutionNationalIds.RIKISENDURSKODUN,
     slug: InstitutionTypes.RIKISENDURSKODUN,
+    contentfulId: InstitutionContentfulIds.RIKISENDURSKODUN,
   },
   [ApplicationTypes.FINANCIAL_STATEMENT_INDIVIDUAL_ELECTION]: {
     nationalId: InstitutionNationalIds.RIKISENDURSKODUN,
     slug: InstitutionTypes.RIKISENDURSKODUN,
+    contentfulId: InstitutionContentfulIds.RIKISENDURSKODUN,
   },
   [ApplicationTypes.ANNOUNCEMENT_OF_DEATH]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.OPERATING_LICENSE]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.MARRIAGE_CONDITIONS]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.ESTATE]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.DRIVING_LICENSE_DUPLICATE]: {
     nationalId: InstitutionNationalIds.RIKISLOGREGLUSTJORI,
     slug: InstitutionTypes.RIKISLOGREGLUSTJORI,
+    contentfulId: InstitutionContentfulIds.RIKISLOGREGLUSTJORI,
   },
   [ApplicationTypes.ANONYMITY_IN_VEHICLE_REGISTRY]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.CHANGE_CO_OWNER_OF_VEHICLE]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.CHANGE_OPERATOR_OF_VEHICLE]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.DIGITAL_TACHOGRAPH_COMPANY_CARD]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.DIGITAL_TACHOGRAPH_DRIVERS_CARD]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.DIGITAL_TACHOGRAPH_WORKSHOP_CARD]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.LICENSE_PLATE_RENEWAL]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.ORDER_VEHICLE_LICENSE_PLATE]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.ORDER_VEHICLE_REGISTRATION_CERTIFICATE]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.TRANSFER_OF_VEHICLE_OWNERSHIP]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.DRIVING_LICENSE_BOOK_UPDATE_INSTRUCTOR]: {
     nationalId: InstitutionNationalIds.SAMGONGUSTOFA,
     slug: InstitutionTypes.SAMGONGUSTOFA,
+    contentfulId: InstitutionContentfulIds.SAMGONGUSTOFA,
   },
   [ApplicationTypes.ALCOHOL_TAX_REDEMPTION]: {
     nationalId: InstitutionNationalIds.STAFRAENT_ISLAND,
     slug: InstitutionTypes.STAFRAENT_ISLAND,
+    contentfulId: InstitutionContentfulIds.STAFRAENT_ISLAND,
   },
   [ApplicationTypes.OLD_AGE_PENSION]: {
     nationalId: InstitutionNationalIds.TRYGGINGASTOFNUN,
     slug: InstitutionTypes.TRYGGINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.TRYGGINGASTOFNUN,
   },
   [ApplicationTypes.HOUSEHOLD_SUPPLEMENT]: {
     nationalId: InstitutionNationalIds.TRYGGINGASTOFNUN,
     slug: InstitutionTypes.TRYGGINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.TRYGGINGASTOFNUN,
   },
   [ApplicationTypes.CAR_RECYCLING]: {
     nationalId: InstitutionNationalIds.URVINNSLUSJODUR,
     slug: InstitutionTypes.URVINNSLUSJODUR,
+    contentfulId: InstitutionContentfulIds.URVINNSLUSJODUR,
   },
   [ApplicationTypes.PRESIDENTIAL_LIST_CREATION]: {
     nationalId: InstitutionNationalIds.THJODSKRA,
     slug: InstitutionTypes.THJODSKRA,
+    contentfulId: InstitutionContentfulIds.THJODSKRA,
   },
   [ApplicationTypes.PRESIDENTIAL_LIST_SIGNING]: {
     nationalId: InstitutionNationalIds.THJODSKRA,
     slug: InstitutionTypes.THJODSKRA,
+    contentfulId: InstitutionContentfulIds.THJODSKRA,
   },
   [ApplicationTypes.PARLIAMENTARY_LIST_CREATION]: {
     nationalId: InstitutionNationalIds.THJODSKRA,
     slug: InstitutionTypes.THJODSKRA,
+    contentfulId: InstitutionContentfulIds.THJODSKRA,
   },
   [ApplicationTypes.PARLIAMENTARY_LIST_SIGNING]: {
     nationalId: InstitutionNationalIds.THJODSKRA,
     slug: InstitutionTypes.THJODSKRA,
+    contentfulId: InstitutionContentfulIds.THJODSKRA,
   },
   [ApplicationTypes.CITIZENSHIP]: {
     nationalId: InstitutionNationalIds.UTLENDINGASTOFNUN,
     slug: InstitutionTypes.UTLENDINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.UTLENDINGASTOFNUN,
   },
   [ApplicationTypes.ENERGY_FUNDS]: {
     nationalId: InstitutionNationalIds.ORKUSTOFNUN,
     slug: InstitutionTypes.ORKUSTOFNUN,
+    contentfulId: InstitutionContentfulIds.ORKUSTOFNUN,
   },
   [ApplicationTypes.HEALTHCARE_LICENSE_CERTIFICATE]: {
     nationalId: InstitutionNationalIds.EMBAETTI_LANDLAEKNIS,
     slug: InstitutionTypes.EMBAETTI_LANDLAEKNIS,
+    contentfulId: InstitutionContentfulIds.EMBAETTI_LANDLAEKNIS,
   },
   [ApplicationTypes.HEALTHCARE_WORK_PERMIT]: {
     nationalId: InstitutionNationalIds.EMBAETTI_LANDLAEKNIS,
     slug: InstitutionTypes.EMBAETTI_LANDLAEKNIS,
+    contentfulId: InstitutionContentfulIds.EMBAETTI_LANDLAEKNIS,
   },
   [ApplicationTypes.TRANSFER_OF_MACHINE_OWNERSHIP]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
   },
   [ApplicationTypes.ADDITIONAL_SUPPORT_FOR_THE_ELDERLY]: {
     nationalId: InstitutionNationalIds.TRYGGINGASTOFNUN,
     slug: InstitutionTypes.TRYGGINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.TRYGGINGASTOFNUN,
   },
   [ApplicationTypes.PENSION_SUPPLEMENT]: {
     nationalId: InstitutionNationalIds.TRYGGINGASTOFNUN,
     slug: InstitutionTypes.TRYGGINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.TRYGGINGASTOFNUN,
   },
   [ApplicationTypes.CHANGE_MACHINE_SUPERVISOR]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
   },
   [ApplicationTypes.HOME_SUPPORT]: {
     nationalId: InstitutionNationalIds.SAMBAND_SVEITARFELAGA,
     slug: InstitutionTypes.SAMBAND_SVEITARFELAGA,
+    contentfulId: InstitutionContentfulIds.SAMBAND_SVEITARFELAGA,
   },
   [ApplicationTypes.UNIVERSITY]: {
     nationalId: InstitutionNationalIds.HASKOLARADUNEYTI,
     slug: InstitutionTypes.HASKOLARADUNEYTI,
+    contentfulId: InstitutionContentfulIds.HASKOLARADUNEYTI,
   },
   [ApplicationTypes.DEREGISTER_MACHINE]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
   },
   [ApplicationTypes.GRINDAVIK_HOUSING_BUYOUT]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.REQUEST_INSPECTION_FOR_MACHINE]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
   },
   [ApplicationTypes.OFFICIAL_JOURNAL_OF_ICELAND]: {
     nationalId: InstitutionNationalIds.DOMSMALA_RADUNEYTID,
     slug: InstitutionTypes.DOMSMALARADUNEYTID,
+    contentfulId: InstitutionContentfulIds.DOMSMALARADUNEYTID,
   },
   [ApplicationTypes.ID_CARD]: {
     nationalId: InstitutionNationalIds.SYSLUMENN,
     slug: InstitutionTypes.SYSLUMENN,
+    contentfulId: InstitutionContentfulIds.SYSLUMENN,
   },
   [ApplicationTypes.HEALTH_INSURANCE_DECLARATION]: {
     nationalId: InstitutionNationalIds.SJUKRATRYGGINGAR_ISLANDS,
     slug: InstitutionTypes.SJUKRATRYGGINGAR_ISLANDS,
+    contentfulId: InstitutionContentfulIds.SJUKRATRYGGINGAR_ISLANDS,
   },
   [ApplicationTypes.STREET_REGISTRATION]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
+  },
+  [ApplicationTypes.INCOME_PLAN]: {
+    nationalId: InstitutionNationalIds.TRYGGINGASTOFNUN,
+    slug: InstitutionTypes.TRYGGINGASTOFNUN,
+    contentfulId: InstitutionContentfulIds.TRYGGINGASTOFNUN,
   },
   [ApplicationTypes.NEW_PRIMARY_SCHOOL]: {
     nationalId: InstitutionNationalIds.MIDSTOD_MENNTUNAR_SKOLATHJONUSTU,
     slug: InstitutionTypes.MIDSTOD_MENNTUNAR_SKOLATHJONUSTU,
+    contentfulId: InstitutionContentfulIds.MIDSTOD_MENNTUNAR_SKOLATHJONUSTU,
   },
   [ApplicationTypes.MACHINE_REGISTRATION]: {
     nationalId: InstitutionNationalIds.VINNUEFTIRLITID,
     slug: InstitutionTypes.VINNUEFTIRLITID,
+    contentfulId: InstitutionContentfulIds.VINNUEFTIRLITID,
   },
 }
diff --git a/libs/application/types/src/lib/StateMachine.ts b/libs/application/types/src/lib/StateMachine.ts
index efcfbd8ca1df..fd3c46b8596a 100644
--- a/libs/application/types/src/lib/StateMachine.ts
+++ b/libs/application/types/src/lib/StateMachine.ts
@@ -77,6 +77,7 @@ export type PendingAction = {
   displayStatus: PendingActionDisplayType
   title?: StaticText
   content?: StaticText
+  button?: StaticText
 }
 
 export type HistoryEventMessage<T extends EventObject = AnyEventObject> = {
@@ -119,6 +120,7 @@ export interface ApplicationStateMeta<
         ) => PendingAction)
     /** @deprecated is generated from status of current state */
     tag?: { label?: StaticText; variant?: ActionCardTag }
+    historyButton?: StaticText
   }
 
   progress?: number
diff --git a/libs/application/ui-components/src/components/ApplicationCard/components/ApplicationCardProgress.tsx b/libs/application/ui-components/src/components/ApplicationCard/components/ApplicationCardProgress.tsx
index 22ef8ea4bed1..bcf47676e276 100644
--- a/libs/application/ui-components/src/components/ApplicationCard/components/ApplicationCardProgress.tsx
+++ b/libs/application/ui-components/src/components/ApplicationCard/components/ApplicationCardProgress.tsx
@@ -56,7 +56,9 @@ const DraftProgressMeter = ({
       {shouldShowCardButtons && (
         <Box marginLeft={[0, 0, 'auto']} paddingTop={[2, 2, 0]}>
           <Button variant="ghost" onClick={onOpenApplication} size="small">
-            {formatMessage(defaultData.cta.label)}
+            {actionCard?.historyButton
+              ? formatMessage(actionCard.historyButton)
+              : formatMessage(defaultData.cta.label)}
           </Button>
         </Box>
       )}
diff --git a/libs/application/ui-components/src/components/ApplicationCard/utils/history.tsx b/libs/application/ui-components/src/components/ApplicationCard/utils/history.tsx
index 1e36f10e2065..0832446647e7 100644
--- a/libs/application/ui-components/src/components/ApplicationCard/utils/history.tsx
+++ b/libs/application/ui-components/src/components/ApplicationCard/utils/history.tsx
@@ -42,7 +42,9 @@ export const buildHistoryItems = (
                   onClick={openApplication}
                   icon="pencil"
                 >
-                  {formatMessage(coreMessages.cardButtonDraft)}
+                  {application.actionCard.pendingAction.button
+                    ? formatMessage(application.actionCard.pendingAction.button)
+                    : formatMessage(coreMessages.cardButtonDraft)}
                 </Button>
               </Box>
             ) : undefined
diff --git a/libs/application/ui-components/src/index.ts b/libs/application/ui-components/src/index.ts
index a858a0a16536..9f3b2597ec4b 100644
--- a/libs/application/ui-components/src/index.ts
+++ b/libs/application/ui-components/src/index.ts
@@ -12,6 +12,7 @@ export {
   formatPhoneNumber,
   removeCountryCode,
   formatCurrency,
+  formatCurrencyWithoutSuffix,
 } from './utilities/formatters'
 export { handleServerError } from './utilities/handleServerError'
 export { InputImageUpload } from './components/InputImageUpload/InputImageUpload'
diff --git a/libs/application/ui-components/src/utilities/formatters.ts b/libs/application/ui-components/src/utilities/formatters.ts
index 8620d63f6b92..ee0ae4fc4cc3 100644
--- a/libs/application/ui-components/src/utilities/formatters.ts
+++ b/libs/application/ui-components/src/utilities/formatters.ts
@@ -24,3 +24,6 @@ export const removeCountryCode = (phone: string) => {
 
 export const formatCurrency = (answer: string) =>
   answer.replace(/\B(?=(\d{3})+(?!\d))/g, '.') + ' kr.'
+
+export const formatCurrencyWithoutSuffix = (answer: string) =>
+  answer.replace(/\B(?=(\d{3})+(?!\d))/g, '.')
diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterFormField.tsx b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterFormField.tsx
index 225e3acdac89..85a934fd5ad8 100644
--- a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterFormField.tsx
+++ b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterFormField.tsx
@@ -4,44 +4,27 @@ import {
   TableRepeaterField,
 } from '@island.is/application/types'
 import {
-  Stack,
+  AlertMessage,
   Box,
   Button,
+  GridRow,
+  Icon,
+  Stack,
   Table as T,
   Text,
-  Icon,
   Tooltip,
-  GridRow,
-  GridColumn,
-  AlertMessage,
 } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
-import {
-  CheckboxController,
-  DatePickerController,
-  FieldDescription,
-  InputController,
-  RadioController,
-  SelectController,
-} from '@island.is/shared/form-fields'
+import { FieldDescription } from '@island.is/shared/form-fields'
 import { FC, useState } from 'react'
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form'
-import { NationalIdWithName } from '@island.is/application/ui-components'
 import { handleCustomMappedValues } from './utils'
+import { Item } from './TableRepeaterItem'
 
 interface Props extends FieldBaseProps {
   field: TableRepeaterField
 }
 
-const componentMapper = {
-  input: InputController,
-  select: SelectController,
-  checkbox: CheckboxController,
-  date: DatePickerController,
-  radio: RadioController,
-  nationalIdWithName: NationalIdWithName,
-}
-
 export const TableRepeaterFormField: FC<Props> = ({
   application,
   field: data,
@@ -117,16 +100,6 @@ export const TableRepeaterFormField: FC<Props> = ({
     setActiveIndex(index)
   }
 
-  const getFieldError = (id: string) => {
-    /**
-     * Errors that occur in a field-array have incorrect typing
-     * This hack is needed to get the correct type
-     */
-    const errorList = error as unknown as Record<string, string>[] | undefined
-    const errors = errorList?.[activeIndex]
-    return errors?.[id]
-  }
-
   const formatTableValue = (key: string, item: Record<string, string>) => {
     const formatFn = table?.format?.[key]
     const formatted = formatFn ? formatFn(item[key]) : item[key]
@@ -242,102 +215,17 @@ export const TableRepeaterFormField: FC<Props> = ({
                 </Text>
               )}
               <GridRow rowGap={[2, 2, 2, 3]}>
-                {items.map((item) => {
-                  const {
-                    component,
-                    id: itemId,
-                    backgroundColor = 'blue',
-                    label = '',
-                    placeholder = '',
-                    options,
-                    width = 'full',
-                    condition,
-                    readonly = false,
-                    ...props
-                  } = item
-                  const isHalfColumn = component !== 'radio' && width === 'half'
-                  const isThirdColumn =
-                    component !== 'radio' && width === 'third'
-                  const span = isHalfColumn
-                    ? '1/2'
-                    : isThirdColumn
-                    ? '1/3'
-                    : '1/1'
-                  const Component = componentMapper[component]
-                  const id = `${data.id}[${activeIndex}].${itemId}`
-                  const activeValues =
-                    activeIndex >= 0 && values ? values[activeIndex] : undefined
-
-                  let translatedOptions: any = []
-                  if (typeof options === 'function') {
-                    translatedOptions = options(application, activeValues)
-                  } else {
-                    translatedOptions = options?.map((option) => ({
-                      ...option,
-                      label: formatText(
-                        option.label,
-                        application,
-                        formatMessage,
-                      ),
-                      ...(option.tooltip && {
-                        tooltip: formatText(
-                          option.tooltip,
-                          application,
-                          formatMessage,
-                        ),
-                      }),
-                    }))
-                  }
-
-                  let Readonly: boolean | undefined
-                  if (typeof readonly === 'function') {
-                    Readonly = readonly(application, activeValues)
-                  } else {
-                    Readonly = readonly
-                  }
-
-                  if (condition && !condition(application, activeValues)) {
-                    return null
-                  }
-
-                  return (
-                    <GridColumn key={id} span={['1/1', '1/1', '1/1', span]}>
-                      {component === 'radio' && label && (
-                        <Text
-                          variant="h4"
-                          as="h4"
-                          id={id + 'title'}
-                          marginBottom={3}
-                        >
-                          {formatText(label, application, formatMessage)}
-                        </Text>
-                      )}
-                      <Component
-                        id={id}
-                        name={id}
-                        label={formatText(label, application, formatMessage)}
-                        options={translatedOptions}
-                        placeholder={formatText(
-                          placeholder,
-                          application,
-                          formatMessage,
-                        )}
-                        split={width === 'half' ? '1/2' : '1/1'}
-                        error={getFieldError(itemId)}
-                        control={methods.control}
-                        readOnly={Readonly}
-                        backgroundColor={backgroundColor}
-                        onChange={() => {
-                          if (error) {
-                            methods.clearErrors(id)
-                          }
-                        }}
-                        application={application}
-                        {...props}
-                      />
-                    </GridColumn>
-                  )
-                })}
+                {items.map((item) => (
+                  <Item
+                    key={`${data.id}[${activeIndex}].${item.id}`}
+                    application={application}
+                    error={error}
+                    item={item}
+                    dataId={data.id}
+                    activeIndex={activeIndex}
+                    values={values}
+                  />
+                ))}
               </GridRow>
               <Box display="flex" justifyContent="flexEnd">
                 <Button
diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx
new file mode 100644
index 000000000000..0d602aea5f53
--- /dev/null
+++ b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx
@@ -0,0 +1,209 @@
+import { formatText, getValueViaPath } from '@island.is/application/core'
+import { Application, TableRepeaterItem } from '@island.is/application/types'
+import { GridColumn, Text } from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import { useEffect, useRef } from 'react'
+import { useFormContext } from 'react-hook-form'
+import isEqual from 'lodash/isEqual'
+import {
+  CheckboxController,
+  DatePickerController,
+  InputController,
+  RadioController,
+  SelectController,
+} from '@island.is/shared/form-fields'
+import { NationalIdWithName } from '@island.is/application/ui-components'
+
+interface ItemFieldProps {
+  application: Application
+  error?: string
+  item: TableRepeaterItem & { id: string }
+  dataId: string
+  activeIndex: number
+  values: Array<Record<string, string>>
+}
+
+const componentMapper = {
+  input: InputController,
+  select: SelectController,
+  checkbox: CheckboxController,
+  date: DatePickerController,
+  radio: RadioController,
+  nationalIdWithName: NationalIdWithName,
+}
+
+export const Item = ({
+  application,
+  error,
+  item,
+  dataId,
+  activeIndex,
+  values,
+}: ItemFieldProps) => {
+  const { formatMessage } = useLocale()
+  const { setValue, control, clearErrors } = useFormContext()
+  const prevWatchedValuesRef = useRef<string | (string | undefined)[]>()
+
+  const {
+    component,
+    id: itemId,
+    backgroundColor = 'blue',
+    label = '',
+    placeholder = '',
+    options,
+    width = 'full',
+    condition,
+    readonly = false,
+    updateValueObj,
+    defaultValue,
+    ...props
+  } = item
+  const isHalfColumn = component !== 'radio' && width === 'half'
+  const isThirdColumn = component !== 'radio' && width === 'third'
+  const span = isHalfColumn ? '1/2' : isThirdColumn ? '1/3' : '1/1'
+  const Component = componentMapper[component]
+  const id = `${dataId}[${activeIndex}].${itemId}`
+  const activeValues =
+    activeIndex >= 0 && values ? values[activeIndex] : undefined
+
+  let watchedValues: string | (string | undefined)[] | undefined
+  if (updateValueObj) {
+    const watchedValuesId =
+      typeof updateValueObj.watchValues === 'function'
+        ? updateValueObj.watchValues(activeValues)
+        : updateValueObj.watchValues
+
+    if (watchedValuesId) {
+      if (Array.isArray(watchedValuesId)) {
+        watchedValues = watchedValuesId.map((value) => {
+          return activeValues?.[`${value}`]
+        })
+      } else {
+        watchedValues = activeValues?.[`${watchedValuesId}`]
+      }
+    }
+  }
+
+  useEffect(() => {
+    // We need to deep compare the watched values to avoid unnecessary re-renders
+    if (
+      watchedValues &&
+      !isEqual(prevWatchedValuesRef.current, watchedValues)
+    ) {
+      prevWatchedValuesRef.current = watchedValues
+      if (
+        updateValueObj &&
+        watchedValues &&
+        (Array.isArray(watchedValues)
+          ? !watchedValues.every((value) => value === undefined)
+          : true)
+      ) {
+        const finalValue = updateValueObj.valueModifier(activeValues)
+        setValue(id, finalValue)
+      }
+    }
+  }, [watchedValues, updateValueObj, activeValues, setValue, id])
+
+  const getFieldError = (id: string) => {
+    /**
+     * Errors that occur in a field-array have incorrect typing
+     * This hack is needed to get the correct type
+     */
+    const errorList = error as unknown as Record<string, string>[] | undefined
+    const errors = errorList?.[activeIndex]
+    return errors?.[id]
+  }
+
+  const getDefaultValue = (
+    item: TableRepeaterItem,
+    application: Application,
+    activeField?: Record<string, string>,
+  ) => {
+    const { defaultValue } = item
+
+    if (defaultValue === undefined) {
+      return undefined
+    }
+
+    return defaultValue(application, activeField)
+  }
+
+  let translatedOptions: any = []
+  if (typeof options === 'function') {
+    translatedOptions = options(application, activeValues)
+  } else {
+    translatedOptions = options?.map((option) => ({
+      ...option,
+      label: formatText(option.label, application, formatMessage),
+      ...(option.tooltip && {
+        tooltip: formatText(option.tooltip, application, formatMessage),
+      }),
+    }))
+  }
+
+  let Readonly: boolean | undefined
+  if (typeof readonly === 'function') {
+    Readonly = readonly(application, activeValues)
+  } else {
+    Readonly = readonly
+  }
+
+  let DefaultValue: any
+  if (component === 'input') {
+    DefaultValue = getDefaultValue(item, application, activeValues)
+  }
+  if (component === 'select') {
+    DefaultValue =
+      getValueViaPath(application.answers, id) ??
+      getDefaultValue(item, application, activeValues)
+  }
+  if (component === 'radio') {
+    DefaultValue =
+      (getValueViaPath(application.answers, id) as string[]) ??
+      getDefaultValue(item, application, activeValues)
+  }
+  if (component === 'checkbox') {
+    DefaultValue =
+      (getValueViaPath(application.answers, id) as string[]) ??
+      getDefaultValue(item, application, activeValues)
+  }
+  if (component === 'date') {
+    DefaultValue =
+      (getValueViaPath(application.answers, id) as string) ??
+      getDefaultValue(item, application, activeValues)
+  }
+
+  if (condition && !condition(application, activeValues)) {
+    return null
+  }
+
+  return (
+    <GridColumn span={['1/1', '1/1', '1/1', span]}>
+      {component === 'radio' && label && (
+        <Text variant="h4" as="h4" id={id + 'title'} marginBottom={3}>
+          {formatText(label, application, formatMessage)}
+        </Text>
+      )}
+      <Component
+        id={id}
+        name={id}
+        label={formatText(label, application, formatMessage)}
+        options={translatedOptions}
+        placeholder={formatText(placeholder, application, formatMessage)}
+        split={width === 'half' ? '1/2' : '1/1'}
+        error={getFieldError(itemId)}
+        control={control}
+        readOnly={Readonly}
+        backgroundColor={backgroundColor}
+        onChange={() => {
+          if (error) {
+            clearErrors(id)
+          }
+        }}
+        application={application}
+        defaultValue={DefaultValue}
+        {...props}
+      />
+    </GridColumn>
+  )
+}
diff --git a/libs/application/ui-fields/src/lib/TextFormField/TextFormField.tsx b/libs/application/ui-fields/src/lib/TextFormField/TextFormField.tsx
index 286433b51afb..601072acce6c 100644
--- a/libs/application/ui-fields/src/lib/TextFormField/TextFormField.tsx
+++ b/libs/application/ui-fields/src/lib/TextFormField/TextFormField.tsx
@@ -39,6 +39,8 @@ export const TextFormField: FC<React.PropsWithChildren<Props>> = ({
     maxLength,
     dataTestId,
     rightAlign,
+    max,
+    min,
     onChange = () => undefined,
   } = field
   const { clearErrors } = useFormContext()
@@ -89,6 +91,8 @@ export const TextFormField: FC<React.PropsWithChildren<Props>> = ({
           rows={rows}
           required={required}
           rightAlign={rightAlign}
+          max={max}
+          min={min}
         />
       </Box>
     </div>
diff --git a/libs/application/ui-forms/src/lib/formConclusionSection/formConclusionSection.ts b/libs/application/ui-forms/src/lib/formConclusionSection/formConclusionSection.ts
index 9aa3b5b5eb4e..c479c4e0a9dd 100644
--- a/libs/application/ui-forms/src/lib/formConclusionSection/formConclusionSection.ts
+++ b/libs/application/ui-forms/src/lib/formConclusionSection/formConclusionSection.ts
@@ -19,7 +19,7 @@ type Props = Partial<{
   secondButtonLabel: StaticText
   secondButtonMessage: StaticText
   expandableHeader: FormText
-  expandableIntro: StaticText
+  expandableIntro: FormText
   expandableDescription: FormText
   conclusionLinkS3FileKey: FormText
   conclusionLink: string
diff --git a/libs/application/ui-shell/src/components/FormExternalDataProvider.tsx b/libs/application/ui-shell/src/components/FormExternalDataProvider.tsx
index 015f175e4423..f0df2dd44771 100644
--- a/libs/application/ui-shell/src/components/FormExternalDataProvider.tsx
+++ b/libs/application/ui-shell/src/components/FormExternalDataProvider.tsx
@@ -30,11 +30,12 @@ import {
 import { UPDATE_APPLICATION_EXTERNAL_DATA } from '@island.is/application/graphql'
 import { useLocale } from '@island.is/localization'
 
-import { ExternalDataProviderScreen } from '../types'
+import { ExternalDataProviderScreen, MOCKPAYMENT } from '../types'
 import { verifyExternalData } from '../utils'
 
 import { handleServerError } from '@island.is/application/ui-components'
 import { ProviderErrorReason } from '@island.is/shared/problem'
+import { isRunningOnEnvironment } from '@island.is/shared/utils'
 
 const ItemHeader: React.FC<
   React.PropsWithChildren<{
@@ -193,6 +194,7 @@ const FormExternalDataProvider: FC<
     addExternalData(data: ExternalData): void
     setBeforeSubmitCallback: SetBeforeSubmitCallback
     externalData: ExternalData
+    enableMockPayment?: boolean
     externalDataProvider: ExternalDataProviderScreen
     formValue: FormValue
     errors: RecordObject
@@ -202,6 +204,7 @@ const FormExternalDataProvider: FC<
   setBeforeSubmitCallback,
   application,
   applicationId,
+  enableMockPayment = false,
   externalData,
   externalDataProvider,
   formValue,
@@ -351,6 +354,38 @@ const FormExternalDataProvider: FC<
           )
         }}
       />
+      {enableMockPayment &&
+        (isRunningOnEnvironment('dev') || isRunningOnEnvironment('local')) && (
+          <Controller
+            name={MOCKPAYMENT}
+            defaultValue={getValueViaPath(
+              formValue,
+              MOCKPAYMENT as string,
+              false,
+            )}
+            render={({ field: { onChange, value } }) => {
+              return (
+                <Box marginTop={2}>
+                  <Checkbox
+                    large={true}
+                    onChange={(e) => {
+                      const isChecked = e.target.checked
+                      clearErrors(MOCKPAYMENT)
+                      setValue(MOCKPAYMENT as string, isChecked)
+                      onChange(isChecked)
+                    }}
+                    checked={value}
+                    backgroundColor="blue"
+                    dataTestId="enable-mock-payment"
+                    name={MOCKPAYMENT}
+                    label={<Markdown>{'Enable mock payment'}</Markdown>}
+                    value={MOCKPAYMENT}
+                  />
+                </Box>
+              )
+            }}
+          />
+        )}
     </Box>
   )
 }
diff --git a/libs/application/ui-shell/src/components/Screen.tsx b/libs/application/ui-shell/src/components/Screen.tsx
index 850aa2b479a2..e6b2f583b09d 100644
--- a/libs/application/ui-shell/src/components/Screen.tsx
+++ b/libs/application/ui-shell/src/components/Screen.tsx
@@ -375,6 +375,7 @@ const Screen: FC<React.PropsWithChildren<ScreenProps>> = ({
                 application={application}
                 addExternalData={addExternalData}
                 setBeforeSubmitCallback={setBeforeSubmitCallback}
+                enableMockPayment={screen.enableMockPayment}
                 applicationId={applicationId}
                 externalData={externalData}
                 externalDataProvider={screen}
diff --git a/libs/application/ui-shell/src/types.ts b/libs/application/ui-shell/src/types.ts
index 462296b5a2a2..646d90c7aef9 100644
--- a/libs/application/ui-shell/src/types.ts
+++ b/libs/application/ui-shell/src/types.ts
@@ -60,3 +60,5 @@ export type DelegationsScreenDataType = {
   authDelegations?: Delegation[]
   templateName?: StaticText
 }
+
+export const MOCKPAYMENT = 'shouldUseMockPayment'
diff --git a/libs/application/ui-shell/src/utils.ts b/libs/application/ui-shell/src/utils.ts
index 5e73a9e6f0c1..7c6f2667d894 100644
--- a/libs/application/ui-shell/src/utils.ts
+++ b/libs/application/ui-shell/src/utils.ts
@@ -8,7 +8,7 @@ import {
   RecordObject,
   SubmitField,
 } from '@island.is/application/types'
-import { FormScreen } from './types'
+import { FormScreen, MOCKPAYMENT } from './types'
 import pick from 'lodash/pick'
 import get from 'lodash/get'
 
@@ -114,6 +114,8 @@ export function extractAnswersToSubmitFromScreen(
   }
 
   switch (screen.type) {
+    case FormItemTypes.EXTERNAL_DATA_PROVIDER:
+      return pick(data, [screenId, MOCKPAYMENT])
     case FormItemTypes.MULTI_FIELD:
       return pick(
         data,
diff --git a/libs/auth-api-lib/jest.config.ts b/libs/auth-api-lib/jest.config.ts
index 6e3c2e78bb62..c4ec1e1cd478 100644
--- a/libs/auth-api-lib/jest.config.ts
+++ b/libs/auth-api-lib/jest.config.ts
@@ -4,7 +4,6 @@ export default {
   rootDir: '../..',
   roots: [__dirname],
   globalSetup: `${__dirname}/test/globalSetup.ts`,
-  globalTeardown: `${__dirname}/test/globalTeardown.ts`,
   transform: {
     '^.+\\.[tj]sx?$': [
       'ts-jest',
diff --git a/libs/auth-api-lib/seeders/data/scope-law-and-order.ts b/libs/auth-api-lib/seeders/data/scope-law-and-order.ts
index 08f38aacb4ca..c55f4482a26b 100644
--- a/libs/auth-api-lib/seeders/data/scope-law-and-order.ts
+++ b/libs/auth-api-lib/seeders/data/scope-law-and-order.ts
@@ -1,9 +1,12 @@
-import { createScope } from './helpers'
+import { compose, createScope } from './helpers'
 
-createScope({
-  name: '@rettarvorslugatt.island.is/law-and-order',
-  displayName: 'Dómsmál og fyrirköll',
-  description: 'Bakendascope fyrir dómsmála virkni á mínum síðum',
-  accessControlled: false,
-  addToClients: ['@island.is/clients/api'],
-})
+export const up = compose(
+  createScope({
+    name: '@rettarvorslugatt.island.is/law-and-order',
+    displayName: 'Dómsmál og fyrirköll',
+    description: 'Bakendascope fyrir dómsmála virkni á mínum síðum',
+    accessControlled: false,
+    addToClients: ['@island.is/clients/api'],
+    addToResource: '@island.is',
+  }),
+)
diff --git a/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts b/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts
index f4a6bce0183f..5fac1d7c9def 100644
--- a/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts
+++ b/libs/auth-api-lib/src/lib/delegations/delegations-index.service.ts
@@ -1,8 +1,9 @@
 import { BadRequestException, Injectable } from '@nestjs/common'
 import { InjectModel } from '@nestjs/sequelize'
-import { Op } from 'sequelize'
-import * as kennitala from 'kennitala'
 import startOfDay from 'date-fns/startOfDay'
+import * as kennitala from 'kennitala'
+import union from 'lodash/union'
+import { Op } from 'sequelize'
 
 import { User } from '@island.is/auth-nest-tools'
 import {
@@ -11,20 +12,22 @@ import {
   getPersonalRepresentativeDelegationType,
 } from '@island.is/shared/types'
 
-import { ApiScope } from '../resources/models/api-scope.model'
 import { PersonalRepresentativeScopePermissionService } from '../personal-representative/services/personal-representative-scope-permission.service'
-import { DelegationIndex } from './models/delegation-index.model'
-import { DelegationIndexMeta } from './models/delegation-index-meta.model'
-import { DelegationDTO } from './dto/delegation.dto'
+import { ApiScope } from '../resources/models/api-scope.model'
+import { UserIdentitiesService } from '../user-identities/user-identities.service'
+import { IncomingDelegationsCompanyService } from './delegations-incoming-company.service'
+import { DelegationsIncomingCustomService } from './delegations-incoming-custom.service'
+import { DelegationsIncomingRepresentativeService } from './delegations-incoming-representative.service'
+import { DelegationsIncomingWardService } from './delegations-incoming-ward.service'
 import {
   DelegationRecordDTO,
   DelegationRecordInputDTO,
   PaginatedDelegationRecordDTO,
 } from './dto/delegation-index.dto'
-import { DelegationsIncomingCustomService } from './delegations-incoming-custom.service'
-import { DelegationsIncomingRepresentativeService } from './delegations-incoming-representative.service'
-import { IncomingDelegationsCompanyService } from './delegations-incoming-company.service'
-import { DelegationsIncomingWardService } from './delegations-incoming-ward.service'
+import { DelegationDTO } from './dto/delegation.dto'
+import { DelegationIndexMeta } from './models/delegation-index-meta.model'
+import { DelegationIndex } from './models/delegation-index.model'
+import { DelegationDirection } from './types/delegationDirection'
 import {
   DelegationRecordType,
   PersonalRepresentativeDelegationType,
@@ -34,8 +37,6 @@ import {
   validateDelegationTypeAndProvider,
   validateToAndFromNationalId,
 } from './utils/delegations'
-import { DelegationDirection } from './types/delegationDirection'
-import { UserIdentitiesService } from '../user-identities/user-identities.service'
 
 const TEN_MINUTES = 1000 * 60 * 10
 const ONE_WEEK = 1000 * 60 * 60 * 24 * 7
@@ -440,9 +441,29 @@ export class DelegationsIndexService {
   }
 
   private async getCustomDelegations(nationalId: string, useMaster = false) {
-    return this.delegationsIncomingCustomService
-      .findAllValidIncoming({ nationalId }, useMaster)
-      .then((d) => d.map(toDelegationIndexInfo))
+    const delegations =
+      await this.delegationsIncomingCustomService.findAllValidIncoming(
+        { nationalId },
+        useMaster,
+      )
+
+    // Merge delegations by `fromNationalId`, combining scopes if necessary
+    const delegationMap = new Map()
+
+    delegations.forEach((delegation) => {
+      const existing = delegationMap.get(delegation.fromNationalId)
+
+      if (existing) {
+        existing.scopes = union(existing.scopes, delegation.scopes)
+      } else {
+        delegationMap.set(delegation.fromNationalId, delegation)
+      }
+    })
+
+    // Convert the map back to an array
+    const mergedDelegations = Array.from(delegationMap.values())
+
+    return mergedDelegations.map(toDelegationIndexInfo)
   }
 
   private async getRepresentativeDelegations(
diff --git a/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts b/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts
index ad467497963d..8412fc236318 100644
--- a/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts
+++ b/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts
@@ -221,6 +221,7 @@ export class AdminScopeService {
       include: [
         { model: ApiScopeDelegationType, as: 'supportedDelegationTypes' },
       ],
+      useMaster: true,
     })
 
     if (!apiScope) {
diff --git a/libs/auth-api-lib/test/globalTeardown.ts b/libs/auth-api-lib/test/globalTeardown.ts
deleted file mode 100644
index 3c68a8d91879..000000000000
--- a/libs/auth-api-lib/test/globalTeardown.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { register } from 'tsconfig-paths'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const tsConfig = require(`../${require('../tsconfig.json').extends}`)
-register({ baseUrl: './', paths: tsConfig.compilerOptions.paths })
-import { stopPostgres } from '@island.is/testing/containers'
-
-export default async () => {
-  await stopPostgres()
-}
diff --git a/libs/cache/src/lib/cache.ts b/libs/cache/src/lib/cache.ts
index 41e8717f98d1..f6eda60fd8a8 100644
--- a/libs/cache/src/lib/cache.ts
+++ b/libs/cache/src/lib/cache.ts
@@ -4,6 +4,8 @@ import { caching } from 'cache-manager'
 import type { Config } from 'cache-manager'
 import { redisInsStore } from 'cache-manager-ioredis-yet'
 import { Cluster, ClusterNode, RedisOptions, ClusterOptions } from 'ioredis'
+import { DEFAULT_CLUSTER_OPTIONS } from 'ioredis/built/cluster/ClusterOptions'
+
 import { logger } from '@island.is/logging'
 import Keyv from 'keyv'
 
@@ -140,7 +142,7 @@ export const createRedisApolloCache = (options: Options) => {
   )
 }
 
-export const createRedisCluster = (options: Options): Cluster => {
+export const createRedisCluster = (options: Options) => {
   const nodes = parseNodes(options.nodes)
   logger.info(`Making caching connection with nodes: `, nodes)
   return new Cluster(nodes, getRedisClusterOptions(options))
diff --git a/libs/clients/data-protection-complaint/src/lib/data-protection-complaint.module.ts b/libs/clients/data-protection-complaint/src/lib/data-protection-complaint.module.ts
index c1f5f9a90773..6fe914b8ae45 100644
--- a/libs/clients/data-protection-complaint/src/lib/data-protection-complaint.module.ts
+++ b/libs/clients/data-protection-complaint/src/lib/data-protection-complaint.module.ts
@@ -6,7 +6,6 @@ import { exportedApis } from './apis'
 import { ApiConfiguration } from './apiConfiguration'
 import { ConfigType } from '@island.is/nest/config'
 import { DataProtectionComplaintClientConfig } from './data-protection-complaint-client.config'
-import { AwsModule, AwsService } from '@island.is/nest/aws'
 
 @Module({
   exports: [...exportedApis, TokenMiddleware],
diff --git a/libs/clients/mms/grade/.eslintrc.json b/libs/clients/mms/grade/.eslintrc.json
new file mode 100644
index 000000000000..632e9b0e2225
--- /dev/null
+++ b/libs/clients/mms/grade/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/clients/mms/grade/README.md b/libs/clients/mms/grade/README.md
new file mode 100644
index 000000000000..874e139c470f
--- /dev/null
+++ b/libs/clients/mms/grade/README.md
@@ -0,0 +1,7 @@
+# clients-mms-grade - Primary school data
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test clients-mms-grade` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/clients/mms/grade/jest.config.ts b/libs/clients/mms/grade/jest.config.ts
new file mode 100644
index 000000000000..b4f731191b1b
--- /dev/null
+++ b/libs/clients/mms/grade/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'clients-mms-grade',
+  preset: '../../../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../../coverage/libs/clients/mms/grade',
+}
diff --git a/libs/clients/mms/grade/project.json b/libs/clients/mms/grade/project.json
new file mode 100644
index 000000000000..d1cf37eeff34
--- /dev/null
+++ b/libs/clients/mms/grade/project.json
@@ -0,0 +1,37 @@
+{
+  "name": "clients-mms-grade",
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/clients/mms/grade/src",
+  "projectType": "library",
+  "tags": ["lib:client", "scope:client"],
+  "targets": {
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/clients/mms/grade/jest.config.ts"
+      }
+    },
+    "update-openapi-document": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "curl -H \"X-Road-Client: IS-DEV/GOV/10000/island-is-client\" http://localhost:8081/r1/IS-DEV/GOV/10066/MMS-Protected/getOpenAPI?serviceCode=grade-api-v1 > src/clientConfig.json",
+          "prettier --write src/clientConfig.json"
+        ],
+        "parallel": false,
+        "cwd": "libs/clients/mms/grade"
+      }
+    },
+    "codegen/backend-client": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn openapi-generator -o libs/clients/mms/grade/gen/fetch -i libs/clients/mms/grade/src/clientConfig.json"
+      },
+      "outputs": ["{projectRoot}/gen/fetch"]
+    }
+  }
+}
diff --git a/libs/clients/mms/grade/src/clientConfig.json b/libs/clients/mms/grade/src/clientConfig.json
new file mode 100644
index 000000000000..f33e53285b0c
--- /dev/null
+++ b/libs/clients/mms/grade/src/clientConfig.json
@@ -0,0 +1,267 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Grade API",
+    "description": "This is the API for the Grade system.",
+    "version": "1.0",
+    "contact": {}
+  },
+  "tags": [{ "name": "grade-api", "description": "" }],
+  "servers": [],
+  "components": {
+    "schemas": {
+      "Liveness": {
+        "type": "object",
+        "properties": { "ok": { "type": "boolean" } },
+        "required": ["ok"]
+      },
+      "Version": {
+        "type": "object",
+        "properties": { "version": { "type": "string" } },
+        "required": ["version"]
+      },
+      "GradeResultViewModel": {
+        "type": "object",
+        "properties": {
+          "einkunn": { "type": "string" },
+          "heiti": { "type": "string" },
+          "vaegi": { "type": "number" }
+        },
+        "required": ["einkunn", "heiti", "vaegi"]
+      },
+      "EnglishGradeViewModel": {
+        "type": "object",
+        "properties": {
+          "dagsetning": { "format": "date-time", "type": "string" },
+          "haefnieinkunn": { "type": "string" },
+          "haefnieinkunnStada": { "type": "string" },
+          "framfaraTexti": { "type": "string" },
+          "lesskilningur": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "malnotkun": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "samtals": { "$ref": "#/components/schemas/GradeResultViewModel" }
+        },
+        "required": [
+          "dagsetning",
+          "haefnieinkunn",
+          "haefnieinkunnStada",
+          "framfaraTexti",
+          "lesskilningur",
+          "malnotkun",
+          "samtals"
+        ]
+      },
+      "IcelandicGradeViewModel": {
+        "type": "object",
+        "properties": {
+          "dagsetning": { "format": "date-time", "type": "string" },
+          "haefnieinkunn": { "type": "string" },
+          "haefnieinkunnStada": { "type": "string" },
+          "framfaraTexti": { "type": "string" },
+          "lesskilningur": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "malnotkun": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "samtals": { "$ref": "#/components/schemas/GradeResultViewModel" }
+        },
+        "required": [
+          "dagsetning",
+          "haefnieinkunn",
+          "haefnieinkunnStada",
+          "framfaraTexti",
+          "lesskilningur",
+          "malnotkun",
+          "samtals"
+        ]
+      },
+      "MathGradeViewModel": {
+        "type": "object",
+        "properties": {
+          "dagsetning": { "format": "date-time", "type": "string" },
+          "haefnieinkunn": { "type": "string" },
+          "haefnieinkunnStada": { "type": "string" },
+          "framfaraTexti": { "type": "string" },
+          "reikningurOgAdgerdir": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "rumfraedi": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "algebra": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "hlutfollOgProsentur": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "tolurOgTalnaskilningur": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "samtals": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "ordOgTalnadaemi": { "type": "string" }
+        },
+        "required": [
+          "dagsetning",
+          "haefnieinkunn",
+          "haefnieinkunnStada",
+          "framfaraTexti",
+          "reikningurOgAdgerdir",
+          "rumfraedi",
+          "algebra",
+          "hlutfollOgProsentur",
+          "tolurOgTalnaskilningur",
+          "samtals",
+          "ordOgTalnadaemi"
+        ]
+      },
+      "GradeViewModel": {
+        "type": "object",
+        "properties": {
+          "heiti": { "type": "string" },
+          "dagsetning": { "format": "date-time", "type": "string" },
+          "haefnieinkunn": { "type": "string" },
+          "haefnieinkunnStada": { "type": "string" },
+          "samtals": {
+            "$ref": "#/components/schemas/GradeTypeResultViewModel"
+          },
+          "framfaraTexti": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          },
+          "einkunnir": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/GradeTypeResultViewModel" }
+          },
+          "ordOgTalnadaemi": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          }
+        },
+        "required": [
+          "heiti",
+          "dagsetning",
+          "haefnieinkunn",
+          "haefnieinkunnStada",
+          "samtals",
+          "framfaraTexti",
+          "einkunnir",
+          "ordOgTalnadaemi"
+        ]
+      },
+      "StudentAssessmentViewModel": {
+        "type": "object",
+        "properties": {
+          "einkunnir": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/CourseViewModel" }
+          }
+        },
+        "required": ["einkunnir"]
+      },
+      "GradeTypeResultViewModel": {
+        "type": "object",
+        "properties": {
+          "heiti": { "type": "string" },
+          "radeinkunn": { "$ref": "#/components/schemas/GradeResultViewModel" },
+          "grunnskolaeinkunn": {
+            "$ref": "#/components/schemas/GradeResultViewModel"
+          }
+        },
+        "required": ["heiti", "radeinkunn", "grunnskolaeinkunn"]
+      },
+      "CourseViewModel": {
+        "type": "object",
+        "properties": {
+          "bekkur": { "type": "number" },
+          "namsgreinar": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/GradeViewModel" }
+          }
+        },
+        "required": ["bekkur", "namsgreinar"]
+      }
+    }
+  },
+  "paths": {
+    "/liveness": {
+      "get": {
+        "operationId": "InfraController_liveness",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/Liveness" }
+              }
+            }
+          }
+        },
+        "tags": ["internal"]
+      }
+    },
+    "/version": {
+      "get": {
+        "operationId": "InfraController_version",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/Version" }
+              }
+            }
+          }
+        },
+        "tags": ["internal"]
+      }
+    },
+    "/api/public/studentAssessments/{nationalId}": {
+      "get": {
+        "operationId": "PublicGradeController_getStudentAssessment",
+        "parameters": [
+          {
+            "name": "nationalId",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StudentAssessmentViewModel"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["grades"]
+      }
+    },
+    "/api/v2/public/studentAssessments/{nationalId}": {
+      "get": {
+        "operationId": "PublicGradeV2Controller_getStudentAssessment",
+        "parameters": [
+          {
+            "name": "nationalId",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StudentAssessmentViewModel"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["grades"]
+      }
+    }
+  }
+}
diff --git a/libs/clients/mms/grade/src/index.ts b/libs/clients/mms/grade/src/index.ts
new file mode 100644
index 000000000000..9258398a5ce7
--- /dev/null
+++ b/libs/clients/mms/grade/src/index.ts
@@ -0,0 +1,5 @@
+export { GradesClientModule } from './lib/gradeClient.module'
+export { GradeClientConfig } from './lib/gradeClient.config'
+export { GradeClientService } from './lib/gradeClient.service'
+export { StudentAssessmentsDto } from './lib/dto/familyAssessments.dto'
+export { StudentAssessmentViewModel } from '../gen/fetch/models/StudentAssessmentViewModel'
diff --git a/libs/clients/mms/grade/src/lib/dto/course.dto.ts b/libs/clients/mms/grade/src/lib/dto/course.dto.ts
new file mode 100644
index 000000000000..942a326c4033
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/dto/course.dto.ts
@@ -0,0 +1,30 @@
+import { GradeViewModel } from '../../../gen/fetch'
+import {
+  CourseGradeHistoryDto,
+  mapCourseGradeHistoryDto,
+} from './courseGradeHistory.dto'
+import { GradeResultDto, mapGradeResultDto } from './gradeResult.dto'
+
+export interface CourseDto {
+  title: string
+  date: Date
+  competencyGrade: string
+  competencyGradeStatus: string
+  gradeHistory: CourseGradeHistoryDto
+  improvement: GradeResultDto
+  grades: Array<CourseGradeHistoryDto>
+  wordsAndNumberProblemsGrade: GradeResultDto
+}
+
+export const mapCourseDto = (data: GradeViewModel): CourseDto => {
+  return {
+    title: data.heiti,
+    date: data.dagsetning,
+    competencyGrade: data.haefnieinkunn,
+    competencyGradeStatus: data.haefnieinkunnStada,
+    gradeHistory: mapCourseGradeHistoryDto(data.samtals),
+    improvement: mapGradeResultDto(data.framfaraTexti),
+    grades: data.einkunnir.map((e) => mapCourseGradeHistoryDto(e)),
+    wordsAndNumberProblemsGrade: mapGradeResultDto(data.ordOgTalnadaemi),
+  }
+}
diff --git a/libs/clients/mms/grade/src/lib/dto/courseGradeHistory.dto.ts b/libs/clients/mms/grade/src/lib/dto/courseGradeHistory.dto.ts
new file mode 100644
index 000000000000..3041f9cb8661
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/dto/courseGradeHistory.dto.ts
@@ -0,0 +1,20 @@
+import { GradeTypeResultViewModel } from '../../../gen/fetch'
+import { GradeResultDto, mapGradeResultDto } from './gradeResult.dto'
+
+export interface CourseGradeHistoryDto {
+  title: string
+  /** (isl: Grunnskólaeinkunn) */
+  compulsorySchoolGrade: GradeResultDto
+  /** Compulsory school grades when compared nationally (isl: Raðeinkunn)*/
+  nationalCoordinationGrade: GradeResultDto
+}
+
+export const mapCourseGradeHistoryDto = (
+  data: GradeTypeResultViewModel,
+): CourseGradeHistoryDto => {
+  return {
+    title: data.heiti,
+    compulsorySchoolGrade: mapGradeResultDto(data.grunnskolaeinkunn),
+    nationalCoordinationGrade: mapGradeResultDto(data.radeinkunn),
+  }
+}
diff --git a/libs/clients/mms/grade/src/lib/dto/familyAssessments.dto.ts b/libs/clients/mms/grade/src/lib/dto/familyAssessments.dto.ts
new file mode 100644
index 000000000000..7b07770a3a13
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/dto/familyAssessments.dto.ts
@@ -0,0 +1,44 @@
+import { CourseViewModel } from '../../../gen/fetch'
+import {
+  StudentGradeLevelAssessmentDto,
+  mapStudentGradeLevelAssessmentDto,
+} from './studentGradeLevelAssessment.dto'
+
+export interface StudentAssessmentsDto {
+  name: string
+  nationalId: string
+  assessmentsOverview: {
+    assessmentsYearSpan: {
+      firstAssessmentYear: Date
+      lastAssessmentYear: Date
+    }
+    assessments: Array<StudentGradeLevelAssessmentDto>
+  }
+}
+
+export const mapStudentAssessmentsDto = (
+  studentName: string,
+  studentNationalId: string,
+  assessments: Array<CourseViewModel>,
+): StudentAssessmentsDto => {
+  const examDates = assessments.flatMap((a) =>
+    a.namsgreinar.map((n) => n.dagsetning),
+  )
+  return {
+    name: studentName,
+    nationalId: studentNationalId,
+    assessmentsOverview: {
+      assessmentsYearSpan: {
+        firstAssessmentYear: examDates.reduce(
+          (earliest, current) => (current < earliest ? current : earliest),
+          examDates[0],
+        ),
+        lastAssessmentYear: examDates.reduce(
+          (latest, current) => (current > latest ? current : latest),
+          examDates[0],
+        ),
+      },
+      assessments: assessments.map((a) => mapStudentGradeLevelAssessmentDto(a)),
+    },
+  }
+}
diff --git a/libs/clients/mms/grade/src/lib/dto/gradeResult.dto.ts b/libs/clients/mms/grade/src/lib/dto/gradeResult.dto.ts
new file mode 100644
index 000000000000..ad89a1c042ae
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/dto/gradeResult.dto.ts
@@ -0,0 +1,18 @@
+import { GradeResultViewModel } from '../../../gen/fetch'
+
+export interface GradeResultDto {
+  title: string
+  grade: string
+  /** The weight value for calculating the importance of a grade (isl: Vægi) */
+  weight: number
+}
+
+export const mapGradeResultDto = (
+  data: GradeResultViewModel,
+): GradeResultDto => {
+  return {
+    title: data.heiti,
+    grade: data.einkunn,
+    weight: data.vaegi,
+  }
+}
diff --git a/libs/clients/mms/grade/src/lib/dto/studentGradeLevelAssessment.dto.ts b/libs/clients/mms/grade/src/lib/dto/studentGradeLevelAssessment.dto.ts
new file mode 100644
index 000000000000..0bfab18e18d2
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/dto/studentGradeLevelAssessment.dto.ts
@@ -0,0 +1,16 @@
+import { CourseViewModel } from '../../../gen/fetch'
+import { CourseDto, mapCourseDto } from './course.dto'
+
+export interface StudentGradeLevelAssessmentDto {
+  gradeLevel: number
+  courses: Array<CourseDto>
+}
+
+export const mapStudentGradeLevelAssessmentDto = (
+  data: CourseViewModel,
+): StudentGradeLevelAssessmentDto => {
+  return {
+    gradeLevel: data.bekkur,
+    courses: data.namsgreinar.map((ng) => mapCourseDto(ng)),
+  }
+}
diff --git a/libs/clients/mms/grade/src/lib/gradeClient.config.ts b/libs/clients/mms/grade/src/lib/gradeClient.config.ts
new file mode 100644
index 000000000000..0e2607debb11
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/gradeClient.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from '@island.is/nest/config'
+import * as z from 'zod'
+
+const schema = z.object({
+  xRoadServicePath: z.string(),
+})
+
+export const GradeClientConfig = defineConfig<z.infer<typeof schema>>({
+  name: 'GradeClientConfig',
+  schema,
+  load(env) {
+    return {
+      xRoadServicePath: env.required(
+        'XROAD_MMS_GRADE_SERVICE_ID',
+        'IS-DEV/GOV/10066/MMS-Protected/grade-api-v1',
+      ),
+    }
+  },
+})
diff --git a/libs/clients/mms/grade/src/lib/gradeClient.module.ts b/libs/clients/mms/grade/src/lib/gradeClient.module.ts
new file mode 100644
index 000000000000..ac5f2d670d4b
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/gradeClient.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common'
+import { GradeClientProvider } from './gradeClient.provider'
+import { GradeClientService } from './gradeClient.service'
+import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
+
+@Module({
+  imports: [NationalRegistryV3ClientModule],
+  providers: [GradeClientProvider, GradeClientService],
+  exports: [GradeClientService],
+})
+export class GradesClientModule {}
diff --git a/libs/clients/mms/grade/src/lib/gradeClient.provider.ts b/libs/clients/mms/grade/src/lib/gradeClient.provider.ts
new file mode 100644
index 000000000000..b844d45a5e62
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/gradeClient.provider.ts
@@ -0,0 +1,43 @@
+import { createEnhancedFetch } from '@island.is/clients/middlewares'
+import { Provider } from '@nestjs/common'
+import { Configuration, GradesApi } from '../../gen/fetch'
+import {
+  ConfigType,
+  IdsClientConfig,
+  LazyDuringDevScope,
+  XRoadConfig,
+} from '@island.is/nest/config'
+import { GradeClientConfig } from './gradeClient.config'
+
+export const GradeClientProvider: Provider<GradesApi> = {
+  provide: GradesApi,
+  scope: LazyDuringDevScope,
+  useFactory: (
+    xroadConfig: ConfigType<typeof XRoadConfig>,
+    config: ConfigType<typeof GradeClientConfig>,
+    idsClientConfig: ConfigType<typeof IdsClientConfig>,
+  ) =>
+    new GradesApi(
+      new Configuration({
+        fetchApi: createEnhancedFetch({
+          name: 'clients-mms-grade',
+          organizationSlug: 'menntamalastofnun',
+          autoAuth: idsClientConfig.isConfigured
+            ? {
+                mode: 'tokenExchange',
+                issuer: idsClientConfig.issuer,
+                clientId: idsClientConfig.clientId,
+                clientSecret: idsClientConfig.clientSecret,
+                scope: [],
+              }
+            : undefined,
+        }),
+        basePath: `${xroadConfig.xRoadBasePath}/r1/${config.xRoadServicePath}`,
+        headers: {
+          'X-Road-Client': xroadConfig.xRoadClient,
+          Accept: 'application/json',
+        },
+      }),
+    ),
+  inject: [XRoadConfig.KEY, GradeClientConfig.KEY, IdsClientConfig.KEY],
+}
diff --git a/libs/clients/mms/grade/src/lib/gradeClient.service.ts b/libs/clients/mms/grade/src/lib/gradeClient.service.ts
new file mode 100644
index 000000000000..aa74f0b864e9
--- /dev/null
+++ b/libs/clients/mms/grade/src/lib/gradeClient.service.ts
@@ -0,0 +1,95 @@
+import { Auth, AuthMiddleware, User } from '@island.is/auth-nest-tools'
+import { Inject, Injectable } from '@nestjs/common'
+import { GradesApi } from '../../gen/fetch'
+import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
+import {
+  StudentGradeLevelAssessmentDto,
+  mapStudentGradeLevelAssessmentDto,
+} from './dto/studentGradeLevelAssessment.dto'
+import {
+  StudentAssessmentsDto,
+  mapStudentAssessmentsDto,
+} from './dto/familyAssessments.dto'
+import { isDefined } from '@island.is/shared/utils'
+import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
+
+const LOG_CATEGORY = 'clients-mms-grade'
+
+@Injectable()
+export class GradeClientService {
+  constructor(
+    private readonly api: GradesApi,
+    private readonly nationalRegistryService: NationalRegistryV3ClientService,
+    @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
+  ) {}
+
+  private apiWithAuth = (user: User) =>
+    this.api.withMiddleware(new AuthMiddleware(user as Auth))
+
+  async getStudentAssessments(
+    user: User,
+  ): Promise<Array<StudentGradeLevelAssessmentDto>> {
+    const data = await this.apiWithAuth(
+      user,
+    ).publicGradeV2ControllerGetStudentAssessment({
+      nationalId: user.nationalId,
+    })
+
+    return data.einkunnir.map((e) => mapStudentGradeLevelAssessmentDto(e))
+  }
+
+  async getUserFamilyStudentAssessments(
+    user: User,
+  ): Promise<Array<StudentAssessmentsDto> | null> {
+    const userData = await this.nationalRegistryService
+      .getAllDataIndividual(user.nationalId)
+      .catch((e) => {
+        this.logger.warn('National registry info fetch failed for user', {
+          error: e,
+          category: LOG_CATEGORY,
+        })
+        return null
+      })
+
+    if (!userData?.nafn || !userData?.kennitala) {
+      this.logger.warn('National registry info missing data. Returning null', {
+        category: LOG_CATEGORY,
+      })
+      return null
+    }
+
+    const family: Array<{ name: string; nationalId: string }> = [
+      {
+        name: userData?.nafn,
+        nationalId: userData?.kennitala,
+      },
+      ...(userData?.forsja?.born
+        ?.map((child) => {
+          if (child.barnNafn && child.barnKennitala) {
+            return {
+              name: child.barnNafn,
+              nationalId: child.barnKennitala,
+            }
+          }
+          return null
+        })
+        .filter(isDefined) ?? []),
+    ]
+
+    return Promise.all(
+      family.map(async (person) => {
+        const assessmentData = await this.apiWithAuth(
+          user,
+        ).publicGradeV2ControllerGetStudentAssessment({
+          nationalId: user.nationalId,
+        })
+
+        return mapStudentAssessmentsDto(
+          person.name,
+          person.nationalId,
+          assessmentData.einkunnir,
+        )
+      }),
+    )
+  }
+}
diff --git a/libs/clients/mms/grade/tsconfig.json b/libs/clients/mms/grade/tsconfig.json
new file mode 100644
index 000000000000..4022fd4d0ad7
--- /dev/null
+++ b/libs/clients/mms/grade/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/clients/mms/grade/tsconfig.lib.json b/libs/clients/mms/grade/tsconfig.lib.json
new file mode 100644
index 000000000000..e6b77320ab6a
--- /dev/null
+++ b/libs/clients/mms/grade/tsconfig.lib.json
@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"],
+    "target": "es2021",
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/clients/mms/grade/tsconfig.spec.json b/libs/clients/mms/grade/tsconfig.spec.json
new file mode 100644
index 000000000000..6668655fc397
--- /dev/null
+++ b/libs/clients/mms/grade/tsconfig.spec.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/clients/signature-collection/src/clientConfig.json b/libs/clients/signature-collection/src/clientConfig.json
index 4e173c00e915..e502c2552db0 100644
--- a/libs/clients/signature-collection/src/clientConfig.json
+++ b/libs/clients/signature-collection/src/clientConfig.json
@@ -2,6 +2,145 @@
   "openapi": "3.0.1",
   "info": { "title": "MedmaeliRestAPI", "version": "1.0" },
   "paths": {
+    "/Admin/Frambod": {
+      "post": {
+        "tags": ["Admin"],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/FrambodDTO" }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Admin/Frambod/{ID}": {
+      "delete": {
+        "tags": ["Admin"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": { "description": "OK" },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Admin/Medmaeli/{ID}": {
+      "delete": {
+        "tags": ["Admin"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": { "description": "OK" },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Admin/Medmaelasofnun/{ID}/EinsInfo/{Kennitala}": {
+      "get": {
+        "tags": ["Admin"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          },
+          {
+            "name": "Kennitala",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "string" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EinstaklingurKosningInfoDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Admin/Medmaelasofnun/{ID}/ToggleSofnun": {
+      "post": {
+        "tags": ["Admin"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" }
+              }
+            }
+          },
+          "204": { "description": "No Content" },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
     "/Frambod": {
       "get": {
         "tags": ["Frambod"],
@@ -9,13 +148,12 @@
           {
             "name": "sofnunID",
             "in": "query",
-            "style": "form",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -32,6 +170,32 @@
             }
           }
         }
+      },
+      "post": {
+        "tags": ["Frambod"],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": { "$ref": "#/components/schemas/FrambodRequestDTO" }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/FrambodDTO" }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
       }
     },
     "/Frambod/{ID}": {
@@ -42,13 +206,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/FrambodDTO" }
@@ -62,6 +225,26 @@
             }
           }
         }
+      },
+      "delete": {
+        "tags": ["Frambod"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": { "description": "OK" },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
       }
     },
     "/Frambod/{ID}/Medmaelalistar": {
@@ -72,13 +255,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -105,13 +287,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" }
@@ -135,13 +316,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/FrambodBaseDTO" }
@@ -165,7 +345,6 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
@@ -178,7 +357,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/FrambodDTO" }
@@ -202,20 +381,18 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "Kennitala",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "string" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/UmbodBaseDTO" }
@@ -236,7 +413,7 @@
         "tags": ["Kosning"],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -263,13 +440,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/KosningDTO" }
@@ -294,13 +470,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -327,25 +502,22 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "startDate",
             "in": "query",
-            "style": "form",
             "schema": { "type": "string", "format": "date-time" }
           },
           {
             "name": "endDate",
             "in": "query",
-            "style": "form",
             "schema": { "type": "string", "format": "date-time" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" }
@@ -368,25 +540,22 @@
           {
             "name": "frambodID",
             "in": "query",
-            "style": "form",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "sofnunID",
             "in": "query",
-            "style": "form",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "svaediID",
             "in": "query",
-            "style": "form",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -403,6 +572,34 @@
             }
           }
         }
+      },
+      "post": {
+        "tags": ["Medmaelalistar"],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MedmaelalistarRequestDTO"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
       }
     },
     "/Medmaelalistar/AddListar": {
@@ -419,7 +616,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -452,7 +649,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -479,13 +676,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" }
@@ -500,6 +696,54 @@
             }
           }
         }
+      },
+      "post": {
+        "tags": ["Medmaelalistar"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          },
+          { "name": "kennitala", "in": "query", "schema": { "type": "string" } }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": ["Medmaelalistar"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": { "description": "OK" },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
       }
     },
     "/Medmaelalistar/{ID}/Medmaeli": {
@@ -510,13 +754,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -544,19 +787,13 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
-          {
-            "name": "kennitala",
-            "in": "query",
-            "style": "form",
-            "schema": { "type": "string" }
-          }
+          { "name": "kennitala", "in": "query", "schema": { "type": "string" } }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" }
@@ -580,7 +817,6 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
@@ -595,7 +831,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -613,19 +849,6 @@
         }
       }
     },
-    "/Medmaelalistar/Token": {
-      "get": {
-        "tags": ["Medmaelalistar"],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": { "schema": { "type": "string" } }
-            }
-          }
-        }
-      }
-    },
     "/Medmaelalistar/{ID}/ExtendTime": {
       "patch": {
         "tags": ["Medmaelalistar"],
@@ -634,22 +857,22 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "newEndDate",
             "in": "query",
-            "style": "form",
             "schema": { "type": "string", "format": "date-time" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" }
+                "schema": {
+                  "$ref": "#/components/schemas/MedmaelalistiBaseDTO"
+                }
               }
             }
           },
@@ -671,16 +894,17 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/MedmaelalistiDTO" }
+                "schema": {
+                  "$ref": "#/components/schemas/MedmaelalistiBaseDTO"
+                }
               }
             }
           },
@@ -702,7 +926,6 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
@@ -715,7 +938,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -743,13 +966,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -774,13 +996,12 @@
           {
             "name": "includeInactive",
             "in": "query",
-            "style": "form",
             "schema": { "type": "boolean", "default": false }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -809,13 +1030,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -842,13 +1062,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -876,13 +1095,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -910,20 +1128,18 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "Kennitala",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "string" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -949,20 +1165,18 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           },
           {
             "name": "Kennitala",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "string" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -988,13 +1202,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaelasofnunDTO" }
@@ -1019,7 +1232,6 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
@@ -1032,7 +1244,7 @@
         },
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -1060,19 +1272,17 @@
             "name": "Kennitala",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "string" }
           },
           {
             "name": "sofnunID",
             "in": "query",
-            "style": "form",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": {
@@ -1099,13 +1309,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" }
@@ -1129,13 +1338,12 @@
             "name": "ID",
             "in": "path",
             "required": true,
-            "style": "simple",
             "schema": { "type": "integer", "format": "int32" }
           }
         ],
         "responses": {
           "200": {
-            "description": "Success",
+            "description": "OK",
             "content": {
               "application/json": {
                 "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" }
@@ -1150,11 +1358,113 @@
           }
         }
       }
+    },
+    "/Medmaeli/{ID}": {
+      "delete": {
+        "tags": ["Medmaeli"],
+        "parameters": [
+          {
+            "name": "ID",
+            "in": "path",
+            "required": true,
+            "schema": { "type": "integer", "format": "int32" }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/MedmaeliBaseDTO" }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Tegund/Kosning": {
+      "get": {
+        "tags": ["Tegund"],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": { "$ref": "#/components/schemas/TegundDTO" }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Tegund/Medmaeli": {
+      "get": {
+        "tags": ["Tegund"],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": { "$ref": "#/components/schemas/TegundDTO" }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
+    },
+    "/Tegund/Umbod": {
+      "get": {
+        "tags": ["Tegund"],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": { "$ref": "#/components/schemas/TegundDTO" }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": { "schema": { "type": "string" } }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
     "schemas": {
       "EinstaklingurKosningInfoDTO": {
+        "required": ["kennitala", "kosningNafn", "nafn"],
         "type": "object",
         "properties": {
           "kennitala": { "type": "string" },
@@ -1173,6 +1483,9 @@
             "type": "array",
             "items": { "$ref": "#/components/schemas/MedmaeliDTO" }
           },
+          "listabokstafur": {
+            "$ref": "#/components/schemas/ListabokstafurBaseDTO"
+          },
           "frambod": { "$ref": "#/components/schemas/FrambodBaseDTO" },
           "medmaelalistar": {
             "type": "array",
@@ -1182,29 +1495,38 @@
         "additionalProperties": false
       },
       "EinstaklingurMaFrambodInfo": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
+          "kennitala": { "type": "string" },
+          "medListabokstaf": { "type": "boolean" },
           "aldur": { "type": "boolean" },
-          "rikisfang": { "type": "boolean" }
+          "rikisfang": { "type": "boolean" },
+          "maFrambod": { "type": "boolean", "readOnly": true }
         },
         "additionalProperties": false
       },
       "EinstaklingurMaKjosaInfo": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
           "kennitala": { "type": "string" },
+          "erEinstaklingur": { "type": "boolean" },
           "aldur": { "type": "boolean" },
           "rikisfang": { "type": "boolean" },
-          "buseta": { "type": "boolean" }
+          "buseta": { "type": "boolean" },
+          "maKjosa": { "type": "boolean", "readOnly": true }
         },
         "additionalProperties": false
       },
       "FrambodBaseDTO": {
+        "required": ["kennitala", "nafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
           "nafn": { "type": "string" },
           "kennitala": { "type": "string" },
+          "listabokstafur": { "type": "string", "nullable": true },
           "simi": { "type": "string", "nullable": true },
           "netfang": { "type": "string", "nullable": true },
           "medmaelasofnunID": { "type": "integer", "format": "int32" }
@@ -1212,11 +1534,13 @@
         "additionalProperties": false
       },
       "FrambodDTO": {
+        "required": ["kennitala", "nafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
           "nafn": { "type": "string" },
           "kennitala": { "type": "string" },
+          "listabokstafur": { "type": "string", "nullable": true },
           "simi": { "type": "string", "nullable": true },
           "netfang": { "type": "string", "nullable": true },
           "medmaelasofnunID": { "type": "integer", "format": "int32" },
@@ -1230,7 +1554,50 @@
         },
         "additionalProperties": false
       },
+      "FrambodListarRequestDTO": {
+        "type": "object",
+        "properties": {
+          "svaediID": { "type": "integer", "format": "int32" },
+          "listiNafn": { "type": "string" }
+        },
+        "additionalProperties": false
+      },
+      "FrambodRequestDTO": {
+        "required": ["kennitala"],
+        "type": "object",
+        "properties": {
+          "sofnunID": { "type": "integer", "format": "int32" },
+          "kennitala": { "type": "string" },
+          "simi": { "type": "string" },
+          "netfang": { "type": "string" },
+          "medmaelalistar": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" }
+          },
+          "umbodsadilar": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/FrambodUmbodRequestDTO" }
+          }
+        },
+        "additionalProperties": false
+      },
+      "FrambodUmbodRequestDTO": {
+        "required": ["kennitala", "tegundUmbodsID"],
+        "type": "object",
+        "properties": {
+          "kennitala": { "type": "string" },
+          "simi": { "type": "string" },
+          "netfang": { "type": "string" },
+          "tegundUmbodsID": { "type": "integer", "format": "int32" },
+          "svaediIDList": {
+            "type": "array",
+            "items": { "type": "integer", "format": "int32" }
+          }
+        },
+        "additionalProperties": false
+      },
       "KosningBaseDTO": {
+        "required": ["kosningTegund", "kosningTegundNr", "nafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1252,6 +1619,7 @@
         "additionalProperties": false
       },
       "KosningDTO": {
+        "required": ["kosningTegund", "kosningTegundNr", "nafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1275,7 +1643,27 @@
         },
         "additionalProperties": false
       },
+      "ListabokstafurBaseDTO": {
+        "required": ["frambodNafn", "stafur"],
+        "type": "object",
+        "properties": {
+          "frambodNafn": { "type": "string" },
+          "stafur": { "type": "string" }
+        },
+        "additionalProperties": false
+      },
+      "MedmaelalistarRequestDTO": {
+        "type": "object",
+        "properties": {
+          "frambodID": { "type": "integer", "format": "int32" },
+          "medmaelalisti": {
+            "$ref": "#/components/schemas/FrambodListarRequestDTO"
+          }
+        },
+        "additionalProperties": false
+      },
       "MedmaelalistiBaseDTO": {
+        "required": ["frambodNafn", "listiNafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1291,6 +1679,7 @@
         "additionalProperties": false
       },
       "MedmaelalistiDTO": {
+        "required": ["frambodNafn", "listiNafn"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1319,22 +1708,13 @@
           "netfang": { "type": "string" },
           "medmaelalistar": {
             "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/MedmaelalistiSvaediRequestDTO"
-            }
+            "items": { "$ref": "#/components/schemas/FrambodListarRequestDTO" }
           }
         },
         "additionalProperties": false
       },
-      "MedmaelalistiSvaediRequestDTO": {
-        "type": "object",
-        "properties": {
-          "svaediID": { "type": "integer", "format": "int32" },
-          "listiNafn": { "type": "string" }
-        },
-        "additionalProperties": false
-      },
       "MedmaelasofnunBaseDTO": {
+        "required": ["kosningNafn", "kosningTegund"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1349,6 +1729,7 @@
         "additionalProperties": false
       },
       "MedmaelasofnunDTO": {
+        "required": ["kosningNafn", "kosningTegund"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1366,6 +1747,7 @@
         "additionalProperties": false
       },
       "MedmaelasofnunExtendedDTO": {
+        "required": ["kosningNafn", "kosningTegund"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1391,6 +1773,7 @@
         "additionalProperties": false
       },
       "MedmaeliBaseDTO": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1406,6 +1789,7 @@
         "additionalProperties": false
       },
       "MedmaeliBulkItemDTO": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
           "kennitala": { "type": "string" },
@@ -1448,6 +1832,7 @@
         "additionalProperties": false
       },
       "MedmaeliDTO": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1464,6 +1849,7 @@
         "additionalProperties": false
       },
       "SvaediDTO": {
+        "required": ["nafn", "svaediTegundLysing"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
@@ -1475,15 +1861,31 @@
         },
         "additionalProperties": false
       },
+      "TegundDTO": {
+        "type": "object",
+        "properties": {
+          "id": { "type": "integer", "format": "int32" },
+          "nr": { "type": "integer", "format": "int32" },
+          "lysing": { "type": "string", "nullable": true }
+        },
+        "additionalProperties": false
+      },
       "UmbodBaseDTO": {
+        "required": ["kennitala"],
         "type": "object",
         "properties": {
           "id": { "type": "integer", "format": "int32" },
-          "nafn": { "type": "string" },
+          "nafn": { "type": "string", "nullable": true },
           "kennitala": { "type": "string" },
           "simi": { "type": "string", "nullable": true },
           "netfang": { "type": "string", "nullable": true },
-          "frambodID": { "type": "integer", "format": "int32" }
+          "svaediID": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "frambodID": { "type": "integer", "format": "int32" },
+          "tegundUmbods": { "$ref": "#/components/schemas/TegundDTO" }
         },
         "additionalProperties": false
       }
diff --git a/libs/clients/signature-collection/src/index.ts b/libs/clients/signature-collection/src/index.ts
index 5b99cb20f17e..87f492dad3ae 100644
--- a/libs/clients/signature-collection/src/index.ts
+++ b/libs/clients/signature-collection/src/index.ts
@@ -4,3 +4,5 @@ export * from './lib/signature-collection.service'
 export * from './lib/signature-collection-admin.service'
 export * from './lib/signature-collection-manager.service'
 export * from './lib/signature-collection.types'
+export * from './lib/types/collection.dto'
+export * from './lib/types/user.dto'
diff --git a/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts b/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts
index 133251c6655f..9fc2186e757d 100644
--- a/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts
+++ b/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts
@@ -27,6 +27,11 @@ export class SignatureCollectionSharedClientService {
       includeInactive: true,
     })
 
+    // Note: In the future, we may want to consider adding an optional parameter
+    //       for filtering on CollectionType, as we may have multiple
+    //       collections running at the same time. (not projected to happen currently)
+    //       So keep CollectionType in mind if you're working on this
+    //       for that reason, future programmer.
     const current = (
       res
         .map(mapCollection)
diff --git a/libs/clients/signature-collection/src/lib/signature-collection.service.spec.ts b/libs/clients/signature-collection/src/lib/signature-collection.service.spec.ts
index f6c469a453f0..43774ef95537 100644
--- a/libs/clients/signature-collection/src/lib/signature-collection.service.spec.ts
+++ b/libs/clients/signature-collection/src/lib/signature-collection.service.spec.ts
@@ -13,6 +13,7 @@ import { Test, TestingModule } from '@nestjs/testing'
 import { CreateListInput } from './signature-collection.types'
 import { User } from '@island.is/auth-nest-tools'
 import { LoggingModule } from '@island.is/logging'
+import { CollectionType } from './types/collection.dto'
 
 const user: User = {
   nationalId: '0101302399',
@@ -25,18 +26,27 @@ const sofnun: MedmaelasofnunExtendedDTO[] = [
     id: 123,
     sofnunStart: new Date('01.01.1900'),
     sofnunEnd: new Date('01.01.2199'),
-    svaedi: [{ id: 123 }],
-    frambodList: [{ id: 123, kennitala: '0101010119' }],
-    kosning: { id: 123, erMedmaelakosning: true },
+    svaedi: [{ id: 123, nafn: 'Svæði', svaediTegundLysing: 'Lýsing' }],
+    frambodList: [{ id: 123, kennitala: '0101010119', nafn: 'Jónsframboð' }],
+    kosning: {
+      id: 123,
+      erMedmaelakosning: true,
+      kosningTegund: 'Forsetakosning',
+      kosningTegundNr: CollectionType.Presidential,
+      nafn: 'Gervikosning',
+    },
     kosningTegund: 'Forsetakosning',
+    kosningNafn: 'Gervikosning',
   },
 ]
 const sofnunUser: EinstaklingurKosningInfoDTO = {
-  svaedi: { id: 123 },
+  svaedi: { id: 123, nafn: 'Svæði', svaediTegundLysing: 'Lýsing' },
   kennitala: '0101302399',
   maFrambod: true,
-  maFrambodInfo: { aldur: true, rikisfang: true },
-  frambod: { id: 123, kennitala: '0101302399' },
+  maFrambodInfo: { aldur: true, rikisfang: true, kennitala: '0101302399' },
+  frambod: { id: 123, kennitala: '0101302399', nafn: 'Jónsframboð' },
+  nafn: 'Jón Jónsson',
+  kosningNafn: 'Gervikosning',
 }
 
 describe('MyService', () => {
@@ -79,14 +89,14 @@ describe('MyService', () => {
       activeSignature: undefined,
       signatures: [],
       requirementsMet: true,
-      canSignInfo: { aldur: true, rikisfang: true },
+      canSignInfo: { aldur: true, rikisfang: true, kennitala: '0101302399' },
     })
     const alreadySigned = await service.canSign({
-      activeSignature: { id: 123 },
+      activeSignature: { id: 123, kennitala: '0101302399' },
     })
     const canNotSign = await service.canSign({
       activeSignature: undefined,
-      canSignInfo: { aldur: false, rikisfang: false },
+      canSignInfo: { aldur: false, rikisfang: false, kennitala: '0101302399' },
     })
     const invalidSignature = await service.canSign({
       activeSignature: undefined,
@@ -102,7 +112,7 @@ describe('MyService', () => {
         },
       ],
       requirementsMet: true,
-      canSignInfo: { aldur: true, rikisfang: true },
+      canSignInfo: { aldur: true, rikisfang: true, kennitala: '0101302399' },
     })
     // Assert
     expect(success).toEqual({ success: true, reasons: [] })
@@ -129,19 +139,30 @@ describe('MyService', () => {
           id: 123,
           sofnunEnd: new Date('01.01.2199'),
           sofnunStart: new Date('01.01.1900'),
+          kosningNafn: 'Gervikosning',
+          kosningTegund: 'Forsetakosning',
         },
-        frambod: { id: 123, kennitala: '0101016789' },
-        svaedi: { id: 123 },
+        frambod: { id: 123, kennitala: '0101016789', nafn: 'Jónsframboð' },
+        svaedi: { id: 123, nafn: 'Svæði', svaediTegundLysing: 'Lýsing' },
         dagsetningLokar: new Date('01.01.2199'),
         listaLokad: false,
+        frambodNafn: 'Jónsframboð',
+        listiNafn: 'Jónslisti',
       },
       {
         id: 321,
-        medmaelasofnun: { id: 321, sofnunEnd: new Date() },
-        frambod: { id: 321, kennitala: '0202026789' },
-        svaedi: { id: 321 },
+        medmaelasofnun: {
+          id: 321,
+          sofnunEnd: new Date(),
+          kosningNafn: 'Gervikosning',
+          kosningTegund: 'Forsetakosning',
+        },
+        frambod: { id: 321, kennitala: '0202026789', nafn: 'Jónsframboð' },
+        svaedi: { id: 321, nafn: 'Svæði', svaediTegundLysing: 'Lýsing' },
         dagsetningLokar: new Date('01.01.1900'),
         listaLokad: true,
+        frambodNafn: 'Jónsframboð',
+        listiNafn: 'Jónslisti',
       },
     ]
 
@@ -216,13 +237,17 @@ describe('MyService', () => {
         id: 123,
         medmaelasofnun: {
           id: 123,
+          kosningNafn: 'Gervikosning',
+          kosningTegund: 'Forsetakosning',
           sofnunStart: new Date('01.01.1900'),
           sofnunEnd: new Date('01.01.2199'),
         },
-        frambod: { id: 123, kennitala: '0101016789' },
-        svaedi: { id: 123 },
+        frambod: { id: 123, kennitala: '0101016789', nafn: 'Jónsframboð' },
+        svaedi: { id: 123, nafn: 'Svæði', svaediTegundLysing: 'Lýsing' },
         dagsetningLokar: new Date('01.01.2199'),
         listaLokad: false,
+        frambodNafn: 'Jónsframboð',
+        listiNafn: 'Jónslisti',
       },
     ]
 
@@ -264,7 +289,12 @@ describe('MyService', () => {
       )
     jest
       .spyOn(frambodApi, 'frambodIDRemoveFrambodUserPost')
-      .mockReturnValueOnce(Promise.resolve({}))
+      .mockReturnValueOnce(
+        Promise.resolve({
+          kennitala: '0101302399',
+          nafn: 'Jón Jónsson',
+        }),
+      )
     // Act
     const notOwner = await service.removeLists(
       { collectionId: '', listIds: [''] },
@@ -300,7 +330,7 @@ describe('MyService', () => {
       .mockReturnValueOnce(
         Promise.resolve({
           ...sofnunUser,
-          medmaeli: [{ id: 111, medmaeliTegundNr: 1 }],
+          medmaeli: [{ id: 111, medmaeliTegundNr: 1, kennitala: '0101302399' }],
         }),
       )
       .mockReturnValue(Promise.resolve(sofnunUser))
@@ -349,12 +379,21 @@ describe('MyService', () => {
       .mockReturnValue(
         Promise.resolve({
           ...sofnunUser,
-          medmaeli: [{ id: 111, medmaeliTegundNr: 1, medmaelalistiID: 999 }],
+          medmaeli: [
+            {
+              id: 111,
+              medmaeliTegundNr: 1,
+              medmaelalistiID: 999,
+              kennitala: '0101302399',
+            },
+          ],
         }),
       )
-    jest
-      .spyOn(medmaeliApi, 'medmaeliIDRemoveMedmaeliUserPost')
-      .mockReturnValue(Promise.resolve({}))
+    jest.spyOn(medmaeliApi, 'medmaeliIDRemoveMedmaeliUserPost').mockReturnValue(
+      Promise.resolve({
+        kennitala: '0101302399',
+      }),
+    )
     // Act
     const noSignature = await service.unsignList('', user)
     const success = await service.unsignList('999', user)
diff --git a/libs/clients/signature-collection/src/lib/signature-collection.service.ts b/libs/clients/signature-collection/src/lib/signature-collection.service.ts
index 27e29398325d..e21da697c5aa 100644
--- a/libs/clients/signature-collection/src/lib/signature-collection.service.ts
+++ b/libs/clients/signature-collection/src/lib/signature-collection.service.ts
@@ -12,6 +12,7 @@ import {
   ReasonKey,
   CanCreateInput,
   CanSignInput,
+  CreateParliamentaryCandidacyInput,
 } from './signature-collection.types'
 import { Collection } from './types/collection.dto'
 import { List, SignedList, mapList, mapListBase } from './types/list.dto'
@@ -134,6 +135,64 @@ export class SignatureCollectionClientService {
     return { slug }
   }
 
+  async createParliamentaryCandidacy(
+    { collectionId, owner, areas, agents }: CreateParliamentaryCandidacyInput,
+    auth: User,
+  ): Promise<Slug> {
+    const {
+      id,
+      isActive,
+      areas: collectionAreas,
+    } = await this.currentCollection()
+    // check if collectionId is current collection and current collection is open
+    if (collectionId !== id.toString() || !isActive) {
+      throw new Error('Collection is not open')
+    }
+    // check if user is sending in their own nationalId
+    if (owner.nationalId !== auth.nationalId) {
+      throw new Error('NationalId does not match')
+    }
+    // check if user is already owner of lists
+
+    const { canCreate, isOwner, name } = await this.getSignee(auth)
+    if (!canCreate || isOwner) {
+      throw new Error('User is already owner of lists')
+    }
+
+    const filteredAreas = areas
+      ? collectionAreas.filter((area) =>
+          areas.flatMap((a) => a.areaId).includes(area.id),
+        )
+      : collectionAreas
+
+    const candidacy = await this.getApiWithAuth(
+      this.candidateApi,
+      auth,
+    ).frambodPost({
+      frambodRequestDTO: {
+        umbodsadilar: agents.map((agent) => ({
+          kennitala: agent.nationalId,
+          tegundUmbodsID: agent.mandateType,
+          netfang: agent.email,
+          simi: agent.phoneNumber,
+          svaediIDList: agent.areas.map((area) => parseInt(area.areaId)),
+        })),
+        sofnunID: parseInt(id),
+        kennitala: owner.nationalId,
+        simi: owner.phone,
+        netfang: owner.email,
+        medmaelalistar: filteredAreas.map((area) => ({
+          svaediID: parseInt(area.id),
+          listiNafn: `${name} - ${area.name}`,
+        })),
+      },
+    })
+    if (filteredAreas.length !== candidacy.umbodList?.length) {
+      throw new Error('Not all lists created')
+    }
+    return { slug: 'frambodWowee' }
+  }
+
   async signList(listId: string, auth: User): Promise<Signature> {
     const { signatures } = await this.getSignee(auth)
     // If user has already signed list be sure to throw error
@@ -321,6 +380,11 @@ export class SignatureCollectionClientService {
       ownedLists,
       isOwner: user.medmaelalistar ? user.medmaelalistar?.length > 0 : false,
       candidate,
+      hasPartyBallotLetter: !!user.maFrambodInfo?.medListabokstaf,
+      partyBallotLetterInfo: {
+        letter: user.listabokstafur?.stafur ?? '',
+        name: user.listabokstafur?.frambodNafn ?? '',
+      },
     }
   }
 
diff --git a/libs/clients/signature-collection/src/lib/signature-collection.types.ts b/libs/clients/signature-collection/src/lib/signature-collection.types.ts
index 3f27a902b50d..660719c75e9a 100644
--- a/libs/clients/signature-collection/src/lib/signature-collection.types.ts
+++ b/libs/clients/signature-collection/src/lib/signature-collection.types.ts
@@ -30,6 +30,24 @@ export interface CreateListInput {
   owner: OwnerInput
   areas?: AreaInput[]
 }
+export interface CreateParliamentaryCandidacyInput extends CreateListInput {
+  agents: AgentInput[]
+}
+
+export enum MandateType {
+  Unknown,
+  Owner,
+  Guarantor, // is: Ábyrgðaraðili
+  Administrator, // is: Umsjónaraðili
+}
+
+export interface AgentInput {
+  nationalId: string
+  phoneNumber: string
+  email: string
+  mandateType: MandateType
+  areas: AreaInput[]
+}
 
 export interface BulkUploadUser {
   pageNumber: number
diff --git a/libs/clients/signature-collection/src/lib/types/candidate.dto.ts b/libs/clients/signature-collection/src/lib/types/candidate.dto.ts
index 8715decda231..0038ce46d647 100644
--- a/libs/clients/signature-collection/src/lib/types/candidate.dto.ts
+++ b/libs/clients/signature-collection/src/lib/types/candidate.dto.ts
@@ -7,6 +7,7 @@ export interface Candidate extends UserBase {
   phone: string
   email: string
   collectionId: string
+  partyBallotLetter: string
 }
 
 export const mapCandidate = (candidate: FrambodBaseDTO): Candidate => {
@@ -25,5 +26,6 @@ export const mapCandidate = (candidate: FrambodBaseDTO): Candidate => {
     phone: candidate.simi ?? '',
     email: candidate.netfang ?? '',
     collectionId: candidate.medmaelasofnunID?.toString() ?? '',
+    partyBallotLetter: candidate.listabokstafur ?? '',
   }
 }
diff --git a/libs/clients/signature-collection/src/lib/types/collection.dto.ts b/libs/clients/signature-collection/src/lib/types/collection.dto.ts
index bd02af0e2f9c..db2b08911a97 100644
--- a/libs/clients/signature-collection/src/lib/types/collection.dto.ts
+++ b/libs/clients/signature-collection/src/lib/types/collection.dto.ts
@@ -13,6 +13,32 @@ export enum CollectionStatus {
   Inactive = 'inactive',
 }
 
+// We are storing this enum such that an unknown category maps to 0
+// Then the rest is ordered to reflect the numerical values present in the
+// Signature Collection API (see /Tegund/Kosning in the API)
+export enum CollectionType {
+  OtherUnknown,
+  Parliamentary,
+  Presidential,
+  Referendum, // is: Þjóðaratkvæðagreiðsla
+  OtherSameRulesAsParliamentary,
+  LocalGovernmental, // is: Sveitarstjórnarkosningar
+  SpecialLocalGovernmental,
+  ResidentPoll, // is: Íbúakönnun
+  ForeignResidentPoll,
+}
+
+export const getCollectionTypeFromNumber = (
+  nr: number | undefined,
+): CollectionType => {
+  // Make sure to add to the enum and iterate on the numbers
+  // if needed and when other types of collections are added.
+  if (nr && nr > 0 && nr <= 8) {
+    return nr as CollectionType
+  }
+  return CollectionType.OtherUnknown
+}
+
 export interface Collection {
   id: string
   startTime: Date
@@ -25,6 +51,7 @@ export interface Collection {
   candidates: Candidate[]
   processed: boolean
   status: CollectionStatus
+  collectionType: CollectionType
 }
 
 const getStatus = ({
@@ -82,6 +109,7 @@ export const mapCollection = (
       'Received partial collection information from the national registry.',
     )
   }
+  const collectionType = getCollectionTypeFromNumber(kosning?.kosningTegundNr)
   const isActive = startTime < new Date() && endTime > new Date()
   const processed = collection.lokadHandvirkt ?? false
   const hasActiveLists = collection.opnirListar ?? false
@@ -99,7 +127,7 @@ export const mapCollection = (
     startTime,
     endTime,
     isActive,
-    isPresidential: collection.kosningTegund == 'Forsetakosning',
+    isPresidential: collectionType === CollectionType.Presidential,
     isSignatureCollection: kosning?.erMedmaelakosning ?? false,
     candidates: candidates
       ? candidates.map((candidate) => mapCandidate(candidate))
@@ -107,5 +135,6 @@ export const mapCollection = (
     areas: areas.map((area) => mapArea(area)),
     processed,
     status,
+    collectionType,
   }
 }
diff --git a/libs/clients/signature-collection/src/lib/types/user.dto.ts b/libs/clients/signature-collection/src/lib/types/user.dto.ts
index 19f7656af71c..614e7f1efa38 100644
--- a/libs/clients/signature-collection/src/lib/types/user.dto.ts
+++ b/libs/clients/signature-collection/src/lib/types/user.dto.ts
@@ -14,6 +14,11 @@ export interface CandidateLookup extends UserBase {
   canCreateInfo?: ReasonKey[]
 }
 
+export interface PartyBallotLetterInfo {
+  name?: string
+  letter?: string
+}
+
 export interface Signee extends CandidateLookup {
   electionName: string
   canSign: boolean
@@ -25,4 +30,6 @@ export interface Signee extends CandidateLookup {
   signatures?: Signature[]
   ownedLists: ListBase[]
   candidate?: Candidate
+  hasPartyBallotLetter?: boolean
+  partyBallotLetterInfo?: PartyBallotLetterInfo
 }
diff --git a/libs/clients/smart-solutions-v2/.eslintrc.json b/libs/clients/smart-solutions-v2/.eslintrc.json
new file mode 100644
index 000000000000..3456be9b9036
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/clients/smart-solutions-v2/README.md b/libs/clients/smart-solutions-v2/README.md
new file mode 100644
index 000000000000..90803f5a8023
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/README.md
@@ -0,0 +1,7 @@
+# clients-smart-solutions
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test clients-smart-solutions-v2` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/clients/smart-solutions-v2/codegen.yml b/libs/clients/smart-solutions-v2/codegen.yml
new file mode 100644
index 000000000000..1b4963a7d5f8
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/codegen.yml
@@ -0,0 +1,19 @@
+schema:
+  - libs/clients/smart-solutions-v2/smartsolutions-api.graphql
+generates:
+  libs/clients/smart-solutions-v2/gen/schema.ts:
+    plugins:
+      - 'typescript'
+      - 'typescript-operations'
+      - 'typescript-document-nodes'
+    documents: libs/clients/smart-solutions-v2/src/lib/*.graphql
+    config:
+      scalars:
+        Instant: number
+        LocalDate: Date
+        Long: number
+        UUID: string
+        JSON: '{ [key: string]: any }'
+hooks:
+  afterAllFileWrite:
+    - prettier --write
diff --git a/libs/clients/smart-solutions-v2/fetchSchema.yml b/libs/clients/smart-solutions-v2/fetchSchema.yml
new file mode 100644
index 000000000000..d07e258fe717
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/fetchSchema.yml
@@ -0,0 +1,8 @@
+generates:
+  libs/clients/smart-solutions-v2/smartsolutions-api.graphql:
+    schema: https://smartpages-api-dev.smartsolutions.is/graphql
+    plugins:
+      - schema-ast
+hooks:
+  afterAllFileWrite:
+    - prettier --write
diff --git a/libs/clients/smart-solutions-v2/jest.config.ts b/libs/clients/smart-solutions-v2/jest.config.ts
new file mode 100644
index 000000000000..21ce5638c3b2
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'clients-smart-solutions-v2',
+  preset: '../../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../coverage/libs/clients/smart-solutions-v2',
+}
diff --git a/libs/clients/smart-solutions-v2/project.json b/libs/clients/smart-solutions-v2/project.json
new file mode 100644
index 000000000000..2e4c77d6be89
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/project.json
@@ -0,0 +1,47 @@
+{
+  "name": "clients-smart-solutions-v2",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/clients/smart-solutions-v2/src",
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/clients/smart-solutions-v2/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/clients/smart-solutions-v2/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    },
+    "update-openapi-document": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "graphql-codegen --config libs/clients/smart-solutions-v2/fetchGraphql.yml"
+        ]
+      }
+    },
+    "codegen/backend-client": {
+      "executor": "nx:run-commands",
+      "options": {
+        "output": "libs/clients/smart-solutions-v2/src/**/*.generated.ts",
+        "commands": [
+          "graphql-codegen --config libs/clients/smart-solutions-v2/codegen.yml"
+        ]
+      }
+    }
+  },
+  "tags": ["lib:client", "scope:client"]
+}
diff --git a/libs/clients/smart-solutions-v2/smartsolutions-api.graphql b/libs/clients/smart-solutions-v2/smartsolutions-api.graphql
new file mode 100644
index 000000000000..f786619cb6db
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/smartsolutions-api.graphql
@@ -0,0 +1,3756 @@
+"""
+Makes sure that the user is authenticated and has access to the query / mutation
+"""
+directive @authenticated(
+  action: String!
+  actionDescription: String!
+  admin: Boolean!
+  customResource: String!
+  permission: [UserPermission!]!
+  role: UserRole!
+  scannerRoute: ScannerAuthenticatedOptions!
+  status: [IssuerStatus!]!
+) on ARGUMENT_DEFINITION | ENUM | ENUM_VALUE | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | INPUT_OBJECT | INTERFACE | OBJECT | SCALAR | SCHEMA | UNION
+
+type AddOnPassTemplate {
+  addOnpassTemplate: UUID!
+  id: UUID!
+  label: String
+}
+
+input AddOnPassTemplateDataInput {
+  addOnPassTemplateId: String!
+  id: String
+  label: String
+}
+
+type ApiKey implements BaseModel {
+  id: UUID!
+  key: UUID!
+  name: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input ApiKeyDataInput {
+  id: String
+  name: String!
+}
+
+type ApiKeyPageInfo implements PaginationInfo {
+  data: [ApiKey!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type AppPassInstance implements BaseModel {
+  appUser: User!
+  id: UUID!
+  inputFieldValues: [PassInputFieldValue!]!
+  passId: UUID!
+  passInstanceId: UUID!
+  passTemplate: PassTemplate!
+  thumbnail: Image
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input AppPassInstanceDataInput {
+  passId: String
+  verifyToken: String
+}
+
+input AppUserDataInput {
+  androidDeviceId: String
+  language: String
+  phoneNumber: String
+  verifyToken: String
+}
+
+type Automation {
+  enabled: Boolean
+  id: UUID!
+  issuer: Issuer
+  name: String
+  nodes: [Node!]!
+}
+
+input AutomationDataInput {
+  enabled: Boolean
+  id: String
+  name: String
+}
+
+type AutomationEditor {
+  automation: Automation!
+  nodes: [Node!]!
+}
+
+input AutomationEditorDataInput {
+  enabled: Boolean
+  id: String
+  name: String
+  nodes: [NodeEditorDataInput!]
+}
+
+type AutomationLog {
+  actionTime: Long!
+  automation: Automation!
+  dataTime: Long!
+  endedAt: Instant!
+  failureReason: String
+  id: UUID!
+  startedAt: Instant!
+  status: AutomationLogStatusType!
+  triggerTime: Long!
+}
+
+input AutomationLogFilterInput {
+  endDate: String
+  startDate: String
+  status: [AutomationLogStatusType!]
+}
+
+type AutomationLogPageInfo implements PaginationInfo {
+  data: [AutomationLog!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+enum AutomationLogStatusType {
+  CANCELLED
+  FAILED
+  RUNNING
+  SUCCESS
+}
+
+enum BarcodeType {
+  CODE_128
+  PDF_417
+  QR
+}
+
+interface BaseModel {
+  id: UUID!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type BillingInfo implements BaseModel {
+  cancelDate: LocalDate
+  id: UUID!
+  issuerDiscounts: [IssuerDiscount!]
+  issuerStatus: IssuerStatus
+  passTemplatesPrice: [PassTemplatePrice!]!
+  trialEndDate: LocalDate!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum CountryType {
+  IS
+}
+
+enum CurrencyType {
+  ISK
+}
+
+input DAddOnPassInput {
+  addOnPass: UUID!
+  addOnPassTemplate: DAddOnPassTemplatesInput!
+  deleted: Boolean!
+  id: UUID!
+  pass: DPassInput!
+  passDeliveryPageUrl: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DAddOnPassTemplatesInput {
+  addOnPassTemplateId: UUID!
+  deleted: Boolean!
+  id: UUID!
+  label: String
+  passTemplate: DPassTemplateInput!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DApiKeyInput {
+  deleted: Boolean!
+  id: UUID!
+  key: UUID!
+  name: String!
+  user: DUserInput!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DAppPassInstanceInput {
+  app_user: DUserInput!
+  deleted: Boolean!
+  id: UUID!
+  pass: DPassInput!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DApplePassTypeIdentifierInput {
+  deleted: Boolean!
+  expirationDate: Instant!
+  id: UUID!
+  identifier: String!
+  isDefault: Boolean!
+  issuer: DIssuerInput
+  name: String!
+  organizationName: String!
+  passTemplates: [DPassTemplateInput!]!
+  teamIdentifier: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DAutomationInput {
+  deleted: Boolean!
+  enabled: Boolean
+  id: UUID!
+  issuer: DIssuerInput
+  log: [DAutomationLogInput!]!
+  name: String
+  nodes: [DNodeInput!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DAutomationLogInput {
+  actionTime: Long!
+  automation: DAutomationInput!
+  dataTime: Long!
+  deleted: Boolean!
+  failureReason: String
+  id: UUID!
+  memoryUsed: Long!
+  status: AutomationLogStatusType!
+  triggerTime: Long!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DDemoEmailInput {
+  dateSent: Instant!
+  deleted: Boolean!
+  demoEmailType: DemoEmailsType!
+  id: UUID!
+  issuer: DIssuerInput!
+  toEmail: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DDeviceInput {
+  deleted: Boolean!
+  deviceLibraryIdentifier: String
+  devicePassInstances: [DDevicePassInstanceInput!]!
+  deviceType: DeviceType!
+  id: UUID!
+  pushToken: String
+  userAgent: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DDevicePassInstanceInput {
+  deleted: Boolean!
+  device: DDeviceInput!
+  id: UUID!
+  pass: DPassInput!
+  passAuthenticationToken: DPassAuthenticationTokenInput!
+  status: DevicePassInstanceStatus!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DDiscountInput {
+  deleted: Boolean!
+  discount: Float
+  endDate: Instant
+  id: UUID!
+  passTemplate: DPassTemplateInput!
+  startDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DDistributionInput {
+  expirationDate: Instant
+  token: UUID!
+}
+
+input DEmailDistributionTransactionInput {
+  body: String!
+  deleted: Boolean!
+  emails: [DEmailInput!]!
+  failedAmount: Int
+  hasBeenLoggedToSentry: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  passTemplate: DPassTemplateInput
+  sentAmount: Int
+  sentBy: DUserInput!
+  statuses: [DEmailDistributionTransactionStatusInput!]!
+  subject: String!
+  totalAmount: Int!
+  type: EmailDistributionTransactionType!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DEmailDistributionTransactionStatusInput {
+  status: EmailDistributionTransactionStatus!
+  whenCreated: Instant!
+}
+
+input DEmailInput {
+  content: String
+  contentType: String
+  deleted: Boolean!
+  distributionTransaction: DEmailDistributionTransactionInput
+  fromEmail: String
+  id: UUID!
+  idempotent_id: String
+  pass: DPassInput
+  sendGridId: String
+  sendGridStatus: SendGridStatus
+  statuses: [DSendGridStatusInput!]
+  subject: String!
+  toEmail: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  whenSent: Instant
+}
+
+input DExternalAPIInput {
+  deleted: Boolean!
+  externalAPIType: ExternalAPIType!
+  id: UUID!
+  name: String
+  outputs: [DExternalAPIOutputInput!]!
+  parameters: [DExternalAPIParameterInput!]!
+  passTemplate: DPassTemplateInput!
+  queryType: ExternalAPIQueryType!
+  url: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DExternalAPIOutputInput {
+  deleted: Boolean!
+  description: String
+  externalAPI: DExternalAPIInput!
+  id: UUID!
+  innerPath: String
+  label: String!
+  matchType: ExternalAPIArrayMatchType!
+  passInputField: DPassInputFieldInput!
+  path: String!
+  searchMatch: String
+  searchPath: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DExternalAPIParameterInput {
+  deleted: Boolean!
+  externalAPI: DExternalAPIInput!
+  id: UUID!
+  name: String!
+  parameterType: ExternalAPIParameterType!
+  passInputField: DPassInputFieldInput
+  secret: DIssuerSecretInput
+  userSecret: DIssuerUserSecretInput
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DFileInput {
+  bucketName: String!
+  deleted: Boolean!
+  filename: String
+  id: UUID!
+  issuer: DIssuerInput
+  originalFilename: String
+  originalUrl: String
+  url: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DFixedMonthlyFeeInput {
+  deleted: Boolean!
+  id: UUID!
+  monthlyFeeType: MonthlyFeeType!
+  monthlyPrice: DMoneyInput!
+  plan: DPlanInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DImageInput {
+  bucketName: String!
+  deleted: Boolean!
+  description: String
+  filename: String!
+  height: Int!
+  id: UUID!
+  issuer: DIssuerInput
+  orderIndex: Int!
+  originalFilename: String
+  originalUrl: String
+  title: String
+  user: DUserInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  width: Int!
+}
+
+input DIssuerDiscountInput {
+  deleted: Boolean!
+  discount: Float!
+  endDate: Instant
+  id: UUID!
+  issuer: DIssuerInput!
+  startDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DIssuerInput {
+  address: String
+  automations: [DAutomationInput!]!
+  cancelDate: Instant
+  confirmDate: Instant
+  contactEmail: String
+  contactName: String
+  contactPhone: String
+  deleted: Boolean!
+  demoEmails: [DDemoEmailInput!]
+  discounts: [DIssuerDiscountInput!]
+  id: UUID!
+  idNumber: String
+  images: [DImageInput!]!
+  invoiceEmail: String
+  issuerUsers: [DIssuerUserInput!]!
+  logoIcon: DImageInput
+  name: String
+  orderInfos: [DOrderInfoInput!]!
+  passTemplates: [DPassTemplateInput!]!
+  paymentInfo: DPaymentInfoInput
+  planSubscription: DPlanSubscriptionInput
+  roles: [DRoleInput!]!
+  scanners: [DScannerInput!]!
+  secrets: [DIssuerSecretInput!]
+  serviceContactEmail: String
+  skipFooter: Boolean!
+  status: IssuerStatus
+  termsAndConditions: [DTermsAndConditionsInput!]!
+  town: String
+  userSecrets: [DIssuerUserSecretInput!]
+  users: [DUserInput!]!
+  version: Long!
+  whenAccepted: Instant
+  whenCreated: Instant!
+  whenModified: Instant!
+  zipcode: String
+}
+
+input DIssuerSecretInput {
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  name: String!
+  value: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DIssuerTermsInput {
+  deleted: Boolean!
+  id: UUID!
+  paymentTerms: DFileInput
+  paymentTermsUrl: String
+  privacyPolicy: DFileInput
+  privacyPolicyUrl: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DIssuerUserInput {
+  active: Boolean!
+  confirmed: Boolean!
+  deleted: Boolean!
+  id: UUID!
+  inviteEmail: String
+  invitedBy: DUserInput
+  issuer: DIssuerInput!
+  role: DRoleInput
+  user: DUserInput
+  version: Long!
+  whenConfirmed: Instant
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DIssuerUserSecretInput {
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  name: String!
+  values: [DIssuerUserSecretValueInput!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DIssuerUserSecretValueInput {
+  deleted: Boolean!
+  id: UUID!
+  secret: DIssuerUserSecretInput!
+  user: DUserInput!
+  value: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type DKPlusCompanyType {
+  ID: String!
+  Name: String!
+}
+
+input DLocationInput {
+  deleted: Boolean!
+  id: UUID!
+  passTemplates: DPassTemplateInput!
+  relevantText: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type DMoney {
+  amount: Float!
+  currency: String!
+}
+
+input DMoneyInput {
+  amount: Float!
+  currency: String!
+}
+
+input DNodeInput {
+  automation: DAutomationInput
+  category: NodeCategories
+  children: [DNodeInput!]!
+  config: [DNodeOptionInput!]!
+  deleted: Boolean!
+  id: UUID!
+  node: String!
+  parent: DNodeInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DNodeOptionInput {
+  children: [DNodeOptionInput!]!
+  deleted: Boolean!
+  id: UUID!
+  key: String!
+  node: DNodeInput!
+  parent: DNodeOptionInput
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DOrderInfoInput {
+  amount: String!
+  confirmed: Boolean
+  currency: CurrencyType!
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  orderId: String!
+  pass: DPassInput
+  passTemplate: DPassTemplateInput
+  payed: Boolean
+  paymentProvider: PaymentProvider!
+  productDescription: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassAuthenticationTokenInput {
+  authenticationToken: UUID!
+  deleted: Boolean!
+  devicePassInstances: [DDevicePassInstanceInput!]!
+  id: UUID!
+  pass: DPassInput!
+  status: PassAuthenticationTokenStatus!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  whenUsed: Instant
+}
+
+input DPassBackSideInput {
+  deleted: Boolean!
+  expirationDate: Instant
+  id: UUID!
+  label: String
+  orderIndex: Int!
+  pass: DPassInput!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassBeaconInput {
+  deleted: Boolean!
+  id: UUID!
+  major: Int!
+  minor: Int!
+  name: String!
+  passTemplate: DPassTemplateInput!
+  proximityUUID: String!
+  relevantText: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassFieldInput {
+  deleted: Boolean!
+  deletedText: String
+  expiredText: String
+  hideOnDeleted: Boolean!
+  hideOnExpired: Boolean!
+  hideOnVoided: Boolean!
+  id: UUID!
+  label: String!
+  orderIndex: Int!
+  passInputField: DPassInputFieldInput
+  passTemplate: DPassTemplateInput!
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+  version: Long!
+  voidedText: String
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassInput {
+  addOnPass: [DAddOnPassInput!]!
+  alreadyPaid: Boolean!
+  appPassInstance: [DAppPassInstanceInput!]!
+  comment: String
+  deleteInProcess: Boolean!
+  deleted: Boolean!
+  devicePassInstances: [DDevicePassInstanceInput!]!
+  distribution: DDistributionInput!
+  emails: [DEmailInput!]!
+  expirationDate: Instant
+  externalIdentifier: String
+  id: UUID!
+  inputFieldValues: [DPassInputFieldValueInput!]!
+  isLegacy: Boolean!
+  isReward: Boolean
+  isVoided: Boolean!
+  issuedBy: DUserInput
+  passAuthenticationTokens: [DPassAuthenticationTokenInput!]!
+  passBackSide: [DPassBackSideInput!]!
+  passTemplate: DPassTemplateInput!
+  posDistributionCode: String
+  savedByCustomer: Boolean!
+  scanTransactions: [DScanTransactionInput!]!
+  stampsLeft: Int
+  stampsStripImage: DStampStripImageInput
+  thumbnailImage: DImageInput
+  validFrom: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenDeactivated: Instant
+  whenModified: Instant!
+}
+
+input DPassInputFieldInput {
+  deleted: Boolean!
+  description: String
+  format: PassInputFieldFormat!
+  id: UUID!
+  identifier: String!
+  isMandatory: Boolean!
+  isUnique: Boolean!
+  label: String!
+  orderIndex: Int!
+  passFields: [DPassFieldInput!]!
+  passTemplate: DPassTemplateInput!
+  type: PassInputFieldType!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassInputFieldValueInput {
+  deleted: Boolean!
+  id: UUID!
+  pass: DPassInput!
+  passInputField: DPassInputFieldInput!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassIntegrationInput {
+  additionalRate: Float
+  deleted: Boolean!
+  id: UUID!
+  passIntegrationType: PassIntegrationType!
+  plan: DPlanInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassPricingInput {
+  deleted: Boolean!
+  id: UUID!
+  passPrice: DMoneyInput!
+  passType: PassType!
+  plan: DPlanInput
+  range: PassesRange!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassTemplateInput {
+  addOnPassTemplates: [DAddOnPassTemplatesInput!]!
+  allowReward: Boolean!
+  applePassTypeIdentifier: DApplePassTypeIdentifierInput!
+  backgroundColor: String
+  backgroundImage: DImageInput
+  barcodeFormat: String
+  barcodeTextFormat: String
+  barcodeType: BarcodeType!
+  beacons: [DPassBeaconInput!]!
+  dateFormat: DateFormat
+  dateNumber: Int
+  deleted: Boolean!
+  deletedPassTemplateId: UUID
+  description: String
+  disableCsvDownload: Boolean!
+  disableDeleteUnclaimedPasses: Boolean!
+  disableIssue: Boolean!
+  discount: DDiscountInput
+  distributionToken: UUID
+  dynamicBarcodeExpirationTimeSeconds: Long
+  dynamicBarcodeType: DynamicBarcodeType!
+  expirationDate: Instant
+  expirationType: ExpirationType
+  externalAPIs: [DExternalAPIInput!]!
+  externalAuthAgeVerification: Int
+  externalAuthEnablePOS: Boolean!
+  externalAuthIdField: DPassInputFieldInput
+  externalAuthNameField: DPassInputFieldInput
+  externalAuthUseIdentifiers: Boolean!
+  fields: [DPassFieldInput!]!
+  firstDeviceOnly: Boolean!
+  footerImage: DImageInput
+  foregroundColor: String
+  grayOnExpired: Boolean!
+  hasDynamicBarcode: Boolean!
+  icon: DImageInput
+  id: UUID!
+  inputFields: [DPassInputFieldInput!]!
+  isDeletedPassTemplate: Boolean!
+  isLegacy: Boolean!
+  isNFC: Boolean!
+  isSharingProhibited: Boolean!
+  issuer: DIssuerInput
+  labelColor: String
+  locations: [DLocationInput!]
+  lockInputFields: Boolean!
+  logScansOnBack: Boolean!
+  logo: DImageInput
+  logoText: String
+  mandatoryThumbnail: Boolean!
+  memberThumbnailImage: Boolean!
+  minAmount: Int
+  name: String
+  nfcValue: String
+  notificationOnScan: Boolean!
+  oncePerDevice: Boolean!
+  oneDeviceAtATime: Boolean!
+  oneDevicePerToken: Boolean!
+  onePassOfTemplateTypePerDevice: Boolean!
+  passPrice: Int
+  passTemplateType: PassTemplateType!
+  posDistributionOnly: Boolean!
+  publicKey: String
+  qrCodeImage: DImageInput
+  quantityRestriction: Int
+  refillRenewal: Boolean!
+  rewardPassTemplate: DRewardPassTemplateInput
+  sendBackUpPass: Boolean!
+  serviceEmail: String
+  serviceEmailType: ServiceEmailType!
+  singleDeviceOnly: Boolean!
+  stampBackgroundColor: String
+  stampStripImage: [DStampStripImageInput!]!
+  stampedImage: DImageInput
+  stamps: Int
+  status: PassTemplateStatus!
+  statusFields: Boolean!
+  stripBackgroundColor: String
+  stripImage: DImageInput
+  thumbnailImage: DImageInput
+  triggers: [DPassTemplateTriggerInput!]!
+  unstampedImage: DImageInput
+  useExternalAuth: Boolean!
+  userDistributionTokens: [DUserDistributionTokenInput!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPassTemplateTriggerInput {
+  active: Boolean!
+  deleted: Boolean!
+  id: UUID!
+  passTemplate: DPassTemplateInput!
+  type: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPaymentInfoInput {
+  accessKey: String
+  country: CountryType
+  currency: CurrencyType
+  customerInfo: Boolean
+  deleted: Boolean!
+  errorUrl: String
+  id: UUID!
+  issuer: DIssuerInput!
+  language: LanguageType
+  merchantEmail: String
+  merchantId: String
+  merchantLogo: DImageInput
+  paymentGatewayId: String
+  paymentProvider: PaymentProvider
+  secretKey: String
+  successUrl: String
+  terms: DIssuerTermsInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPermissionInput {
+  id: UUID!
+  permission: UserPermission
+  user: DUserInput!
+}
+
+input DPlanInput {
+  deleted: Boolean!
+  fixedMonthlyFees: [DFixedMonthlyFeeInput!]!
+  id: UUID!
+  monthlyPrice: DMoneyInput
+  name: String!
+  passIntegrations: [DPassIntegrationInput!]!
+  passPricings: [DPassPricingInput!]!
+  passTemplatesLimit: Int
+  passesLimit: Int
+  planSubscriptions: [DPlanSubscriptionInput!]!
+  planType: PlanType
+  scannerUsersLimit: Int
+  statisticsLimit: String
+  supportLimit: String
+  usersLimit: Int
+  version: Long!
+  visible: Boolean!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DPlanSubscriptionInput {
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  nextBillingDate: Instant
+  plan: DPlanInput!
+  status: PlanSubscriptionStatus!
+  trialEndDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DRewardPassFieldInput {
+  deleted: Boolean!
+  id: UUID!
+  label: String!
+  orderIndex: Int!
+  passInputField: DPassInputFieldInput
+  rewardPassTemplate: DRewardPassTemplateInput!
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DRewardPassTemplateInput {
+  backgroundColor: String
+  dateFormat: DateFormat
+  dateNumber: Int
+  deleted: Boolean!
+  description: String
+  expirationDate: Instant
+  expirationType: ExpirationType
+  fields: [DRewardPassFieldInput!]!
+  foregroundColor: String
+  id: UUID!
+  isSharingProhibited: Boolean!
+  labelColor: String
+  logo: DImageInput
+  logoText: String
+  singleDeviceOnly: Boolean!
+  stripImage: DImageInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DRoleInput {
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  name: String!
+  ownerRole: Boolean
+  users: [DIssuerUserInput!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DScanTransactionInput {
+  actions: [DScanTransactionInput!]
+  amountUsed: Int
+  dateScanned: Instant!
+  id: UUID!
+  issuer: DIssuerInput
+  pass: DPassInput
+  scan: DScanTransactionInput
+  scanType: ScanType
+  scanner: DScannerInput
+  scannerGroup: DScannerGroupInput
+  stampsUsed: Int
+  user: DUserInput
+}
+
+input DScannerGroupInput {
+  deleted: Boolean!
+  id: UUID!
+  issuer: DIssuerInput!
+  loginCode: String
+  name: String
+  passTemplates: [DPassTemplateInput!]!
+  scanners: [DScannerInput!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DScannerInput {
+  active: Boolean!
+  authenticationToken: String!
+  currentUser: DUserInput
+  deleted: Boolean!
+  deviceId: String
+  disabled: Boolean!
+  externalId: String
+  id: UUID!
+  issuer: DIssuerInput!
+  name: String
+  scannerGroup: DScannerGroupInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DSendGridStatusInput {
+  email: DEmailInput!
+  id: UUID!
+  reason: String
+  status: SendGridStatus!
+  whenCompleted: Instant!
+  whenCreated: Instant!
+}
+
+input DSessionInput {
+  accessToken: UUID!
+  deleted: Boolean!
+  expires: Instant!
+  id: UUID!
+  sessionToken: UUID!
+  user: DUserInput!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DStampStripImageInput {
+  bucketName: String!
+  deleted: Boolean!
+  description: String
+  filename: String!
+  height: Int!
+  id: UUID!
+  orderIndex: Int!
+  passTemplate: DPassTemplateInput
+  stampsLeft: Int
+  title: String
+  user: DUserInput
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  width: Int!
+}
+
+input DTermsAndConditionsInput {
+  dateAccepted: Instant!
+  id: UUID!
+  issuer: DIssuerInput!
+}
+
+input DUserDistributionTokenInput {
+  deleted: Boolean!
+  expirationDate: Instant
+  id: UUID!
+  passTemplate: DPassTemplateInput!
+  token: UUID!
+  user: DUserInput!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input DUserInput {
+  androidDeviceId: String
+  apiKeys: [DApiKeyInput!]!
+  appPassInstance: [DAppPassInstanceInput!]!
+  deleted: Boolean!
+  displayName: String
+  email: String!
+  id: UUID!
+  issuer: DIssuerInput
+  issuers: [DIssuerUserInput!]!
+  language: String
+  name: String
+  password: String
+  permissions: [DPermissionInput!]!
+  phoneNumber: String
+  photo: DImageInput
+  role: UserRole!
+  secretValues: [DIssuerUserSecretValueInput!]!
+  sessions: [DSessionInput!]!
+  smartWalletUser: Boolean
+  status: UserStatus
+  token: UUID
+  tokenExpiry: Instant
+  userDistributionTokens: [DUserDistributionTokenInput!]!
+  verifyToken: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum DateFormat {
+  DAY
+  HOUR
+  MONTH
+  YEAR
+}
+
+enum DemoEmailsType {
+  ONE_DAY_LEFT
+  THREE_DAYS_LEFT
+  TWO_DAYS_LEFT
+  ZERO_DAYS_LEFT
+}
+
+type DemoInfo implements BaseModel {
+  id: UUID!
+  issuerStatus: IssuerStatus
+  trialEndDate: LocalDate!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type Device implements BaseModel {
+  deviceType: DeviceType!
+  id: UUID!
+  userAgent: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type DeviceHistoryPageInfo implements PaginationInfo {
+  data: [DevicePassInstance!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type DevicePassInstance implements BaseModel {
+  deleted: Boolean!
+  device: Device!
+  id: UUID!
+  passAuthenticationToken: PassAuthenticationToken!
+  status: DevicePassInstanceStatus!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum DevicePassInstanceStatus {
+  ACTIVE
+  INACTIVE
+}
+
+enum DeviceType {
+  ANDROID
+  APPLE
+  OTHER
+  SMART_WALLET
+  WALLET_PASS
+}
+
+type DeviceTypeCount {
+  count: Int!
+  deviceType: DeviceType!
+}
+
+type Discount {
+  discount: Float
+  endDate: Instant
+}
+
+input DiscountDataInput {
+  discount: Float!
+  endDate: String!
+  passTemplateId: String!
+}
+
+input DynamicBarcodeDataInput {
+  code: String!
+  date: String!
+}
+
+enum DynamicBarcodeType {
+  BASIC
+  INCLUDE_TEMPLATE_ID
+}
+
+type Email implements BaseModel {
+  content: String
+  contentType: String
+  fromEmail: String
+  id: UUID!
+  passId: UUID
+  sendGridId: String
+  sendGridStatus: SendGridStatus
+  status: EmailStatus
+  statuses: [EmailStatus!]!
+  subject: String!
+  toEmail: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  whenSent: Instant
+}
+
+input EmailDataInput {
+  """
+  Emails body, accepts HTML and {{handlebar}} format.
+  """
+  body: String!
+
+  """
+  Emails subject, accepts {{handlebar}} format.
+  """
+  subject: String!
+}
+
+type EmailDistributionTransaction {
+  emails: [Email!]!
+  id: UUID!
+  status: EmailDistributionTransactionStatus
+  subject: String!
+  totalAmount: Int!
+}
+
+type EmailDistributionTransactionStatistics {
+  delivered: Int!
+  failed: Int!
+  opened: Int!
+  processed: Int!
+  sent: Int!
+  status: EmailDistributionTransactionStatus!
+  time: Instant!
+}
+
+enum EmailDistributionTransactionStatus {
+  CANCELLED
+  DONE
+  NOT_STARTED
+  PROCESSING
+  QUEUED
+}
+
+enum EmailDistributionTransactionType {
+  LIST
+  RESEND_UNCLAIMED
+}
+
+type EmailPage implements PaginationInfo {
+  data: [Email!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type EmailStatus {
+  email: Email!
+  id: UUID!
+  reason: String
+  status: SendGridStatus!
+  whenCompleted: Instant!
+}
+
+input ExpenceDataInput {
+  expenseType: MonthlyFeeType!
+  monthlyPrice: Int!
+  quantity: Int!
+}
+
+type Expense implements BaseModel {
+  discount: Float!
+  expenseType: MonthlyFeeType!
+  id: UUID!
+  monthlyPrice: Float!
+  quantity: Int!
+  version: Long!
+  whenCreated: Instant!
+  whenDeleted: LocalDate
+  whenModified: Instant!
+}
+
+enum ExpirationType {
+  EXPIRATION_DATE
+  SELECTED_TIME
+}
+
+type ExternalAPI implements BaseModel {
+  externalAPIType: ExternalAPIType!
+  id: UUID!
+  name: String
+  outputs: [ExternalAPIOutput!]!
+  parameters: [ExternalAPIParameter!]!
+  queryType: ExternalAPIQueryType!
+  url: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum ExternalAPIArrayMatchType {
+  FIRST_ITEM
+  LAST_ITEM
+}
+
+input ExternalAPIDataInput {
+  externalAPIType: ExternalAPIType!
+  id: String
+  name: String
+  outputs: [ExternalAPIOutputDataInput!]
+  parameters: [ExternalAPIParameterDataInput!]
+  queryType: ExternalAPIQueryType!
+  url: String
+}
+
+type ExternalAPIOutput implements BaseModel {
+  description: String
+  id: UUID!
+  innerPath: String
+  label: String!
+  matchType: ExternalAPIArrayMatchType!
+  passInputField: PassInputField!
+  path: String!
+  searchMatch: String
+  searchPath: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input ExternalAPIOutputDataInput {
+  description: String
+  id: String
+  innerPath: String
+  label: String
+  matchType: ExternalAPIArrayMatchType!
+  passInputFieldId: String!
+  path: String!
+  searchMatch: String
+  searchPath: String
+}
+
+type ExternalAPIParameter implements BaseModel {
+  id: UUID!
+  name: String!
+  parameterType: ExternalAPIParameterType!
+  passInputField: PassInputField
+  secret: IssuerSecret
+  userSecret: IssuerUserSecret
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input ExternalAPIParameterDataInput {
+  id: String
+  name: String
+  parameterType: ExternalAPIParameterType!
+  passInputFieldId: String
+  secretId: String
+  userSecretId: String
+  value: String
+}
+
+enum ExternalAPIParameterType {
+  GET
+  HEADER
+  POST
+  URL_APPEND
+}
+
+enum ExternalAPIQueryType {
+  ON_CREATE_AND_UPDATE
+  ON_CREATE_ONLY
+}
+
+enum ExternalAPIType {
+  JSON
+}
+
+type ExternalIdentifier {
+  externalIdentifier: String!
+}
+
+input ExternalIdentifierDataInput {
+  externalIdentifier: String!
+  id: UUID!
+}
+
+type ExternalIdentifierPageInfo implements PaginationInfo {
+  data: [ExternalIdentifier!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type FeatureFlag {
+  active: Boolean!
+  activeWhen: Instant
+  issuerExemptions: [FeatureFlagIssuerExemption!]!
+  key: String!
+  whenActivated: Instant
+  whenCreated: Instant!
+}
+
+type FeatureFlagIssuerExemption {
+  active: Boolean!
+  issuer: Issuer!
+  whenActivated: Instant
+}
+
+type File {
+  displayUrl: String!
+  filename: String
+  id: UUID!
+  originalFilename: String
+  originalUrl: String
+  url: String
+}
+
+input FileDataInput {
+  displayUrl: String
+  filename: String
+  id: String!
+  originalFilename: String
+  originalUrl: String
+  url: String
+}
+
+type FixedMonthlyFee implements BaseModel {
+  id: UUID!
+  monthlyFeeType: MonthlyFeeType!
+  monthlyPrice: Money!
+  plan: Plan
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input FixedMonthlyFeeDataInput {
+  monthlyFeeType: MonthlyFeeType!
+  monthlyPrice: MoneyDataNullableInput!
+}
+
+enum GenericOrderByColumn {
+  VERSION
+  WHEN_CREATED
+  WHEN_MODIFIED
+}
+
+input GenericOrderInput {
+  column: GenericOrderByColumn
+  columnAsString: String
+  dir: OrderByDirection
+}
+
+input GenericOrderMultiInput {
+  column: String!
+  dir: OrderByDirection
+}
+
+input HideByStatusTypeInput {
+  deleted: Boolean
+  expired: Boolean
+  voided: Boolean
+}
+
+type Image {
+  description: String
+  filename: String!
+  height: Int!
+  id: UUID!
+  originalUrl: String
+  title: String
+  url: String!
+  width: Int!
+}
+
+input ImageDataInput {
+  description: String
+  filename: String
+  height: Int
+  id: String
+  imageBase64String: String
+  originalUrl: String
+  title: String
+  url: String
+  width: Int
+}
+
+"""
+A type representing a formatted java.util.Instant
+"""
+scalar Instant
+
+type IntRangeInfo {
+  first: Int!
+  last: Int!
+  step: Int!
+}
+
+type Invite {
+  companyId: UUID!
+  companyName: String
+  email: String
+  hasAccount: Boolean!
+  id: UUID!
+  isAccepted: Boolean!
+  role: String
+}
+
+type Issuer implements BaseModel {
+  address: String
+  contactEmail: String
+  contactName: String
+  contactPhone: String
+  currentPlanSubscription: PlanSubscription
+  discounts: [IssuerDiscount!]
+  id: UUID!
+  idNumber: String
+  invoiceEmail: String
+  logoIcon: Image
+  name: String
+  paymentInfo: PaymentInfo
+  planSubscriptions: [PlanSubscriptionVersion!]!
+  secrets: [IssuerSecret!]
+  serviceContactEmail: String
+  skipFooter: Boolean!
+  status: IssuerStatus
+  termsAndConditionsChecked: Boolean!
+  town: String
+  userSecrets: [IssuerUserSecret!]
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  zipcode: String
+}
+
+input IssuerDataInput {
+  address: String
+  contactEmail: String
+  contactName: String
+  contactPhone: String
+  email: String
+  idNumber: String
+  invoiceEmail: String
+  logoIcon: ImageDataInput
+  name: String
+  password: String
+  paymentInfo: PaymentInfoDataInput
+  planType: PlanType
+  serviceContactEmail: String
+  skipFooter: Boolean
+  termsAndConditions: Boolean
+  town: String
+  zipcode: String
+}
+
+type IssuerDiscount implements BaseModel {
+  discount: Float!
+  endDate: Instant
+  id: UUID!
+  startDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input IssuerDiscountDataInput {
+  discount: Float!
+  endDate: String
+  id: String
+  issuerId: String!
+  startDate: String
+}
+
+type IssuerPageInfo implements PaginationInfo {
+  data: [Issuer!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type IssuerSecret implements BaseModel {
+  id: UUID!
+  name: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input IssuerSecretDataInput {
+  id: String
+  name: String!
+  value: String
+}
+
+enum IssuerStatus {
+  ACCEPTED
+  ACTIVE
+  CANCELLED
+  DEMO_EXPIRED
+  IN_REVIEW
+}
+
+type IssuerTerms implements BaseModel {
+  id: UUID!
+  paymentTerms: File
+  paymentTermsUrl: String
+  privacyPolicy: File
+  privacyPolicyUrl: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input IssuerTermsDataInput {
+  id: String
+  paymentTerms: FileDataInput
+  paymentTermsUrl: String
+  privacyPolicy: FileDataInput
+  privacyPolicyUrl: String
+}
+
+type IssuerUser {
+  issuer: Issuer!
+  role: Role
+}
+
+type IssuerUserSecret implements BaseModel {
+  id: UUID!
+  name: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input IssuerUserSecretDataInput {
+  id: String
+  name: String!
+}
+
+type IssuerUserSecretValue implements BaseModel {
+  id: UUID!
+  secret: IssuerUserSecret!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input IssuerUserSecretValueDataInput {
+  id: String
+  secretId: String!
+  value: String
+}
+
+type KeyValuePair {
+  key: String!
+  value: String!
+}
+
+enum LanguageType {
+  IS
+}
+
+type LastRedeemed {
+  date: String!
+}
+
+"""
+A type representing a formatted java.util.ZonedDateTime
+"""
+scalar LocalDate
+
+type Location {
+  id: UUID!
+  latitude: Float!
+  longitude: Float!
+  relevantText: String!
+}
+
+input LocationDataInput {
+  id: String
+  latitude: Float
+  longitude: Float
+  name: String
+  relevantText: String
+}
+
+"""
+A type representing a formatted Kotlin.Long
+"""
+scalar Long
+
+type Money {
+  amount: Float!
+  currency: String!
+}
+
+input MoneyDataInput {
+  amount: Float!
+  currency: String!
+}
+
+input MoneyDataNullableInput {
+  amount: Float
+  currency: String!
+}
+
+enum MonthlyFeeType {
+  API_CONNECTION
+  DKPLUS
+  EXTERNAL_API
+  EXTERNAL_AUTHENTICATION
+  GENERAL_WORK
+  PASS_TEMPLATE_WORK
+  SCANNER_LICENSE
+  SERVICE_FEE
+  SPECIALIST
+  STARTER_ADVICE
+}
+
+type Mutation {
+  addEmailToInputFields(passTemplateId: String!): PassTemplate!
+  addIssuerExemptionToFeatureFlag(issuerId: String!, key: String!): FeatureFlag!
+  addUserToIssuer(issuerId: String, userId: String!): Boolean!
+  batchUpdateScanner(data: ScannerDataInput!, scannerIds: [String!]!): Boolean!
+  bulkUpsertThumbnails(data: [ThumbnailDataInput!]!): Boolean!
+  cancelSubscription: Boolean!
+  changeIssuerExemptionStatusOfFeatureFlag(
+    issuerId: String!
+    key: String!
+    status: Boolean!
+  ): FeatureFlag!
+  changePassword(currentPassword: String!, newPassword: String!): Boolean!
+  changeUserRole(
+    """
+    ID of issuer, only available to System Admins
+    """
+    issuerId: String
+    roleId: String!
+    userId: String
+  ): Boolean!
+  changeUserStatus(userId: String!): Boolean!
+  clearExternalIdentifiers(passTemplateId: String!): Int!
+  confirmEmail(token: String!): Boolean!
+  confirmOrDenyIssuerInvite(
+    accepted: Boolean!
+    issuerId: String!
+    switchIssuer: Boolean
+  ): Boolean!
+  confirmSubscription: Boolean!
+  createFeatureFlag(key: String!): FeatureFlag!
+  deactivateAllDevicePassInstances(passId: String!): Boolean!
+  deactivateDevicePassInstance(id: String!): Boolean!
+  deleteAllUnclaimedPasses(before: String, passTemplateId: String!): Boolean!
+  deleteAndReturnPass(id: String!): Pass!
+  deleteApiKey(id: String!): Boolean!
+  deleteAppPassInstance(id: String!): Boolean!
+  deleteExternalIdentifier(
+    externalIdentifier: String!
+    passTemplateId: String!
+  ): PassTemplate!
+  deleteFeatureFlag(key: String!): Boolean!
+  deleteIssuer(id: String!): Boolean!
+  deleteIssuerDiscount(id: String!): Boolean!
+  deleteIssuerExemptionOfFeatureFlag(issuerId: String!, key: String!): Boolean!
+  deleteIssuerSecret(id: String!): Boolean!
+  deleteIssuerUserSecret(id: String!): Boolean!
+  deleteIssuerUserSecretValue(id: String!): Boolean!
+  deletePass(id: String!): Boolean!
+  deletePassTemplate(id: String!): Boolean!
+  deletePlan(planId: String!): Boolean!
+  deleteRole(id: String!): Boolean!
+  deleteScanner(id: String!): Boolean!
+  deleteScannerGroup(id: String!): Boolean!
+  deleteStoragePass(passId: String!): Boolean!
+  deleteUniquePass(
+    passTemplateId: String!
+    values: [PassInputFieldValueDataInput!]!
+  ): Boolean!
+  deleteUser(id: String!, shouldPermanentlyDelete: Boolean): Boolean!
+  disguiseAs(id: String!): Issuer
+  distributePassesByEmail(
+    emailData: EmailDataInput!
+    passData: [PassEmailDataInput!]!
+    passTemplateId: String!
+  ): UUID!
+  dkPlusLoginStep1(password: String!, username: String!): [DKPlusCompanyType!]!
+  dkPlusLoginStep2(
+    companyId: String!
+    password: String!
+    username: String!
+  ): Boolean!
+  duplicatePassTemplate(passTemplateId: String!): PassTemplate!
+  executeAutomation(id: String!, nodeId: String!): String!
+  expireIssuer(id: String!): Boolean!
+  forgotPassword(email: String!): Boolean!
+  gaman: Boolean!
+  generateNewPassTemplateDistributionToken(id: String!): String!
+  generateNewPosCode(passId: String!): Pass!
+  inviteUserToIssuer(email: String!, roleId: String!): Boolean!
+  login(email: String!, password: String!): User
+  loginSmartScanner(email: String!, password: String!): UserOld
+  loginSmartScannerQR(
+    code: String!
+    deviceId: String!
+    deviceName: String
+  ): Scanner!
+  loginSmartScannerV3(
+    deviceId: String!
+    deviceName: String
+    email: String!
+    password: String!
+  ): Scanner!
+  logout: Boolean!
+  posDistributionPass(
+    code: String!
+    distributionToken: String!
+    passTemplateId: String!
+  ): Pass!
+  reactivateDevicePassInstance(id: String!): Boolean!
+  redeemPassbuilderPass(passId: String!): Boolean!
+  redeemPassbuilderPunchPass(passId: String!, punches: Int!): PassbuilderPass!
+  refreshScannerGroupCode(id: String!): Boolean!
+  register(data: RegistrationDataInput!): Boolean!
+  registerFromInvite(data: RegistrationInviteDataInput!): Boolean!
+  registerUser(data: RegisterDataInput!): Boolean!
+  removeNode(nodeId: String!): Boolean!
+  removeUser(issuerUserId: String!): Boolean!
+  removeUserOption(option: String!, userId: String): Boolean!
+  resendEmail(id: String!): Email!
+  resendUnclaimedPasses(
+    emailData: EmailDataInput!
+    passTemplateId: String!
+  ): String!
+  resendUserInvite(id: String!): Boolean!
+  resetPassword(password: String!, token: String!): Boolean!
+  restoreUser(id: String!): Boolean!
+  scanAction(
+    scannerData: ScannerActionDataInput!
+    transactionId: String!
+  ): Boolean!
+  sendDaysLeftOfDemo(daysLeft: Int!): Boolean!
+  sendPassEmails(
+    content: String!
+    passIds: [String!]
+    passTemplateId: String
+    subject: String!
+  ): SendPassEmailsResponse!
+  sendWelcomeEmail(issuerId: String!): Boolean!
+  setActivePlanForIssuer(issuerId: String!, planId: String!): PlanSubscription!
+  setActivePlanSubscription(planId: String!): PlanSubscription!
+  setDaysLeftOfDemo(daysLeft: Long!): Boolean!
+  setDiscountOnTemplate(data: DiscountDataInput!): Boolean!
+  setInTrial(issuerId: String!): Boolean!
+  setIssuerExpired: Boolean!
+  subtractAmountOnGiftPass(amountToSubtract: Int!, passId: String!): Pass!
+  switchIssuer(issuerId: String!): Boolean!
+  unvoidAndReturnPass(id: String!): Pass!
+  unvoidPass(id: String!): Boolean!
+  unvoidPassTemplate(id: String!): Boolean!
+  updateCount(count: Int!, id: String!): Pass!
+  updateFeatureFlagStatus(
+    """
+    Only used when status=active
+    """
+    activeWhen: String
+    key: String!
+    status: Boolean!
+  ): Boolean!
+  updateIssuer(data: IssuerDataInput!): Issuer!
+  updateIssuerInfo(data: IssuerDataInput!, issuerId: String!): Issuer!
+  updatePass(
+    expirationDate: String
+    passId: String
+    passTemplateId: String!
+    thumbnail: ImageDataInput
+    values: [PassInputFieldValueDataInput!]
+  ): Pass!
+  updatePassAuthenticationTokenStatus(
+    id: String!
+    status: PassAuthenticationTokenStatus!
+  ): PassAuthenticationToken!
+  updatePassByScannerAction(scannerData: ScannerActionDataInput!): Boolean!
+  updateQrCodeImage(
+    passTemplateId: String!
+    qrCodeImage: ImageDataInput
+  ): PassTemplate!
+  updateStamps(id: String!, stampsLeft: Int!): Pass!
+  updateStatusOnPass(amountToSubtract: Int, passId: String!, stamps: Int): Pass!
+  updateStatusOnPassWithDynamicBarcode(
+    amountToSubtract: Int
+    dynamicBarcodeData: DynamicBarcodeDataInput!
+    stamps: Int
+  ): Pass!
+  updateTrialEndDate(issuerId: String, trialEndDate: String!): Boolean!
+  upsertApiKey(data: ApiKeyDataInput!): ApiKey!
+  upsertAppPassInstance(data: AppPassInstanceDataInput!): AppPassInstance!
+  upsertAppUser(data: AppUserDataInput!): User!
+  upsertAutomation(data: AutomationDataInput!): Automation!
+  upsertAutomationFromEditor(
+    data: AutomationEditorDataInput!
+  ): AutomationEditor!
+  upsertDistributionPass(data: PassDataInput!): Pass!
+  upsertFixedMonthlyFee(data: FixedMonthlyFeeDataInput!): FixedMonthlyFee!
+  upsertFixedMonthlyFees(
+    data: [FixedMonthlyFeeDataInput!]!
+  ): [FixedMonthlyFee!]!
+  upsertIntegration(
+    amountToChange: Int
+    enable: Boolean!
+    integrationType: MonthlyFeeType!
+    issuerId: String
+  ): Boolean!
+  upsertIssuerDiscount(data: IssuerDiscountDataInput!): IssuerDiscount!
+  upsertIssuerSecret(data: IssuerSecretDataInput!): IssuerSecret!
+  upsertIssuerUserSecret(data: IssuerUserSecretDataInput!): IssuerUserSecret!
+  upsertIssuerUserSecretValue(
+    data: IssuerUserSecretValueDataInput!
+  ): IssuerUserSecretValue!
+  upsertLocation(data: LocationDataInput!): Location
+    @deprecated(reason: "Not used, replace with Use inside pass template")
+  upsertNode(data: NodeDataInput!): Node!
+  upsertNodes(automationId: String!, data: [NodeDataInput!]!): [Node!]!
+  upsertNodesFromEditor(
+    automationId: String!
+    data: [NodeEditorDataInput!]!
+  ): [Node!]!
+  upsertNumberOfPasses(numberOfPasses: Int!, passTemplateId: String!): Int!
+  upsertOption(data: NodeOptionDataInput!, nodeId: String!): NodeOption!
+  upsertOrderInfo(data: OrderInfoDataInput!, issuer: DIssuerInput!): OrderInfo!
+  upsertOtherExpenses(
+    data: SubscriptionDataInput!
+    month: Int!
+    year: Int!
+  ): PlatformSubscription!
+  upsertPass(data: PassDataInput!): Pass!
+  upsertPassIntegration(data: PassIntegrationDataInput!): PassIntegration!
+  upsertPassIntegrations(
+    data: [PassIntegrationDataInput!]!
+  ): [PassIntegration!]!
+  upsertPassPricing(data: PassPricingDataInput!): PassPricing!
+  upsertPassPricings(data: [PassPricingDataInput!]!): [PassPricing!]!
+  upsertPassTemplate(data: PassTemplateDataInput!): PassTemplate!
+  upsertPassTemplateExternalIdentifiers(
+    externalIdentifiers: [String!]!
+    passTemplateId: String!
+  ): Int!
+  upsertPasses(data: [PassDataInput!]!): [Pass!]!
+  upsertPaymentInfo(data: PaymentInfoDataInput!): PaymentInfo!
+  upsertPlan(data: PlanDataInput!): Plan!
+  upsertPrices(data: PricesDataInput!): Prices!
+  upsertRole(data: RoleDataInput!): Role!
+  upsertScanner(data: ScannerDataInput!): Scanner!
+  upsertScannerGroup(data: ScannerGroupDataInput!): ScannerGroup!
+  upsertUser(data: UserDataInput!): User!
+  upsertUserAsAdmin(data: UserDataInput!): User!
+  upsertUserOption(
+    option: String!
+    userId: String
+    value: String!
+  ): [UserOptionData!]!
+  voidAndReturnPass(id: String!): Pass!
+  voidPass(id: String!): Boolean!
+  voidPassTemplate(id: String!): Boolean!
+  voidUniquePass(
+    passTemplateId: String!
+    values: [PassInputFieldValueDataInput!]!
+  ): Boolean!
+}
+
+type Node {
+  automation: Automation
+  children: [Node!]!
+  config: [NodeOption!]!
+  id: UUID!
+  options: String!
+  parent: Node
+  type: String!
+}
+
+type NodeAvailableOptionChoice {
+  displayText: String
+  value: String
+}
+
+type NodeAvailableOptionsType {
+  choices: [NodeAvailableOptionChoice!]!
+  default: String
+  dependentOn: String
+  description: String
+  fieldType: OptionsFieldTypes!
+  match: String
+  name: String!
+  required: Boolean
+  schema: OptionsSchemaTypes
+}
+
+enum NodeCategories {
+  ACTION
+  DATA
+  TRIGGER
+}
+
+input NodeDataInput {
+  automationId: String
+  id: String
+  nodeType: String
+  options: String
+  parentId: String
+}
+
+input NodeEditorDataInput {
+  node: NodeDataInput!
+  options: [NodeOptionDataInput!]!
+  selected: Boolean!
+}
+
+type NodeNotice {
+  message: String
+  type: NodeNoticeType!
+}
+
+enum NodeNoticeType {
+  ERROR
+  INFO
+  WARNING
+}
+
+type NodeOption {
+  children: [NodeOption!]!
+  id: UUID!
+  key: String!
+  node: Node!
+  parent: NodeOption
+  value: String
+}
+
+input NodeOptionDataInput {
+  id: String
+  key: String!
+  parentId: String
+  value: String
+}
+
+type NodeType {
+  category: NodeCategories!
+  info: [NodeTypesNodeInfo!]!
+  name: String!
+  namespace: String!
+  notices: [NodeNotice!]!
+  options: [NodeAvailableOptionsType!]!
+  type: String!
+}
+
+type NodeTypesNodeInfo {
+  key: String!
+  value: String!
+}
+
+enum OptionsFieldTypes {
+  CHECKBOX
+  DATA_VALUE
+  DATA_VALUE_EQUAL
+  DATA_VALUE_EQUAL_INPUT_FIELD
+  JSON
+  NUMBER
+  PASS_TEMPLATE
+  RADIO
+  TEXT
+}
+
+enum OptionsSchemaTypes {
+  MAP_STRING_STRING
+}
+
+enum OrderByDirection {
+  ASC
+  DESC
+}
+
+type OrderInfo implements BaseModel {
+  amount: String!
+  confirmed: Boolean
+  currency: CurrencyType!
+  id: UUID!
+  orderId: String!
+  passId: UUID
+  passTemplateId: UUID
+  passTemplateName: String
+  payed: Boolean
+  paymentProvider: PaymentProvider!
+  productDescription: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input OrderInfoDataInput {
+  amount: String!
+  confirmed: Boolean
+  currency: CurrencyType!
+  id: String
+  issuer: DIssuerInput!
+  orderId: String!
+  pass: DPassInput
+  passTemplate: DPassTemplateInput
+  payed: Boolean
+  paymentProvider: PaymentProvider!
+  productDescription: String
+}
+
+interface PaginationInfo {
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+input PaginationInput {
+  skip: Int
+  take: Int
+}
+
+type Pass implements BaseModel {
+  alreadyPaid: Boolean!
+  appPassInstances: [AppPassInstance!]!
+  authenticationTokens(
+    pagination: PaginationInput
+  ): PassAuthenticationTokenPageInfo!
+  deliveryPageUrl: String!
+  devicePassInstances: [DevicePassInstance!]!
+  distributionQRCode: String!
+  distributionUrl: String!
+  emails: [Email!]!
+  expirationDate: Instant
+  expirationDateWithoutTime: String!
+  expirationTime: String!
+  externalIdentifier: String
+  hasMissingExternalAuthentication: Boolean!
+  hasMissingMemberInputFieldValues: Boolean!
+  hasViolation: Boolean!
+  id: UUID!
+  inputFieldValues: [PassInputFieldValue!]!
+  isReward: Boolean
+  isVoided: Boolean!
+  passBackSide: [PassBackSide!]!
+  passTemplate: PassTemplate
+  posDistributionCode: String
+  requiresCustomerInput: Boolean!
+  requiresThumbnail: Boolean!
+  stampsLeft: Int
+  status: PassStatus!
+  thumbnail: Image
+  validFrom: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum PassActionType {
+  ADDED_TO_DEVICE
+  CREATED
+  DELETED
+  DELETION_CANCELLED
+  DELETION_INITIATED
+  DEVICE_INSTANCE_DEACTIVATED
+  DEVICE_INSTANCE_REACTIVATED
+  EMAIL_SENT
+  PASS_SCANNED
+  RECREATED
+  REMOVED_FROM_DEVICE
+  TOKEN_ACTIVATED
+  TOKEN_EXPIRED
+  TOKEN_INVALIDATED
+  UNVOIDED
+  VOIDED
+}
+
+type PassAuthenticationToken implements BaseModel {
+  devicePassInstances: [DevicePassInstance!]!
+  id: UUID!
+  status: PassAuthenticationTokenStatus!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  whenUsed: Instant
+}
+
+type PassAuthenticationTokenPageInfo implements PaginationInfo {
+  data: [PassAuthenticationToken!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+enum PassAuthenticationTokenStatus {
+  ACTIVE
+  EXPIRED
+  INVALID
+}
+
+type PassBackSide implements BaseModel {
+  expirationDate: Instant
+  id: UUID!
+  label: String
+  orderIndex: Int!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassBackSideDataInput {
+  expirationDate: String
+  id: String
+  label: String
+  orderIndex: Int!
+  value: String
+}
+
+type PassBeacon implements BaseModel {
+  id: UUID!
+  major: Int!
+  minor: Int!
+  name: String!
+  proximityUUID: String!
+  relevantText: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassBeaconDataInput {
+  id: String
+  major: Int!
+  minor: Int!
+  name: String!
+  proximityUUID: String!
+  relevantText: String!
+}
+
+input PassDataInput {
+  alreadyPaid: Boolean
+  distributionToken: String
+  expirationDate: String
+  expirationDateWithoutTime: String
+  expirationTime: String
+  externalIdentifier: String
+  id: String
+  inputFieldValues: [PassInputFieldValueDataInput!]
+  isVoided: Boolean
+  passBackSide: [PassBackSideDataInput!]
+  passTemplateDistributionToken: String
+  passTemplateId: String
+  posDistributionCode: String
+  stampsLeft: Int
+  thumbnail: ImageDataInput
+  thumbnailUrl: String
+  validFrom: String
+}
+
+input PassEmailDataInput {
+  alreadyPaid: Boolean
+  expirationDate: String
+  expirationDateWithoutTime: String
+  expirationTime: String
+  externalIdentifier: String
+  inputFieldValues: [PassInputFieldValueDataInput!]
+  isVoided: Boolean
+  passBackSide: [PassBackSideDataInput!]
+  stampsLeft: Int
+  thumbnail: ImageDataInput
+  thumbnailUrl: String
+  validFrom: String
+}
+
+type PassField implements BaseModel {
+  deletedText: String
+  expiredText: String
+  hideOnDeleted: Boolean!
+  hideOnExpired: Boolean!
+  hideOnVoided: Boolean!
+  id: UUID!
+  label: String!
+  orderIndex: Int!
+  passInputField: PassInputField
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+  version: Long!
+  voidedText: String
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassFieldDataInput {
+  deletedText: String
+  expiredText: String
+  hideOnDeleted: Boolean
+  hideOnExpired: Boolean
+  hideOnVoided: Boolean
+  id: String
+  label: String!
+  passInputFieldId: String
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+  voidedText: String
+}
+
+enum PassFieldType {
+  AUXILIARY
+  BACK
+  HEADER
+  PRIMARY
+  SECONDARY
+}
+
+type PassHistoryEntry {
+  action: PassActionType!
+  comment: String
+  instance: DevicePassInstance
+  token: PassAuthenticationToken
+  whenModified: Instant!
+}
+
+type PassInputField implements BaseModel {
+  deleted: Boolean!
+  description: String
+  format: PassInputFieldFormat!
+  id: UUID!
+  identifier: String!
+  isExternalAuthField: Boolean!
+  label: String!
+  mandatory: Boolean!
+  type: PassInputFieldType!
+  unique: Boolean!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassInputFieldDataInput {
+  description: String
+  format: PassInputFieldFormat!
+  id: String
+  identifier: String!
+  label: String!
+  mandatory: Boolean!
+  type: PassInputFieldType
+  unique: Boolean!
+  userInputField: Boolean!
+}
+
+enum PassInputFieldFormat {
+  DATE
+  EMAIL
+  NUMBER
+  TEXT
+  URL
+}
+
+enum PassInputFieldType {
+  ISSUER
+  MEMBER
+}
+
+type PassInputFieldValue implements BaseModel {
+  id: UUID!
+  passInputField: PassInputField!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassInputFieldValueDataInput {
+  id: String
+  identifier: String
+  passInputFieldId: String
+  value: String
+}
+
+type PassIntegration implements BaseModel {
+  additionalRate: Float
+  id: UUID!
+  plan: Plan
+  type: PassIntegrationType!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassIntegrationDataInput {
+  additionalRate: Float
+  passIntegrationType: PassIntegrationType!
+}
+
+enum PassIntegrationType {
+  DYNAMIC_BARCODE
+  NFC
+}
+
+type PassPageInfo implements PaginationInfo {
+  data: [Pass!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type PassPricing implements BaseModel {
+  id: UUID!
+  passPrice: Money!
+  passType: PassType!
+  plan: Plan
+  range: PassesRangeInfo!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassPricingDataInput {
+  passPrice: MoneyDataNullableInput!
+  passType: PassType!
+  range: PassesRangeDataInput!
+}
+
+input PassSearchDataInput {
+  exact: Boolean
+  hasNoEmail: Boolean
+  query: String
+}
+
+enum PassStatus {
+  ACTIVE
+  DELETED
+  DELETE_IN_PROGRESS
+  EXPIRED
+  INACTIVE
+  REDEEMED
+  UNCLAIMED
+  UPDATES_OFF
+  VOIDED
+}
+
+type PassTemplate implements BaseModel {
+  addOnPassTemplates: [AddOnPassTemplate!]!
+  allowReward: Boolean!
+  backFields: [PassField!]!
+  backgroundColor: String
+  backgroundImage: Image
+  barcodeFormat: String
+  barcodeTextFormat: String
+  barcodeType: BarcodeType!
+  beacons: [PassBeacon!]!
+  dateFormat: DateFormat
+  dateNumber: Int
+  deletedPassTemplateId: UUID
+  deliveryPageUrl: String!
+  description: String
+  disableCsvDownload: Boolean!
+  disableDeleteUnclaimedPasses: Boolean!
+  disableIssue: Boolean!
+  distributionUrl: String!
+  dynamicBarcodeExpirationTimeSeconds: Long
+  dynamicBarcodeType: DynamicBarcodeType!
+  expirationDate: Instant
+  expirationDateWithoutTime: String!
+  expirationTime: String!
+  expirationType: ExpirationType
+  externalAPIs: [ExternalAPI!]!
+  externalAuthAgeVerification: Int
+  externalAuthEnablePOS: Boolean!
+  externalAuthIdField: PassInputField
+  externalAuthNameField: PassInputField
+  externalAuthUseIdentifiers: Boolean!
+  fields: [PassField!]!
+  firstDeviceOnly: Boolean!
+  footerImage: Image
+  foregroundColor: String
+  grayOnExpired: Boolean!
+  hasDynamicBarcode: Boolean!
+  hasInputFields: Boolean!
+  icon: Image
+  id: UUID!
+  inputFields: [PassInputField!]!
+  isDeletedPassTemplate: Boolean!
+  isNFC: Boolean!
+  isSharingProhibited: Boolean!
+  issuer: Issuer
+  labelColor: String
+  locations: [PassTemplateLocation!]!
+  lockInputFields: Boolean!
+  logScansOnBack: Boolean!
+  logo: Image
+  logoText: String
+  mandatoryThumbnail: Boolean!
+  memberThumbnailImage: Boolean!
+  minAmount: Int
+  name: String
+  nfcValue: String
+  notificationOnScan: Boolean!
+  oncePerDevice: Boolean!
+  oneDeviceAtATime: Boolean!
+  oneDevicePerToken: Boolean!
+  onePassOfTemplateTypePerDevice: Boolean!
+  passPrice: Int
+  passTemplateInvalidRoute: String!
+  passTemplateType: PassTemplateType!
+  paymentInfo: PaymentInfo
+  posDistributionOnly: Boolean!
+  publicKey: String
+  qrCodeImage: Image
+  quantityRestriction: Int
+  refillRenewal: Boolean!
+  rewardPassTemplate: RewardPassTemplate
+  sendBackUpPass: Boolean!
+  serviceEmail: String
+  serviceEmailType: ServiceEmailType!
+  singleDeviceOnly: Boolean!
+  stampBackgroundColor: String
+  stampStripImage: [StampStripImage!]!
+  stampedImage: Image
+  stamps: Int
+  status: PassTemplateStatus!
+  statusFields: Boolean!
+  stripBackgroundColor: String
+  stripImage: Image
+  thumbnail: Image
+  triggers: [PassTemplateTrigger!]!
+  unstampedImage: Image
+  useExternalAuth: Boolean!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassTemplateDataInput {
+  addOnPassTemplates: [AddOnPassTemplateDataInput!]
+  allowReward: Boolean
+  backFields: [PassFieldDataInput!]
+  backgroundColor: String
+  backgroundImage: ImageDataInput
+  barcodeFormat: String
+  barcodeTextFormat: String
+  barcodeType: BarcodeType!
+  beacons: [PassBeaconDataInput!]
+  dateFormat: DateFormat
+  dateNumber: Int
+  deletedPassTemplateId: String
+  description: String
+  disableCsvDownload: Boolean
+  disableDeleteUnclaimedPasses: Boolean
+  disableIssue: Boolean
+  dynamicBarcodeExpirationTimeSeconds: Long
+  dynamicBarcodeType: DynamicBarcodeType
+  expirationDate: String
+  expirationDateWithoutTime: String
+  expirationTime: String
+  expirationType: ExpirationType
+  externalAPIs: [ExternalAPIDataInput!]
+  externalAuthAgeVerification: Int
+  externalAuthEnablePOS: Boolean
+  externalAuthIdFieldId: String
+  externalAuthNameFieldId: String
+  externalAuthUseIdentifiers: Boolean
+  externalIdentifiers: [ExternalIdentifierDataInput!]
+  fields: [PassFieldDataInput!]
+  firstDeviceOnly: Boolean
+  footerImage: ImageDataInput
+  foregroundColor: String
+  grayOnExpired: Boolean
+  hasDynamicBarcode: Boolean
+  icon: ImageDataInput
+  id: String
+  inputFields: [PassInputFieldDataInput!]
+  isDeletedPassTemplate: Boolean
+  isNFC: Boolean
+  isSharingProhibited: Boolean
+  labelColor: String
+  locations: [PassTemplateLocationDataInput!]
+  lockInputFields: Boolean
+  logScansOnBack: Boolean
+  logo: ImageDataInput
+  logoText: String
+  mandatoryThumbnail: Boolean
+  memberThumbnailImage: Boolean
+  minAmount: Int
+  name: String
+  nfcValue: String
+  notificationOnScan: Boolean
+  oncePerDevice: Boolean
+  oneDeviceAtATime: Boolean
+  oneDevicePerToken: Boolean
+  onePassOfTemplateTypePerDevice: Boolean
+  passPrice: Int
+  passTemplateType: PassTemplateType!
+  posDistributionOnly: Boolean
+  publicKey: String
+  qrCodeImage: ImageDataInput
+  quantityRestriction: Int
+  refillRenewal: Boolean
+  rewardPassTemplate: RewardPassTemplateDataInput
+  sendBackUpPass: Boolean
+  sendNotifications: Boolean
+  serviceEmail: String
+  serviceEmailType: ServiceEmailType!
+  singleDeviceOnly: Boolean
+  stampBackgroundColor: String
+  stampedImage: ImageDataInput
+  stamps: Int
+  statusFields: Boolean
+  stripBackgroundColor: String
+  stripImage: ImageDataInput
+  thumbnail: ImageDataInput
+  triggers: [PassTemplateTriggerDataInput!]
+  unstampedImage: ImageDataInput
+  useExternalAuth: Boolean
+}
+
+type PassTemplateLocation {
+  id: UUID!
+  latitude: Float!
+  longitude: Float!
+  relevantText: String!
+}
+
+input PassTemplateLocationDataInput {
+  id: String
+  latitude: Float!
+  longitude: Float!
+  relevantText: String!
+}
+
+type PassTemplatePageInfo implements PaginationInfo {
+  data: [PassTemplate!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type PassTemplatePrice {
+  details: [PassTemplatePriceDetails!]!
+  discountOnTemplate: Discount
+  hasDynamicBarcode: Boolean!
+  isDiscount: Boolean!
+  isNFC: Boolean!
+  passTemplateId: UUID!
+  passTemplateName: String
+  passTemplateType: PassTemplateType!
+  totalPasses: Int!
+  totalPrice: Float!
+}
+
+type PassTemplatePriceDetails {
+  currency: String!
+  discount: Float!
+  passIntegrationType: PassIntegrationType
+  passPrice: Float!
+  plan: Plan!
+  quantity: Int!
+  range: String!
+  ratio: Float!
+  totalPrice: Money!
+}
+
+type PassTemplateStatistics {
+  activePasses: Int!
+  deletedPasses: Int!
+  expiredPasses: Int!
+  passScans: Int!
+  redeemedAmount: Int!
+  redeemedPasses: Int!
+  redeemedStamps: Int!
+  remainingAmount: Int!
+  soldPasses: Int!
+  totalPasses: Int!
+  totalPunchesLeft: Int!
+  totalSoldRevenue: Int!
+  unclaimedPasses: Int!
+  valueUnusedGift: Int!
+  valueUnusedPunches: Int!
+  voidedPasses: Int!
+}
+
+enum PassTemplateStatus {
+  ACTIVE
+  DELETED
+  VOIDED
+}
+
+type PassTemplateTrigger implements BaseModel {
+  active: Boolean!
+  id: UUID!
+  options: String!
+  type: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PassTemplateTriggerDataInput {
+  active: Boolean!
+  id: String
+
+  """
+  Option data in JSON format.
+  Query "passTemplateTriggerTypes" for schema
+
+  Example.
+  {
+    "field": "amount",
+    "condition": {
+      "gt": 1000
+    },
+    "multiple_choice_field_values": [
+      "a",
+      "b",
+      "c"
+    ],
+    "multiple_choice_options": [
+      {
+        "another_multiple_choice": [
+          "d",
+          "e",
+          "f"
+        ]
+      },
+      "3000"
+    ]
+  }
+  """
+  options: String!
+  type: String!
+}
+
+type PassTemplateTriggerType {
+  description: String!
+  name: String!
+
+  "Options as a string of a JSON List \nReturned as a JSON list because of GraphQLs problems with deep nesting\nFormat of list is available at: https://hail-spike-11a.notion.site/Pass-Template-Trigger-Schema-37f36310c46a40f99e775973b330be88?pvs=4\n"
+  options: String!
+  type: String!
+}
+
+enum PassTemplateType {
+  COUPON
+  GIFT
+  ID
+  MEMBER
+  MULTI_TICKET
+  PUNCH
+  STORAGE
+  TICKET
+}
+
+enum PassType {
+  ENDLESS
+  SINGLE_USE
+}
+
+type PassbuilderPass {
+  is_expired: Boolean!
+  issuer_id: String!
+  issuer_name: String!
+  last_redeemed: LastRedeemed!
+  last_redeemedOld: String!
+  licenseData: String
+  passID_number: String!
+  pass_type: String!
+  punched: Int!
+  punches_left: Int!
+  status: String!
+  total_punches: Int!
+}
+
+type PassesCount {
+  amount: Int!
+  id: String!
+  name: String!
+}
+
+type PassesIssuedByPassTemplate {
+  date: String!
+  passesCount: [PassesCount!]!
+}
+
+enum PassesRange {
+  EIGHTH
+  FIFTH
+  FIRST
+  FOURTH
+  SECOND
+  SEVENTH
+  SIXTH
+  THIRD
+}
+
+input PassesRangeDataInput {
+  name: String!
+}
+
+type PassesRangeInfo {
+  name: String!
+  type: IntRangeInfo!
+}
+
+type PaymentInfo implements BaseModel {
+  accessKey: String
+  country: CountryType
+  currency: CurrencyType
+  customerInfo: Boolean
+  errorUrl: String
+  id: UUID!
+  language: LanguageType
+  merchantEmail: String
+  merchantId: String
+  merchantLogo: Image
+  paymentGatewayId: String
+  paymentProvider: PaymentProvider
+  successUrl: String
+  terms: IssuerTerms
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PaymentInfoDataInput {
+  accessKey: String
+  country: String
+  currency: CurrencyType!
+  customerInfo: Boolean
+  errorUrl: String
+  id: String
+  language: String
+  merchantEmail: String
+  merchantId: String
+  merchantLogo: ImageDataInput
+  paymentGatewayId: String
+  paymentProvider: PaymentProvider!
+  secretKey: String
+  successUrl: String
+  terms: IssuerTermsDataInput
+}
+
+enum PaymentProvider {
+  NONE
+  RAPYD
+  SALTPAY
+}
+
+type PendingUser {
+  email: String
+  id: UUID!
+  inviteDate: Instant!
+  invitedBy: User
+  name: String
+  role: Role
+}
+
+type PermissionAssoc {
+  action: String!
+  actionDescription: String
+  path: String!
+}
+
+type PermissionList {
+  policy: [PermissionAssoc!]!
+  resource: String!
+}
+
+type Plan implements BaseModel {
+  finalFixedMonthlyFees: [FixedMonthlyFee!]!
+  finalPassIntegrations: [PassIntegration!]!
+  finalPassPricings: [PassPricing!]!
+  fixedMonthlyFees: [FixedMonthlyFee!]!
+  id: UUID!
+  monthlyPrice: Money
+  name: String!
+  passIntegrations: [PassIntegration!]!
+  passPricings: [PassPricing!]!
+  passTemplatesLimit: Int
+  passesLimit: Int
+  planType: PlanType
+  scannerUsersLimit: Int
+  statisticsLimit: String
+  subscriptionCount: Int!
+  supportLimit: String
+  usersLimit: Int
+  version: Long!
+  visible: Boolean!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input PlanDataInput {
+  fixedMonthlyFees: [FixedMonthlyFeeDataInput!]!
+  id: String
+  monthlyPrice: MoneyDataInput
+  name: String!
+  passIntegrations: [PassIntegrationDataInput!]!
+  passPricings: [PassPricingDataInput!]!
+  passTemplatesLimit: Int
+  passesLimit: Int
+  scannerUsersLimit: Int
+  statisticsLimit: String
+  supportLimit: String
+  usersLimit: Int
+  visible: Boolean!
+}
+
+type PlanPageInfo implements PaginationInfo {
+  data: [Plan!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type PlanSubscription implements BaseModel {
+  id: UUID!
+  plan: Plan!
+  status: PlanSubscriptionStatus!
+  trialEndDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum PlanSubscriptionStatus {
+  ACTIVE
+  CANCELLED
+  INACTIVE
+  IN_TRIAL
+  NON_RENEWING
+}
+
+type PlanSubscriptionVersion {
+  end: Instant
+  id: UUID!
+  plan: Plan!
+  start: Instant!
+  status: PlanSubscriptionStatus!
+  trialEndDate: Instant
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum PlanType {
+  DEMO
+  EXPERT
+  GROWING
+  PROFESSIONAL
+  STARTER
+}
+
+type PlatformSubscription implements BaseModel {
+  discount: Float!
+  expenses: [Expense!]
+  id: UUID!
+  month: Int!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+  year: Int!
+}
+
+type Prices {
+  fixedMonthlyFees: [FixedMonthlyFee!]!
+  passIntegrations: [PassIntegration!]!
+  passPricings: [PassPricing!]!
+}
+
+input PricesDataInput {
+  fixedMonthlyFees: [FixedMonthlyFeeDataInput!]!
+  passIntegrations: [PassIntegrationDataInput!]!
+  passPricings: [PassPricingDataInput!]!
+}
+
+type Pricing implements BaseModel {
+  id: UUID!
+  passPrice: DMoney!
+  passType: PassType!
+  range: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type Query {
+  allowCreatingPassBecauseOfTotalPasses(
+    distributionToken: String!
+    passTemplateId: String!
+  ): Boolean!
+  apiKey(id: String!): ApiKey
+  apiKeys: ApiKeyPageInfo!
+  appPasses: [Pass!]!
+  appPassesQuery: [AppPassInstance!]!
+  appUser(id: String!): User
+  automation(id: String!): Automation!
+  automationLog(
+    filter: AutomationLogFilterInput
+    id: String!
+
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+  ): AutomationLogPageInfo!
+  automations: [Automation!]!
+  billingInfo(month: Int!, year: Int!): BillingInfo!
+  bulkEmailPreview(passTemplateId: String!): String!
+  checkQuantityRestriction(passTemplateId: String!): Boolean!
+  countDeviceTypesOfPasses: [DeviceTypeCount!]!
+  countOfPassesIssuedByPassTemplate(
+    daysBack: Long
+    maxTemplates: Int
+  ): [PassesIssuedByPassTemplate!]!
+  distributionPass(distributionToken: String!, passId: String!): Pass
+  distributionPassTemplate(
+    distributionToken: String!
+    passTemplateId: String!
+  ): PassTemplate
+  emailTransaction(id: String!): EmailDistributionTransaction!
+  emailTransactions: [EmailDistributionTransaction!]!
+  emailsByTransaction(
+    filter: [SendGridStatus!]
+    id: String!
+    pagination: PaginationInput!
+  ): EmailPage!
+  externalIdentifiers(
+    pagination: PaginationInput
+    passTemplateId: String!
+  ): ExternalIdentifierPageInfo!
+  featureFlags: [FeatureFlag!]!
+  fixedMonthlyFee: [FixedMonthlyFee!]!
+  fixedMonthlyFees(planId: String): [FixedMonthlyFee!]!
+  getFlag(key: String!): Boolean!
+  getInvite(id: String!): Invite!
+  getNextExternalId(passTemplateId: String!): ExternalIdentifier!
+  getNextIssuerId(exceptIssuerId: String!): String
+  getPassByScannedData(
+    metadata: ScanMetadataInput
+    scanData: String!
+  ): ScannedDataResponse
+  getSaltPayCheckHash(
+    distributionUrl: String!
+    passTemplateId: String!
+  ): SaltpayHashInfo!
+  getScanHistoryDataForPass(passId: String!): [ScanTransaction!]!
+    @deprecated(
+      reason: "Deprecated method. Please refer to scanTransactions query, replace with query scanTransactions"
+    )
+  getScannerHistory(scannerId: String): [ScanTransaction!]!
+    @deprecated(
+      reason: "Deprecated method for normal use, only used for SmartScanner, replace with query scanTransactions"
+    )
+
+  """
+  Not Implemented
+  """
+  getSettingsForScanner: Boolean!
+  globalStatistics: StatisticResponse!
+  globalUsers(pagination: PaginationInput, showDeleted: Boolean): UserPageInfo!
+  hasIntegration(integration: MonthlyFeeType!): Boolean!
+  health: String!
+  issuer(id: String!): Issuer
+  issuerDemoInfo: DemoInfo!
+  issuerSecret(id: String!): IssuerSecret
+  issuerSecrets: [IssuerSecret!]!
+  issuerUserSecret(id: String!): IssuerUserSecret
+  issuerUserSecretValue(id: String!): IssuerUserSecretValue
+  issuerUserSecretValues: [IssuerUserSecretValue!]!
+  issuerUserSecrets: [IssuerUserSecret!]!
+  issuers(
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+  ): IssuerPageInfo!
+  issuersOfUser: [Issuer!]!
+  locations: [Location!]!
+    @deprecated(reason: "Not used, replace with Use inside pass template")
+  me: User
+  meScanner: Scanner
+  mostRecentlySentMail(passId: String!): Email
+
+  """
+  Most Valuable Fields, get only the most important input fields of a Pass Template
+  """
+  mostValuableFields(id: String!): [PassInputField!]!
+  nodeTypes: [NodeType!]!
+  orders(
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+  ): [OrderInfo!]!
+  pass(id: String!): Pass
+  passAuthenticationTokens(
+    pagination: PaginationInput
+    passId: String!
+  ): PassAuthenticationTokenPageInfo!
+  passDeviceHistory(passId: String!): [DevicePassInstance!]!
+  passHistory(passId: String!): [PassHistoryEntry!]!
+  passIntegration: [PassIntegration!]!
+  passIntegrations(planId: String): [PassIntegration!]!
+  passPricings(planId: String): [PassPricing!]!
+  passTemplate(id: String!): PassTemplate
+  passTemplateStatistics(id: String!): PassTemplateStatistics
+
+  """
+  Available template tokens for a pass template
+  """
+  passTemplateTokens(id: String!): [KeyValuePair!]!
+
+  """
+  Available triggers for a Pass Template
+  """
+  passTemplateTriggerTypes: [PassTemplateTriggerType!]!
+  passTemplates(pagination: PaginationInput): PassTemplatePageInfo!
+  passToApp(id: String!): Pass
+  passbuilderPass(passId: String!, templateId: String!): PassbuilderPass!
+  passes(
+    cheap: Boolean
+    hideByStatus: HideByStatusTypeInput
+    inputFieldOrder: [GenericOrderMultiInput!]
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+    passTemplateId: String
+    search: PassSearchDataInput
+  ): PassPageInfo!
+  passesCsv(passTemplateId: String!): String!
+  passesInOneTemplateTypePerDeviceViolation(id: String!): [Pass!]!
+  passesOfDevice(id: String!): [Pass!]!
+  passesPricing: [Pricing!]!
+  pendingIssuerInvitesOfUser: [Issuer!]!
+  pendingUsers: [PendingUser!]!
+  plan(id: String!): Plan
+  plans(
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+    visible: Boolean
+  ): PlanPageInfo!
+  policies: [PermissionList!]!
+  remainingIssuerUserSecrets(id: String): [IssuerUserSecret!]!
+  role(id: String!): Role!
+  roles(issuerId: String): [Role!]!
+  scanTransaction(id: String!): ScanTransaction!
+  scanTransactions(
+    filter: ScanTransactionsFilterInput
+    order: ScanTransactionOrderInput
+    pagination: PaginationInput
+  ): ScanTransactionPageInfo!
+  scanTransactionsByLocation(
+    lat: Float!
+    lng: Float!
+    radius: Int!
+  ): [ScanTransaction!]!
+    @deprecated(
+      reason: "Experimental method, may be removed without notice, replace with query scanTransactions"
+    )
+  scanner(id: String!): Scanner
+  scannerGroup(id: String!): ScannerGroup
+  scannerGroupCode(id: String!): String!
+  scannerGroups(paginationInput: PaginationInput): ScannerGroupPageInfo!
+  scannerUserHistory(scannerId: String): Boolean!
+  scanners(pagination: PaginationInput): ScannerPageInfo!
+  subscription(month: Int!, year: Int!): PlatformSubscription!
+  totalPassTemplates: Int!
+  totalPasses: Int!
+  totalPassesWithDeleted: Int!
+  unclaimedPasses(
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+    passTemplateId: String
+    search: PassSearchDataInput
+  ): PassPageInfo!
+  user(id: String!): User
+  userDistributionContactInfo(token: String!): UserDistributionContactInfo
+  userDistributionToken(passTemplateId: String!): UserDistributionToken
+  userOption(option: String!): UserOptionData
+  users(
+    """
+    Single order field is deprecated, please use orderMultiple
+    """
+    order: GenericOrderInput
+    orderMultiple: [GenericOrderMultiInput!]
+    pagination: PaginationInput
+  ): UserPageInfo!
+  violatingPasses(
+    pagination: PaginationInput
+    passTemplateId: String!
+  ): PassPageInfo!
+  violatingPassesCount(passTemplateId: String): Int!
+}
+
+input RegisterDataInput {
+  email: String!
+  name: String!
+  password: String!
+  phoneNumber: String!
+}
+
+input RegistrationDataInput {
+  contactName: String!
+  contactPhone: String!
+  email: String!
+  idNumber: String!
+  name: String!
+  password: String!
+  termsAndConditions: Boolean!
+}
+
+input RegistrationInviteDataInput {
+  inviteId: String!
+  name: String!
+  password: String!
+  phone: String!
+}
+
+type RewardPassField implements BaseModel {
+  id: UUID!
+  label: String!
+  orderIndex: Int!
+  passInputField: PassInputField
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input RewardPassFieldDataInput {
+  id: String
+  label: String!
+  passInputFieldId: String
+  textAlignment: TextAlignment
+  type: PassFieldType!
+  value: String
+}
+
+type RewardPassTemplate implements BaseModel {
+  backgroundColor: String
+  dateFormat: DateFormat
+  dateNumber: Int
+  description: String
+  expirationDate: Instant
+  expirationType: ExpirationType
+  fields: [RewardPassField!]!
+  foregroundColor: String
+  id: UUID!
+  isSharingProhibited: Boolean!
+  labelColor: String
+  logo: Image
+  logoText: String
+  singleDeviceOnly: Boolean!
+  stripImage: Image
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input RewardPassTemplateDataInput {
+  backgroundColor: String
+  dateFormat: DateFormat
+  dateNumber: Int
+  description: String
+  expirationDate: String
+  expirationType: ExpirationType
+  fields: [RewardPassFieldDataInput!]
+  foregroundColor: String
+  id: String
+  isSharingProhibited: Boolean
+  labelColor: String
+  logo: ImageDataInput
+  logoText: String
+  singleDeviceOnly: Boolean
+  stripImage: ImageDataInput
+}
+
+type Role {
+  id: UUID!
+  isRootRole: Boolean!
+  name: String!
+  policies: [RolePolicies!]
+  userCount: Int!
+}
+
+input RoleDataInput {
+  id: String
+  name: String
+  policies: [RolePolicyDataInput!]
+}
+
+type RolePolicies {
+  actions: [String!]!
+  resource: String!
+}
+
+input RolePolicyDataInput {
+  action: [String!]!
+  resource: String!
+}
+
+type SaltpayHashInfo {
+  hash: String!
+  orderId: String!
+  successUrl: String!
+}
+
+input ScanMetadataInput {
+  alt: Float
+  lat: Float
+  lng: Float
+  method: String
+}
+
+type ScanTransaction {
+  actions: [ScanTransaction!]!
+  amountUsed: Int
+  dateScanned: Instant!
+  id: UUID!
+  latitude: Float
+  longitude: Float
+  pass: Pass
+  scanType: ScanType
+  scanner: Scanner
+  scannerGroup: ScannerGroup
+  similarScans(
+    limit: Int
+    radius: Int
+    showSimilar: Boolean
+  ): [ScanTransaction!]!
+  stampsUsed: Int
+  user: User
+}
+
+enum ScanTransactionOrderByColumn {
+  AMOUNT_USED
+  DATE_SCANNED
+  SCAN_TYPE
+  STAMPS_USED
+}
+
+input ScanTransactionOrderInput {
+  column: ScanTransactionOrderByColumn
+  dir: OrderByDirection
+}
+
+type ScanTransactionPageInfo implements PaginationInfo {
+  data: [ScanTransaction!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+input ScanTransactionsFilterInput {
+  """
+  Format of YYYY-MM-DDTHH:MM:SS.000Z
+  """
+  dateEnd: String
+
+  """
+  Format of YYYY-MM-DDTHH:MM:SS.000Z
+  """
+  dateStart: String
+  passId: String
+  passTemplateId: String
+  scanTypes: [ScanType!]
+  scannerGroupId: String
+  scannerId: String
+  userId: String
+}
+
+enum ScanType {
+  FETCH
+  PUNCH
+  REDEEM
+  SUBTRACT
+}
+
+type ScannedDataResponse {
+  actions: [ScannerActionData!]!
+  pass: Pass
+  transactionId: String!
+}
+
+type Scanner implements BaseModel {
+  active: Boolean!
+  authenticationToken: String
+  currentUser: User
+  deviceId: String
+  disabled: Boolean!
+  externalId: String
+  id: UUID!
+  issuer: Issuer!
+  name: String
+
+  """
+  Templates scannable by scanner
+  """
+  scannableTemplates: [PassTemplate!]!
+  scannerGroup: ScannerGroup
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type ScannerActionData {
+  action: ScannerActionType!
+  custom_description: String
+  custom_title: String
+  maxAddAmount: Int
+  maxPunches: Int
+  maxSubtractAmount: Int
+  minAddAmount: Int
+  minSubtractAmount: Int
+}
+
+input ScannerActionDataInput {
+  action: ScannerActionType!
+  addedAmount: Int
+  passId: String
+  punches: Int
+  subtractedAmount: Int
+}
+
+enum ScannerActionType {
+  ADD_AMOUNT
+  CUSTOM_ACTION
+  PUNCHES
+  REDEEM
+  SUBTRACT_AMOUNT
+  VOID
+}
+
+enum ScannerAuthenticatedOptions {
+  NONE
+  ONLY_SCANNER
+  SCANNER_CAN_USE
+}
+
+input ScannerDataInput {
+  active: Boolean
+  disabled: Boolean
+  externalId: String
+  id: String
+  name: String
+  scannerGroupId: String
+  shouldLogout: Boolean
+}
+
+type ScannerGroup implements BaseModel {
+  id: UUID!
+  name: String
+  passTemplates: [PassTemplate!]!
+  scanners: [Scanner!]!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input ScannerGroupDataInput {
+  id: String
+  name: String
+  selectedPassTemplates: [String!]!
+}
+
+type ScannerGroupPageInfo implements PaginationInfo {
+  data: [ScannerGroup!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type ScannerPageInfo implements PaginationInfo {
+  data: [Scanner!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+type ScannerSettings implements BaseModel {
+  id: UUID!
+  issuer: Issuer!
+  passTemplate: PassTemplate
+  scanner: Scanner
+  settingsType: ScannerSettingsSection!
+  shouldAutoPunch: Boolean
+  shouldAutoRedeem: Boolean
+  showPassScanHistory: Boolean
+  showScanHistory: Boolean
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+enum ScannerSettingsSection {
+  GLOBAL
+  PASS_TEMPLATE
+  SCANNER
+}
+
+enum SendGridStatus {
+  BOUNCE
+  DEFERRED
+  DELIVERED
+  DROPPED
+  FAILED
+  NO_STATUS
+  OPENED
+  PROCESSED
+  QUEUED
+  SENT
+}
+
+type SendPassEmailsResponse {
+  failedCount: Int!
+  successCount: Int!
+}
+
+enum ServiceEmailType {
+  ISSUER
+  TEMPLATE
+  USER
+}
+
+type StampStripImage {
+  stampsLeft: Int
+  url: String!
+}
+
+type StatisticResponse {
+  totalPassTemplates: Int
+  totalPasses: Int
+  totalPassesRedeemedPastMonth: Int
+  totalRedeemedPasses: Int
+  totalScanners: Int
+  totalScansBySmartScanner: Int
+  totalUsers: Int
+  voidedPasses: Int
+}
+
+type Subscription {
+  emailDistributionTransaction(id: String!): EmailDistributionTransactionStatus!
+  emailDistributionTransactionStatistics(
+    id: String!
+  ): EmailDistributionTransactionStatistics!
+  emailStatus(id: String!): Email!
+}
+
+input SubscriptionDataInput {
+  expenses: [ExpenceDataInput!]
+}
+
+enum TextAlignment {
+  CENTER
+  LEFT
+  RIGHT
+}
+
+input ThumbnailDataInput {
+  passId: String!
+  thumbnail: ImageDataInput!
+}
+
+"""
+A type representing a formatted java.util.UUID
+"""
+scalar UUID
+
+type User implements BaseModel {
+  active: Boolean!
+  androidDeviceId: String
+  apiKeys: [ApiKey!]!
+  displayName: String!
+  email: String!
+  globalRole: UserRole!
+  id: UUID!
+  invitedBy: User
+  issuer: Issuer
+  issuerRole: Role
+  issuerUserId: String
+  issuers: [IssuerUser!]
+  language: String
+  name: String
+  options: [UserOptionData!]!
+  permissions: [UserPermission]!
+  phoneNumber: String
+  photo: Image
+  policies: [UserPolicy!]
+  role: Role
+  smartWalletUser: Boolean
+  status: UserStatus
+  verifyToken: String
+  version: Long!
+  whenConfirmed: Instant
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+input UserDataInput {
+  active: Boolean
+  email: String!
+  id: String
+  name: String
+  password: String!
+  permissions: [UserPermission]
+  userRole: UserRole
+}
+
+type UserDistributionContactInfo implements BaseModel {
+  email: String!
+  id: UUID!
+  name: String!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type UserDistributionToken implements BaseModel {
+  id: UUID!
+  token: UUID!
+  version: Long!
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type UserOld implements BaseModel {
+  active: Boolean!
+  androidDeviceId: String
+  apiKeys: [ApiKey!]!
+  displayName: String!
+  email: String!
+  id: UUID!
+  invitedBy: UserOld
+  issuer: Issuer
+  issuerRole: Role
+  issuerUserId: String
+  issuers: [IssuerUser!]
+  language: String
+  name: String
+  options: [UserOptionData!]!
+  permissions: [UserPermission]!
+  phoneNumber: String
+  photo: Image
+  policies: [UserPolicy!]
+  role: UserRole!
+  smartWalletUser: Boolean
+  status: UserStatus
+  verifyToken: String
+  version: Long!
+  whenConfirmed: Instant
+  whenCreated: Instant!
+  whenModified: Instant!
+}
+
+type UserOptionData {
+  key: String!
+  value: String!
+}
+
+type UserPageInfo implements PaginationInfo {
+  data: [User!]!
+  hasNext: Boolean!
+  hasPrev: Boolean!
+  pageSize: Int!
+  totalCount: Int!
+  totalPageCount: Int!
+}
+
+enum UserPermission {
+  BASIC
+  SCANNER_LICENCE
+}
+
+type UserPolicy {
+  actions: [String!]!
+  resource: String!
+}
+
+enum UserRole {
+  ADMIN
+  BASIC_USER
+  CUSTOM_USER
+  USER
+}
+
+enum UserStatus {
+  ACTIVE
+  INACTIVE
+  UNCONFIRMED
+}
diff --git a/libs/clients/smart-solutions-v2/src/index.ts b/libs/clients/smart-solutions-v2/src/index.ts
new file mode 100644
index 000000000000..7a95c276a65a
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/index.ts
@@ -0,0 +1,5 @@
+export { SmartSolutionsModule } from './lib/smartSolutions.module'
+export { SmartSolutionsService } from './lib/smartSolutions.service'
+export { PkPass, RevokePassData } from './lib/types/responses.type'
+export { Result } from './lib/types/result.type'
+export * from '../gen/schema'
diff --git a/libs/clients/smart-solutions-v2/src/lib/gqlClientFactory.ts b/libs/clients/smart-solutions-v2/src/lib/gqlClientFactory.ts
new file mode 100644
index 000000000000..4ac465917afb
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/gqlClientFactory.ts
@@ -0,0 +1,30 @@
+import { GraphQLClient } from 'graphql-request'
+import { Provider } from '@nestjs/common'
+import { MODULE_OPTIONS_TOKEN } from './smartSolutions.module-definition'
+import { LazyDuringDevScope } from '@island.is/nest/config'
+import { createEnhancedFetch } from '@island.is/clients/middlewares'
+import {
+  GRAPHQL_CLIENT_FACTORY,
+  SmartSolutionsModuleOptions,
+} from './types/config.type'
+
+export const gqlClientFactory: Provider<GraphQLClient> = {
+  provide: GRAPHQL_CLIENT_FACTORY,
+  scope: LazyDuringDevScope,
+  useFactory: (options: SmartSolutionsModuleOptions) => {
+    return new GraphQLClient(options.config.apiUrl, {
+      method: 'POST',
+      jsonSerializer: {
+        parse: JSON.parse,
+        stringify: JSON.stringify,
+      },
+      headers: {
+        'X-API-KEY': options.config.apiKey,
+      },
+      fetch: createEnhancedFetch({
+        name: 'clients-smart-solutions-v2',
+      }),
+    })
+  },
+  inject: [MODULE_OPTIONS_TOKEN],
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/gqlFetch.ts b/libs/clients/smart-solutions-v2/src/lib/gqlFetch.ts
new file mode 100644
index 000000000000..7bd106c79f52
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/gqlFetch.ts
@@ -0,0 +1,70 @@
+import { GraphQLClient } from 'graphql-request'
+import { DocumentNode } from 'graphql'
+import { Logger } from 'winston'
+import { Inject, Injectable } from '@nestjs/common'
+import { LOGGER_PROVIDER } from '@island.is/logging'
+import {
+  GraphqlError,
+  GraphqlErrorResponse,
+  GraphqlFetchResponse,
+} from './types/graphqlFetchResponses.type'
+import { GRAPHQL_CLIENT_FACTORY } from './types/config.type'
+import { mapErrorToActionStatusCode, Result } from './types/result.type'
+
+@Injectable()
+export class GQLFetcher {
+  constructor(
+    @Inject(LOGGER_PROVIDER)
+    private readonly logger: Logger,
+    @Inject(GRAPHQL_CLIENT_FACTORY)
+    private readonly client: GraphQLClient,
+  ) {}
+
+  async fetch<T>(
+    node: DocumentNode,
+    variables?: { [key: string]: unknown },
+  ): Promise<Result<T>> {
+    const res: GraphqlFetchResponse<T> = await this.client
+      .request(node, variables)
+      .then((res) => {
+        return {
+          data: res as T,
+        }
+      })
+      .catch((e) => {
+        const errors: GraphqlErrorResponse = e
+        return {
+          error: errors.response.errors?.[0],
+        }
+      })
+
+    if (res.data) {
+      return {
+        ok: true,
+        data: res.data,
+      }
+    }
+
+    if (res.error) {
+      const errorCode = mapErrorToActionStatusCode(
+        res.error?.extensions?.type ?? undefined,
+      )
+      return {
+        ok: false,
+        error: {
+          code: errorCode,
+          message: res.error?.message,
+          data: JSON.stringify(res.error),
+        },
+      }
+    }
+
+    return {
+      ok: false,
+      error: {
+        code: 99,
+        message: 'Unknown error',
+      },
+    }
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.config.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.config.ts
new file mode 100644
index 000000000000..9c61d5be6fde
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.config.ts
@@ -0,0 +1,15 @@
+import * as z from 'zod'
+
+export const SmartSolutionsApiConfigSchema = z.object({
+  apiKey: z.string(),
+  apiUrl: z.string(),
+  passTemplateId: z.string(),
+})
+
+export interface SmartSolutionsConfig {
+  apiKey: string
+  apiUrl: string
+  passTemplateId?: string
+}
+
+export const SMART_SOLUTIONS_API_CONFIG = 'smart-solutions-api-config'
diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.graphql b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.graphql
new file mode 100644
index 000000000000..ebaaf836d027
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.graphql
@@ -0,0 +1,89 @@
+fragment baseModel on BaseModel {
+  id
+  version
+  whenCreated
+  whenModified
+}
+
+query passTemplates {
+  passTemplates {
+    data {
+      id
+      name
+    }
+  }
+}
+
+mutation voidPass(
+  $passTemplateId: String!
+  $values: [PassInputFieldValueDataInput!]!
+) {
+  voidUniquePass(passTemplateId: $passTemplateId, values: $values)
+}
+
+mutation unvoidPass($id: String!) {
+  unvoidPass(id: $id)
+}
+
+mutation deletePass(
+  $passTemplateId: String!
+  $values: [PassInputFieldValueDataInput!]!
+) {
+  deleteUniquePass(passTemplateId: $passTemplateId, values: $values)
+}
+
+mutation updateStatusOnPassWithDynamicBarcode(
+  $dynamicBarcodeData: DynamicBarcodeDataInput!
+) {
+  updateStatusOnPassWithDynamicBarcode(
+    dynamicBarcodeData: $dynamicBarcodeData
+  ) {
+    ...baseModel
+    status
+    inputFieldValues {
+      passInputField {
+        deleted
+        format
+        isExternalAuthField
+        label
+        mandatory
+        type
+        unique
+        identifier
+        ...baseModel
+      }
+      ...baseModel
+      value
+    }
+  }
+}
+
+mutation upsertPass($inputData: PassDataInput!) {
+  upsertPass(data: $inputData) {
+    distributionUrl
+    deliveryPageUrl
+    distributionQRCode
+    expirationDate
+    ...baseModel
+  }
+}
+
+mutation updatePass(
+  $passTemplateId: String!
+  $expirationDate: String
+  $thumbnail: ImageDataInput
+  $values: [PassInputFieldValueDataInput!]
+) {
+  updatePass(
+    expirationDate: $expirationDate
+    passTemplateId: $passTemplateId
+    thumbnail: $thumbnail
+    values: $values
+  ) {
+    distributionUrl
+    deliveryPageUrl
+    distributionQRCode
+    expirationDate
+    ...baseModel
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module-definition.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module-definition.ts
new file mode 100644
index 000000000000..7531fb846d90
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module-definition.ts
@@ -0,0 +1,5 @@
+import { ConfigurableModuleBuilder } from '@nestjs/common'
+import { SmartSolutionsModuleOptions } from './types/config.type'
+
+export const { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN } =
+  new ConfigurableModuleBuilder<SmartSolutionsModuleOptions>().build()
diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module.ts
new file mode 100644
index 000000000000..6c6f7532b28c
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common'
+import { SmartSolutionsService } from './smartSolutions.service'
+import { ConfigurableModuleClass } from './smartSolutions.module-definition'
+import { gqlClientFactory } from './gqlClientFactory'
+import { GQLFetcher } from './gqlFetch'
+
+@Module({
+  providers: [SmartSolutionsService, gqlClientFactory, GQLFetcher],
+  exports: [SmartSolutionsService],
+})
+export class SmartSolutionsModule extends ConfigurableModuleClass {}
diff --git a/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts
new file mode 100644
index 000000000000..ae2894f58569
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/smartSolutions.service.ts
@@ -0,0 +1,274 @@
+import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
+import { Inject } from '@nestjs/common'
+import {
+  DeletePass,
+  DeletePassMutationVariables,
+  DynamicBarcodeDataInput,
+  PassDataInput,
+  PassTemplate,
+  PassTemplates,
+  UpdatePass,
+  UpdatePassMutationVariables,
+  UpdateStatusOnPassWithDynamicBarcode,
+  UpdateStatusOnPassWithDynamicBarcodeMutationVariables,
+  UpsertPass,
+  UpsertPassMutationVariables,
+} from '../../gen/schema'
+import { MODULE_OPTIONS_TOKEN } from './smartSolutions.module-definition'
+import {
+  DeletePassResponseData,
+  ListTemplatesResponseData,
+  PkPass,
+  RevokePassData,
+  UpdatePassResponseData,
+  UpsertPassResponseData,
+  VerifyPassData,
+  VerifyPassResponseData,
+} from './types/responses.type'
+import { GQLFetcher } from './gqlFetch'
+import { LOG_CATEGORY, SmartSolutionsModuleOptions } from './types/config.type'
+import { Result } from './types/result.type'
+
+export class SmartSolutionsService {
+  constructor(
+    @Inject(LOGGER_PROVIDER)
+    private readonly logger: Logger,
+    @Inject(MODULE_OPTIONS_TOKEN)
+    private readonly options: SmartSolutionsModuleOptions,
+    private readonly fetcher: GQLFetcher,
+  ) {}
+
+  async verifyPkPass(
+    payload: DynamicBarcodeDataInput,
+    requestId?: string,
+  ): Promise<Result<VerifyPassData>> {
+    const variables: UpdateStatusOnPassWithDynamicBarcodeMutationVariables = {
+      dynamicBarcodeData: payload,
+    }
+
+    const res = await this.fetcher.fetch<VerifyPassResponseData>(
+      UpdateStatusOnPassWithDynamicBarcode,
+      variables,
+    )
+
+    if (!res.ok) {
+      this.logger.warn('Pkpass verification failed', {
+        requestId,
+        category: LOG_CATEGORY,
+        error: {
+          message: res.error.message,
+        },
+      })
+
+      return res
+    }
+
+    const verificationData = res.data.updateStatusOnPassWithDynamicBarcode
+
+    this.logger.info('PkPass verification successful', {
+      requestId,
+      passId: verificationData?.id,
+      category: LOG_CATEGORY,
+    })
+
+    return {
+      ok: true,
+      data: {
+        valid: true,
+        pass: res.data.updateStatusOnPassWithDynamicBarcode,
+      },
+    }
+  }
+
+  /**
+   *
+   * @param payload License properties to update
+   * @returns The updated pass
+   */
+  async updatePkPass(
+    payload: PassDataInput,
+    requestId?: string,
+  ): Promise<Result<PkPass>> {
+    if (!payload.passTemplateId) {
+      this.logger.warning(
+        'Pkpass update failed, missing pass template id from input',
+        {
+          requestId,
+          category: LOG_CATEGORY,
+        },
+      )
+      return {
+        ok: false,
+        error: {
+          code: 10,
+          message: 'Invalid input data, missing passTemplateId',
+        },
+      }
+    }
+
+    const variables: UpdatePassMutationVariables = {
+      passTemplateId: payload.passTemplateId,
+      expirationDate: payload.expirationDate,
+      thumbnail: payload.thumbnail,
+      values: payload.inputFieldValues,
+    }
+
+    const res = await this.fetcher.fetch<UpdatePassResponseData>(
+      UpdatePass,
+      variables,
+    )
+
+    if (!res.ok) {
+      this.logger.warn('PkPass creation failed', {
+        requestId,
+        passId: payload.id,
+        category: LOG_CATEGORY,
+        error: {
+          message: res.error.message,
+        },
+      })
+      return res
+    }
+
+    const updatePass = res.data.updatePass
+
+    this.logger.info('PkPass update successful', {
+      requestId,
+      passId: updatePass.id,
+      category: LOG_CATEGORY,
+    })
+
+    return {
+      ok: true,
+      data: updatePass,
+    }
+  }
+
+  /**
+   *
+   * @param payload The new pass data
+   * @returns the newly created pass, or an updated old one if a pass was previously created,
+   */
+  async generatePkPass(
+    payload: PassDataInput,
+    onCreateCallback?: () => Promise<void>,
+    requestId?: string,
+  ): Promise<Result<PkPass>> {
+    const variables: UpsertPassMutationVariables = {
+      inputData: {
+        ...payload,
+        passTemplateId: this.options.config.passTemplateId,
+      },
+    }
+
+    const res = await this.fetcher.fetch<UpsertPassResponseData>(
+      UpsertPass,
+      variables,
+    )
+
+    if (!res.ok) {
+      this.logger.warn('PkPass creation failed', {
+        requestId,
+        passId: payload.id,
+        category: LOG_CATEGORY,
+        error: {
+          message: res.error.message,
+        },
+      })
+      return res
+    }
+
+    const upsertPass = res.data.upsertPass
+    if (
+      onCreateCallback &&
+      upsertPass?.whenCreated &&
+      upsertPass?.whenModified &&
+      upsertPass?.whenCreated === upsertPass?.whenModified
+    ) {
+      this.logger.info('PkPass created successfully', {
+        requestId,
+        passId: upsertPass?.id,
+        category: LOG_CATEGORY,
+      })
+      await onCreateCallback()
+    } else {
+      this.logger.info('PkPass upsert successful', {
+        requestId,
+        passId: upsertPass?.id,
+        category: LOG_CATEGORY,
+      })
+    }
+
+    return {
+      ok: true,
+      data: upsertPass,
+    }
+  }
+
+  async revokePkPass(
+    passTemplateId: string,
+    payload: PassDataInput,
+    requestId?: string,
+  ): Promise<Result<RevokePassData>> {
+    const variables: DeletePassMutationVariables = {
+      passTemplateId,
+      values: payload,
+    }
+
+    const res = await this.fetcher.fetch<DeletePassResponseData>(
+      DeletePass,
+      variables,
+    )
+
+    if (!res.ok) {
+      this.logger.warn('PkPass revocation failed', {
+        requestId,
+        passId: payload.id,
+        category: LOG_CATEGORY,
+        error: {
+          message: res.error?.message,
+        },
+      })
+      return res
+    }
+
+    this.logger.info('PkPass revocation successful', {
+      requestId,
+      passId: payload.id,
+      category: LOG_CATEGORY,
+    })
+
+    return {
+      ok: true,
+      data: {
+        success: res.data.deleteUniquePass,
+      },
+    }
+  }
+
+  async listTemplates(): Promise<Result<Array<PassTemplate>>> {
+    const res = await this.fetcher.fetch<ListTemplatesResponseData>(
+      PassTemplates,
+    )
+
+    if (!res.ok) {
+      this.logger.warn('Pass template listing failed', {
+        category: LOG_CATEGORY,
+        error: {
+          message: res.error?.message,
+        },
+      })
+      return res
+    }
+
+    this.logger.info('Pass templates listing successful', {
+      requestId,
+      category: LOG_CATEGORY,
+    })
+
+    return {
+      ok: true,
+      data: res.data.passes?.data ?? [],
+    }
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/types/config.type.ts b/libs/clients/smart-solutions-v2/src/lib/types/config.type.ts
new file mode 100644
index 000000000000..c8fe9cf6bcf3
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/types/config.type.ts
@@ -0,0 +1,14 @@
+export interface SmartSolutionsModuleOptions {
+  config: SmartSolutionsConfig
+}
+
+export interface SmartSolutionsConfig {
+  apiKey: string
+  apiUrl: string
+  passTemplateId?: string
+}
+
+export const GRAPHQL_CLIENT_FACTORY = 'grahpql-client-factory'
+
+/** Category to attach each log message to */
+export const LOG_CATEGORY = 'clients-smart-solutions'
diff --git a/libs/clients/smart-solutions-v2/src/lib/types/graphqlFetchResponses.type.ts b/libs/clients/smart-solutions-v2/src/lib/types/graphqlFetchResponses.type.ts
new file mode 100644
index 000000000000..0aa7f863c487
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/types/graphqlFetchResponses.type.ts
@@ -0,0 +1,19 @@
+export interface GraphqlError {
+  message: string
+  locations: string
+  path: string
+  extensions: {
+    type: string
+  }
+}
+
+export interface GraphqlFetchResponse<T> {
+  data?: T
+  error?: GraphqlError
+}
+
+export interface GraphqlErrorResponse {
+  response: {
+    errors?: Array<GraphqlError>
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/types/responses.type.ts b/libs/clients/smart-solutions-v2/src/lib/types/responses.type.ts
new file mode 100644
index 000000000000..5a74ce202b84
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/types/responses.type.ts
@@ -0,0 +1,51 @@
+import { Pass, PassTemplate } from '../..'
+
+export type PkPass = Partial<Pass>
+
+export interface VerifyPassData {
+  valid: boolean
+  pass?: PkPass
+}
+
+export interface RevokePassData {
+  success: boolean
+}
+
+export interface GetPassResponseData {
+  pass: PkPass
+}
+
+export interface VerifyPassResponseData {
+  updateStatusOnPassWithDynamicBarcode?: PkPass
+}
+
+export interface UpsertPassResponseData {
+  upsertPass: PkPass
+}
+
+export interface UpdatePassResponseData {
+  updatePass: PkPass
+}
+
+export interface ListTemplatesResponseData {
+  passes?: {
+    data: Array<PassTemplate>
+  }
+}
+
+export interface VoidPassResponseData {
+  voidUniquePass: boolean
+}
+export interface UnvoidPassResponseData {
+  unvoidPass: boolean
+}
+
+export interface DeletePassResponseData {
+  deleteUniquePass: boolean
+}
+
+export interface ListPassesResponseData {
+  passes?: {
+    data: Array<PkPass>
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/src/lib/types/result.type.ts b/libs/clients/smart-solutions-v2/src/lib/types/result.type.ts
new file mode 100644
index 000000000000..62336a2e73b0
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/src/lib/types/result.type.ts
@@ -0,0 +1,71 @@
+export interface ServiceError {
+  /** Custom error code pertaining to the external service, or http status */
+  code: ServiceErrorCode | number
+  /** Custom message */
+  message?: string
+  /** Optional data */
+  data?: string
+}
+/** VERIFY ACTION CODES 1-10 *
+ *  SERVICE CODES 10+ *
+ * HTTP CODES 100+ */
+export type ServiceErrorCode =
+  /** License OK */
+  | 1
+  /** License expired */
+  | 2
+  /** No/incomplete license info found */
+  | 3
+  /** Request contains some field errors */
+  | 4
+  /** Invalid pass */
+  | 5
+  /** Unauthorized */
+  | 6
+  /** Forbidden */
+  | 7
+  /** Missing PassTemplateId */
+  | 10
+  /** Fetch failed */
+  | 11
+  /** JSON parse failed */
+  | 12
+  /** External service error */
+  | 13
+  /** Incomplete service response */
+  | 14
+  /** Request contains some field errors */
+  | 15
+  /** Generic error code / Unknown */
+  | 99
+
+export type Result<ResultType, ErrorType = ServiceError> =
+  | {
+      ok: true
+      data: ResultType
+    }
+  | {
+      ok: false
+      error: ErrorType
+    }
+
+export const mapErrorToActionStatusCode = (
+  exception?: string,
+): ServiceErrorCode => {
+  switch (exception) {
+    case 'NotFoundException':
+      return 3
+    case 'IllegalArgumentException':
+      return 4
+    case 'InvalidDataException':
+      return 4
+    case 'ForbiddenException':
+      return 7
+    case 'UnauthorizedException':
+      return 6
+    case 'PersistenceException':
+      return 13
+    default:
+      return 99
+  }
+}
diff --git a/libs/clients/smart-solutions-v2/tsconfig.json b/libs/clients/smart-solutions-v2/tsconfig.json
new file mode 100644
index 000000000000..8122543a9ab0
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/clients/smart-solutions-v2/tsconfig.lib.json b/libs/clients/smart-solutions-v2/tsconfig.lib.json
new file mode 100644
index 000000000000..dbf54fd7d68c
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/tsconfig.lib.json
@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"],
+    "target": "es2021",
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/clients/smart-solutions-v2/tsconfig.spec.json b/libs/clients/smart-solutions-v2/tsconfig.spec.json
new file mode 100644
index 000000000000..69a251f328ce
--- /dev/null
+++ b/libs/clients/smart-solutions-v2/tsconfig.spec.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/clients/social-insurance-administration/src/clientConfig.json b/libs/clients/social-insurance-administration/src/clientConfig.json
index 2b17df8330fc..ba7e9121fb5a 100644
--- a/libs/clients/social-insurance-administration/src/clientConfig.json
+++ b/libs/clients/social-insurance-administration/src/clientConfig.json
@@ -1,6 +1,9 @@
 {
   "openapi": "3.0.1",
-  "info": { "title": "TR Portal API", "version": "v1.0" },
+  "info": {
+    "title": "TR Portal API",
+    "version": "v1.0"
+  },
   "paths": {
     "/api/protected/v1/Applicant/{applicationType}/eligible": {
       "get": {
@@ -13,7 +16,9 @@
             "description": "The type of application (e.g. old age pension) to check for eligibility",
             "required": true,
             "style": "simple",
-            "schema": { "type": "string" }
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -337,13 +342,22 @@
             "description": "Success",
             "content": {
               "text/plain": {
-                "schema": { "type": "integer", "format": "int32" }
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
               },
               "application/json": {
-                "schema": { "type": "integer", "format": "int32" }
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
               },
               "text/json": {
-                "schema": { "type": "integer", "format": "int32" }
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
               }
             }
           }
@@ -361,15 +375,29 @@
             "description": "The application type, e.g. \"oldagepension\"",
             "required": true,
             "style": "simple",
-            "schema": { "type": "string" }
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "requestBody": {
           "description": "Input for application, varies by type",
           "content": {
-            "application/json": { "schema": { "type": "object" } },
-            "text/json": { "schema": { "type": "object" } },
-            "application/*+json": { "schema": { "type": "object" } }
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "type": "object"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "object"
+              }
+            }
           }
         },
         "responses": {
@@ -487,7 +515,9 @@
             "description": "The application GUID for the application in Island.is",
             "required": true,
             "style": "simple",
-            "schema": { "type": "string" }
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "requestBody": {
@@ -601,28 +631,15 @@
               }
             }
           },
-          "204": { "description": "No Content" }
+          "204": {
+            "description": "No Content"
+          }
         }
       }
     },
-    "/api/protected/v1/Documents/documents/{documentId}": {
+    "/api/protected/v1/DeathBenefits/spousalinfo": {
       "get": {
-        "tags": ["Documents"],
-        "parameters": [
-          {
-            "name": "documentId",
-            "in": "path",
-            "required": true,
-            "style": "simple",
-            "schema": { "type": "string" }
-          },
-          {
-            "name": "authenticationType",
-            "in": "query",
-            "style": "form",
-            "schema": { "type": "string" }
-          }
-        ],
+        "tags": ["DeathBenefits"],
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -709,17 +726,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.UseCase.DeathBenefits.Models.ExternalSpousalInfo"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.UseCase.DeathBenefits.Models.ExternalSpousalInfo"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.UseCase.DeathBenefits.Models.ExternalSpousalInfo"
                 }
               }
             }
@@ -727,10 +744,28 @@
         }
       }
     },
-    "/api/protected/v1/General/currencies": {
+    "/api/protected/v1/Documents/documents/{documentId}": {
       "get": {
-        "tags": ["General"],
-        "summary": "Returns a list of valid currencies (for registering a foreign bank account)",
+        "tags": ["Documents"],
+        "parameters": [
+          {
+            "name": "documentId",
+            "in": "path",
+            "required": true,
+            "style": "simple",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "authenticationType",
+            "in": "query",
+            "style": "form",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -816,23 +851,29 @@
             "description": "Success",
             "content": {
               "text/plain": {
-                "schema": { "type": "array", "items": { "type": "string" } }
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                }
               },
               "application/json": {
-                "schema": { "type": "array", "items": { "type": "string" } }
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                }
               },
               "text/json": {
-                "schema": { "type": "array", "items": { "type": "string" } }
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document"
+                }
               }
             }
           }
         }
       }
     },
-    "/api/protected/v1/IncomePlan": {
+    "/api/protected/v1/General/currencies": {
       "get": {
-        "tags": ["IncomePlan"],
-        "summary": "Returns a list of income plans for the logged-in user",
+        "tags": ["General"],
+        "summary": "Returns a list of valid currencies (for registering a foreign bank account)",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -921,7 +962,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                    "type": "string"
                   }
                 }
               },
@@ -929,7 +970,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                    "type": "string"
                   }
                 }
               },
@@ -937,7 +978,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                    "type": "string"
                   }
                 }
               }
@@ -946,10 +987,10 @@
         }
       }
     },
-    "/api/protected/v1/IncomePlan/CategorizedIncomeTypes": {
+    "/api/protected/v1/IncomePlan": {
       "get": {
         "tags": ["IncomePlan"],
-        "summary": "Returns a list of all available income types with their associated income categories",
+        "summary": "Returns a list of income plans for the logged-in user",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1038,7 +1079,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                   }
                 }
               },
@@ -1046,7 +1087,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                   }
                 }
               },
@@ -1054,7 +1095,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                   }
                 }
               }
@@ -1063,18 +1104,10 @@
         }
       }
     },
-    "/api/protected/v1/IncomePlan/WithholdingTax": {
+    "/api/protected/v1/IncomePlan/CategorizedIncomeTypes": {
       "get": {
         "tags": ["IncomePlan"],
-        "summary": "Returns withholding tax (staðgreiðsluskrá) for the logged-in user.\r\nUsed for new TR customers that have no previous income plan as reference to prepopulate with.",
-        "parameters": [
-          {
-            "name": "year",
-            "in": "query",
-            "style": "form",
-            "schema": { "type": "integer", "format": "int32" }
-          }
-        ],
+        "summary": "Returns a list of all available income types with their associated income categories",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1163,7 +1196,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
                   }
                 }
               },
@@ -1171,7 +1204,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
                   }
                 }
               },
@@ -1179,7 +1212,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.ExternalIncomeTypeDto"
                   }
                 }
               }
@@ -1188,10 +1221,21 @@
         }
       }
     },
-    "/api/protected/v1/IncomePlan/LatestIncomePlan": {
+    "/api/protected/v1/IncomePlan/WithholdingTax": {
       "get": {
         "tags": ["IncomePlan"],
-        "summary": "Returns the latest accepted income plan for the logged-in user",
+        "summary": "Returns withholding tax (staðgreiðsluskrá) for the logged-in user.\r\nUsed for new TR customers that have no previous income plan as reference to prepopulate with.",
+        "parameters": [
+          {
+            "name": "year",
+            "in": "query",
+            "style": "form",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1278,38 +1322,28 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxDto"
                 }
               }
             }
-          },
-          "204": { "description": "No Content" }
+          }
         }
       }
     },
-    "/api/protected/v1/PaymentPlan": {
+    "/api/protected/v1/IncomePlan/LatestIncomePlan": {
       "get": {
-        "tags": ["PaymentPlan"],
-        "summary": "Endpoint to get paymentplan for a given nationalId",
-        "parameters": [
-          {
-            "name": "year",
-            "in": "query",
-            "description": "",
-            "style": "form",
-            "schema": { "type": "string" }
-          }
-        ],
+        "tags": ["IncomePlan"],
+        "summary": "Returns the latest accepted income plan for the logged-in user",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1396,17 +1430,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto"
                 }
               }
             }
@@ -1414,10 +1448,30 @@
         }
       }
     },
-    "/api/protected/v1/PaymentPlan/legitimatepayments": {
-      "get": {
-        "tags": ["PaymentPlan"],
-        "summary": "Endpoint to get the next/previous payments for a given nationalId",
+    "/api/protected/v1/IncomePlan/TemporaryCalculations": {
+      "post": {
+        "tags": ["IncomePlan"],
+        "summary": "Returns temporary calculations (bráðabirgðaútreikningur) based on the submitted income plan",
+        "requestBody": {
+          "description": "The income plan to use as a basis for the temporary calculations",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomePlanDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomePlanDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomePlanDto"
+              }
+            }
+          }
+        },
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1504,17 +1558,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               }
             }
@@ -1522,10 +1576,10 @@
         }
       }
     },
-    "/api/protected/v1/PaymentPlan/validyears": {
+    "/api/protected/v1/IncomePlan/IncomePlanConditions": {
       "get": {
-        "tags": ["PaymentPlan"],
-        "summary": "Returns a list of years for which the client has valid payment plans",
+        "tags": ["IncomePlan"],
+        "summary": "Returns information about various income plan conditions, such as for which year income plans\r\nare currently being accepted, whether or not to show temporary calculations etc.",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1612,20 +1666,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "type": "array",
-                  "items": { "type": "integer", "format": "int32" }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanConditionsDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": { "type": "integer", "format": "int32" }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanConditionsDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "type": "array",
-                  "items": { "type": "integer", "format": "int32" }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanConditionsDto"
                 }
               }
             }
@@ -1633,30 +1684,21 @@
         }
       }
     },
-    "/api/protected/v1/PensionCalculator": {
-      "post": {
-        "tags": ["PensionCalculator"],
-        "summary": "Returns general pension calculations for input data",
-        "requestBody": {
-          "description": "Data for general pension calculations",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
-              }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
-              }
+    "/api/protected/v1/PaymentPlan": {
+      "get": {
+        "tags": ["PaymentPlan"],
+        "summary": "Endpoint to get paymentplan for a given nationalId",
+        "parameters": [
+          {
+            "name": "year",
+            "in": "query",
+            "description": "",
+            "style": "form",
+            "schema": {
+              "type": "string"
             }
           }
-        },
+        ],
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1743,26 +1785,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
-                  }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
-                  }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
-                  }
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.PaymentPlanDto"
                 }
               }
             }
@@ -1770,10 +1803,10 @@
         }
       }
     },
-    "/api/protected/v1/Test/hello": {
+    "/api/protected/v1/PaymentPlan/legitimatepayments": {
       "get": {
-        "tags": ["Test"],
-        "summary": "Dummy service for testing X-Road connectivity",
+        "tags": ["PaymentPlan"],
+        "summary": "Endpoint to get the next/previous payments for a given nationalId",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1858,18 +1891,30 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": { "schema": { "type": "string" } },
-              "application/json": { "schema": { "type": "string" } },
-              "text/json": { "schema": { "type": "string" } }
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PaymentPlan.LegitimatePayments"
+                }
+              }
             }
           }
         }
       }
     },
-    "/api/protected/v1/Test": {
+    "/api/protected/v1/PaymentPlan/validyears": {
       "get": {
-        "tags": ["Test"],
-        "summary": "This is an unauthorized ping endpoint. It is only used for organization to organization\r\ntesting of communications.",
+        "tags": ["PaymentPlan"],
+        "summary": "Returns a list of years for which the client has valid payment plans",
         "responses": {
           "400": {
             "description": "Bad Request",
@@ -1954,15 +1999,392 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": { "schema": { "type": "string" } },
-              "application/json": { "schema": { "type": "string" } },
-              "text/json": { "schema": { "type": "string" } }
-            }
-          }
-        }
-      }
-    },
-    "/api/protected/v1/Test/hello/formbuilder": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/protected/v1/PensionCalculator": {
+      "post": {
+        "tags": ["PensionCalculator"],
+        "summary": "Returns general pension calculations for input data",
+        "requestBody": {
+          "description": "Data for general pension calculations",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorInput"
+              }
+            }
+          }
+        },
+        "responses": {
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Server Error",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TrWeb.Commons.ExternalPortals.Api.Models.PensionCalculator.PensionCalculatorOutput"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/protected/v1/Test/hello": {
+      "get": {
+        "tags": ["Test"],
+        "summary": "Dummy service for testing X-Road connectivity",
+        "responses": {
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Server Error",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/protected/v1/Test": {
+      "get": {
+        "tags": ["Test"],
+        "summary": "This is an unauthorized ping endpoint. It is only used for organization to organization\r\ntesting of communications.",
+        "responses": {
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Server Error",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TrWeb.Applications.ExternalPortals.Error"
+                }
+              }
+            }
+          },
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/protected/v1/Test/hello/formbuilder": {
       "get": {
         "tags": ["Test"],
         "responses": {
@@ -2075,37 +2497,208 @@
       "TrWeb.Api.Services.Common.Clients.Models.GetBankInformationReturn": {
         "type": "object",
         "properties": {
-          "bank": { "type": "string", "nullable": true },
-          "ledger": { "type": "string", "nullable": true },
-          "accountNumber": { "type": "string", "nullable": true },
-          "iban": { "type": "string", "nullable": true },
-          "swift": { "type": "string", "nullable": true },
-          "foreignBankName": { "type": "string", "nullable": true },
-          "foreignBankAddress": { "type": "string", "nullable": true },
-          "currency": { "type": "string", "nullable": true }
+          "bank": {
+            "type": "string",
+            "nullable": true
+          },
+          "ledger": {
+            "type": "string",
+            "nullable": true
+          },
+          "accountNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "iban": {
+            "type": "string",
+            "nullable": true
+          },
+          "swift": {
+            "type": "string",
+            "nullable": true
+          },
+          "foreignBankName": {
+            "type": "string",
+            "nullable": true
+          },
+          "foreignBankAddress": {
+            "type": "string",
+            "nullable": true
+          },
+          "currency": {
+            "type": "string",
+            "nullable": true
+          }
         },
         "additionalProperties": false
       },
       "TrWeb.Api.Services.Domain.Applications.Models.CreateApplicationFromPaperReturn": {
         "type": "object",
         "properties": {
-          "applicationLineId": { "type": "integer", "format": "int32" }
+          "applicationLineId": {
+            "type": "integer",
+            "format": "int32"
+          }
         },
         "additionalProperties": false
       },
       "TrWeb.Api.Services.Domain.DigitalMailbox.Models.Document": {
         "type": "object",
         "properties": {
-          "type": { "type": "string", "nullable": true },
-          "content": { "type": "string", "nullable": true }
+          "type": {
+            "type": "string",
+            "nullable": true
+          },
+          "content": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomePlanDto": {
+        "type": "object",
+        "properties": {
+          "incomeYear": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "splitIncomeByMonth": {
+            "type": "boolean"
+          },
+          "incomeTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomeTypeDto"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "TrWeb.Api.Services.Domain.Finance.Models.IslandIsIncomeTypeDto": {
+        "type": "object",
+        "properties": {
+          "incomeTypeNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "incomeTypeCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "incomeTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "changesAllowed": {
+            "type": "boolean"
+          },
+          "currencyNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "currencyCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "incomeCategoryNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "incomeCategoryCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "incomeCategoryName": {
+            "type": "string",
+            "nullable": true
+          },
+          "amountJan": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountFeb": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountMar": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountApr": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountMay": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountJun": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountJul": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountAug": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountSep": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountOct": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountNov": {
+            "type": "number",
+            "format": "double"
+          },
+          "amountDec": {
+            "type": "number",
+            "format": "double"
+          }
         },
         "additionalProperties": false
       },
       "TrWeb.Api.Services.Domain.Finance.Models.RknMonthDto": {
         "type": "object",
         "properties": {
-          "month": { "type": "integer", "format": "int32" },
-          "amount": { "type": "number", "format": "double", "nullable": true }
+          "month": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "amount": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "TrWeb.Api.Services.UseCase.DeathBenefits.Models.ExternalSpousalInfo": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "nationalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "dateOfDeath": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "cohabitationLessThan1Year": {
+            "type": "boolean"
+          }
         },
         "additionalProperties": false
       },
@@ -2212,6 +2805,11 @@
             "type": "string",
             "description": "If the applicant is not eligible, a reason why he is not eligible is included",
             "nullable": true
+          },
+          "reasonCode": {
+            "type": "string",
+            "description": "If the applicant is not eligible, a code representing the reason why",
+            "nullable": true
           }
         },
         "additionalProperties": false
@@ -2292,18 +2890,35 @@
         },
         "additionalProperties": false
       },
+      "TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanConditionsDto": {
+        "type": "object",
+        "properties": {
+          "incomePlanYear": {
+            "type": "integer",
+            "description": "The year for which income plans are currently being accepted",
+            "format": "int32"
+          },
+          "showTemporaryCalculations": {
+            "type": "boolean",
+            "description": "Whether or not to show temporary calculations"
+          }
+        },
+        "additionalProperties": false
+      },
       "TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomePlanDto": {
         "type": "object",
         "properties": {
           "year": {
             "type": "integer",
             "description": "The year of the income plan",
-            "format": "int32"
+            "format": "int32",
+            "nullable": true
           },
           "registrationDate": {
             "type": "string",
             "description": "The date when the income plan was registered",
-            "format": "date-time"
+            "format": "date-time",
+            "nullable": true
           },
           "status": {
             "type": "string",
@@ -2329,14 +2944,39 @@
       "TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.IncomeTypeLine": {
         "type": "object",
         "properties": {
-          "name": {
+          "incomeCategoryNumber": {
+            "type": "integer",
+            "description": "The number of the income category",
+            "format": "int32"
+          },
+          "incomeCategoryName": {
+            "type": "string",
+            "description": "The name of the income category",
+            "nullable": true
+          },
+          "incomeCategoryCode": {
+            "type": "string",
+            "description": "The code of the income type",
+            "nullable": true
+          },
+          "incomeTypeNumber": {
+            "type": "integer",
+            "description": "The number of the income type",
+            "format": "int32"
+          },
+          "incomeTypeName": {
             "type": "string",
             "description": "The name of the income type in Icelandic (lífeyrissjóður, laun etc.)",
             "nullable": true
           },
+          "incomeTypeCode": {
+            "type": "string",
+            "description": "The code of the income type",
+            "nullable": true
+          },
           "totalSum": {
             "type": "integer",
-            "description": "The total annual sum of this payment type, ie. the amount paid per year",
+            "description": "The total annual sum of this income type, ie. the amount earned per year",
             "format": "int32"
           },
           "currency": {
@@ -2369,29 +3009,86 @@
       "TrWeb.Commons.ExternalPortals.Api.Models.IncomePlan.WithholdingTaxIncomeTypeDto": {
         "type": "object",
         "properties": {
-          "incomeType": {
+          "incomeTypeNumber": {
+            "type": "integer",
+            "description": "The income type number, e.g. 5808",
+            "format": "int64"
+          },
+          "incomeTypeName": {
+            "type": "string",
+            "description": "The income type name, e.g. \"Laun\"",
+            "nullable": true
+          },
+          "incomeTypeCode": {
             "type": "string",
-            "description": "The income type key and description, e.g. \"21 Laun\"",
+            "description": "The income type code, e.g. \"21F�O\"",
+            "nullable": true
+          },
+          "categoryNumber": {
+            "type": "integer",
+            "description": "Income type category number",
+            "format": "int64"
+          },
+          "categoryName": {
+            "type": "string",
+            "description": "Income type category name, e.g. \"Atvinnutekjur\", \"Fj�rmagnstekjur\" etc.",
+            "nullable": true
+          },
+          "categoryCode": {
+            "type": "string",
+            "description": "Income type category code",
+            "nullable": true
+          },
+          "january": {
+            "type": "number",
+            "format": "double",
             "nullable": true
           },
-          "january": { "type": "number", "format": "double", "nullable": true },
           "february": {
             "type": "number",
             "format": "double",
             "nullable": true
           },
-          "march": { "type": "number", "format": "double", "nullable": true },
-          "april": { "type": "number", "format": "double", "nullable": true },
-          "may": { "type": "number", "format": "double", "nullable": true },
-          "june": { "type": "number", "format": "double", "nullable": true },
-          "july": { "type": "number", "format": "double", "nullable": true },
-          "august": { "type": "number", "format": "double", "nullable": true },
+          "march": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "april": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "may": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "june": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "july": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "august": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
           "september": {
             "type": "number",
             "format": "double",
             "nullable": true
           },
-          "october": { "type": "number", "format": "double", "nullable": true },
+          "october": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
           "november": {
             "type": "number",
             "format": "double",
@@ -2402,7 +3099,11 @@
             "format": "double",
             "nullable": true
           },
-          "total": { "type": "number", "format": "double", "nullable": true }
+          "total": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          }
         },
         "additionalProperties": false
       },
@@ -2526,7 +3227,10 @@
             "description": "Ellilífeyrir 1\r\nEllilífeyrir sjómanna 2\r\nÖrorkulífeyrir 3\r\nEndurhæfingarlífeyrir 4\r\nHálfur ellilífeyrir 5",
             "format": "int32"
           },
-          "hasSpouse": { "type": "boolean", "description": "Hjúskaparstaða" },
+          "hasSpouse": {
+            "type": "boolean",
+            "description": "Hjúskaparstaða"
+          },
           "livingCondition": {
             "type": "integer",
             "description": "Heimilisaðstæður, býr ein(n) ?\r\nBýr ein(n) = 1\r\nBýr ekki ein(n) = 2",
@@ -2616,7 +3320,10 @@
             "description": "Séreignarlífeyrisgreiðslur",
             "format": "int32"
           },
-          "otherIncome": { "type": "integer", "format": "int32" },
+          "otherIncome": {
+            "type": "integer",
+            "format": "int32"
+          },
           "capitalIncome": {
             "type": "integer",
             "description": "Fjármagnstekjur",
@@ -2671,10 +3378,18 @@
         },
         "additionalProperties": false
       },
-      "ProblemDetails": { "additionalProperties": false },
-      "ValidationProblemDetails": { "additionalProperties": false },
+      "ProblemDetails": {
+        "additionalProperties": false
+      },
+      "ValidationProblemDetails": {
+        "additionalProperties": false
+      },
       "TrWeb.Commons.ExternalPortals.Api.Models.FormBuilder.Ruleset": {
-        "properties": { "gildi": { "type": "string" } }
+        "properties": {
+          "gildi": {
+            "type": "string"
+          }
+        }
       }
     },
     "securitySchemes": {
@@ -2685,5 +3400,9 @@
       }
     }
   },
-  "security": [{ "Bearer": ["Bearer"] }]
+  "security": [
+    {
+      "Bearer": ["Bearer"]
+    }
+  ]
 }
diff --git a/libs/clients/social-insurance-administration/src/index.ts b/libs/clients/social-insurance-administration/src/index.ts
index 7d8ea51cad5f..31e472eca371 100644
--- a/libs/clients/social-insurance-administration/src/index.ts
+++ b/libs/clients/social-insurance-administration/src/index.ts
@@ -2,8 +2,10 @@ export { SocialInsuranceAdministrationClientModule } from './lib/socialInsurance
 export { SocialInsuranceAdministrationClientService } from './lib/socialInsuranceAdministrationClient.service'
 export { SocialInsuranceAdministrationClientConfig } from './lib/socialInsuranceAdministrationClient.config'
 export {
-  ApplicationDTO,
   DocumentTypeEnum,
   Employer,
+  IncomeTypes,
+  IncomePlanStatus,
 } from './lib/socialInsuranceAdministrationClient.type'
+export { ApplicationDTO } from './lib/dto/application.dto'
 export * from '../gen/fetch'
diff --git a/libs/clients/social-insurance-administration/src/lib/apiProvider.ts b/libs/clients/social-insurance-administration/src/lib/apiProvider.ts
index caba70bc5010..210bde1aac16 100644
--- a/libs/clients/social-insurance-administration/src/lib/apiProvider.ts
+++ b/libs/clients/social-insurance-administration/src/lib/apiProvider.ts
@@ -54,7 +54,7 @@ const apiCollection: Array<{
   },
   {
     api: IncomePlanApi,
-    scopes: ['@tr.is/tekjuaetlun:read'],
+    scopes: ['@tr.is/tekjuaetlun:read', '@tr.is/stadgreidsla:read'],
     autoAuth: true,
   },
   {
diff --git a/libs/clients/social-insurance-administration/src/lib/dto/application.dto.ts b/libs/clients/social-insurance-administration/src/lib/dto/application.dto.ts
new file mode 100644
index 000000000000..02305b3a1246
--- /dev/null
+++ b/libs/clients/social-insurance-administration/src/lib/dto/application.dto.ts
@@ -0,0 +1,30 @@
+import { TrWebCommonsExternalPortalsApiModelsDocumentsDocument } from '../..'
+import {
+  Period,
+  DomesticBankInfo,
+  ForeignBankInfo,
+  TaxInfo,
+  ApplicantInfo,
+  Employer,
+  IncomePlanInfo,
+} from '../socialInsuranceAdministrationClient.type'
+
+export interface ApplicationDTO {
+  period?: Period
+  comment?: string
+  reasons?: Array<string>
+  applicationId?: string
+  domesticBankInfo?: DomesticBankInfo
+  foreignBankInfo?: ForeignBankInfo
+  taxInfo?: TaxInfo
+  applicantInfo?: ApplicantInfo
+  hasAbroadResidence?: boolean
+  hasOneTimePayment?: boolean
+  isSailorPension?: boolean
+  isRental?: boolean
+  hasAStudyingAdolescenceResident?: boolean
+  uploads?: Array<TrWebCommonsExternalPortalsApiModelsDocumentsDocument>
+  employment?: string
+  employers?: Array<Employer>
+  incomePlan?: IncomePlanInfo
+}
diff --git a/libs/clients/social-insurance-administration/src/lib/dto/incomePlan.dto.ts b/libs/clients/social-insurance-administration/src/lib/dto/incomePlan.dto.ts
new file mode 100644
index 000000000000..29ca0965d84f
--- /dev/null
+++ b/libs/clients/social-insurance-administration/src/lib/dto/incomePlan.dto.ts
@@ -0,0 +1,23 @@
+import {
+  IncomePlanStatus,
+  TrWebCommonsExternalPortalsApiModelsIncomePlanIncomePlanDto,
+  TrWebCommonsExternalPortalsApiModelsIncomePlanIncomeTypeLine,
+} from '../..'
+
+export interface IncomePlanDto {
+  year?: number
+  registrationDate?: Date
+  status?: IncomePlanStatus
+  origin?: string
+  incomeTypeLines?: Array<TrWebCommonsExternalPortalsApiModelsIncomePlanIncomeTypeLine>
+}
+
+export const mapIncomePlanDto = (
+  data: TrWebCommonsExternalPortalsApiModelsIncomePlanIncomePlanDto,
+): IncomePlanDto | undefined => ({
+  year: data.year ?? undefined,
+  registrationDate: data.registrationDate ?? undefined,
+  status: data.status as IncomePlanStatus,
+  origin: data.origin ?? undefined,
+  incomeTypeLines: data.incomeTypeLines ?? undefined,
+})
diff --git a/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.service.ts b/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.service.ts
index 6985d875301f..76879ab01e11 100644
--- a/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.service.ts
+++ b/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.service.ts
@@ -1,21 +1,28 @@
 import { Auth, AuthMiddleware, User } from '@island.is/auth-nest-tools'
 import { Injectable } from '@nestjs/common'
 import {
+  ApiProtectedV1IncomePlanTemporaryCalculationsPostRequest,
+  ApiProtectedV1IncomePlanWithholdingTaxGetRequest,
   ApiProtectedV1PensionCalculatorPostRequest,
   ApplicantApi,
   ApplicationApi,
   GeneralApi,
+  IncomePlanApi,
   PaymentPlanApi,
   PensionCalculatorApi,
   TrWebApiServicesDomainApplicationsModelsCreateApplicationFromPaperReturn,
   TrWebCommonsExternalPortalsApiModelsApplicantApplicantInfoReturn,
   TrWebCommonsExternalPortalsApiModelsApplicationsIsEligibleForApplicationReturn,
   TrWebCommonsExternalPortalsApiModelsDocumentsDocument,
+  TrWebCommonsExternalPortalsApiModelsIncomePlanExternalIncomeTypeDto,
+  TrWebCommonsExternalPortalsApiModelsIncomePlanIncomePlanConditionsDto,
+  TrWebCommonsExternalPortalsApiModelsIncomePlanWithholdingTaxDto,
   TrWebCommonsExternalPortalsApiModelsPaymentPlanLegitimatePayments,
   TrWebCommonsExternalPortalsApiModelsPaymentPlanPaymentPlanDto,
 } from '../../gen/fetch'
 import { handle404 } from '@island.is/clients/middlewares'
 import { ApplicationWriteApi } from './socialInsuranceAdministrationClient.type'
+import { IncomePlanDto, mapIncomePlanDto } from './dto/incomePlan.dto'
 
 @Injectable()
 export class SocialInsuranceAdministrationClientService {
@@ -26,6 +33,7 @@ export class SocialInsuranceAdministrationClientService {
     private readonly paymentPlanApi: PaymentPlanApi,
     private readonly currencyApi: GeneralApi,
     private readonly pensionCalculatorApi: PensionCalculatorApi,
+    private readonly incomePlanApi: IncomePlanApi,
   ) {}
 
   private applicationApiWithAuth = (user: User) =>
@@ -43,6 +51,9 @@ export class SocialInsuranceAdministrationClientService {
   private paymentPlanApiWithAuth = (user: User) =>
     this.paymentPlanApi.withMiddleware(new AuthMiddleware(user as Auth))
 
+  private incomePlanApiWithAuth = (user: User) =>
+    this.incomePlanApi.withMiddleware(new AuthMiddleware(user as Auth))
+
   getPaymentPlan(
     user: User,
   ): Promise<TrWebCommonsExternalPortalsApiModelsPaymentPlanPaymentPlanDto> {
@@ -59,6 +70,26 @@ export class SocialInsuranceAdministrationClientService {
       .catch(handle404)
   }
 
+  async getLatestIncomePlan(user: User): Promise<IncomePlanDto | null> {
+    const incomePlan = await this.incomePlanApiWithAuth(user)
+      .apiProtectedV1IncomePlanLatestIncomePlanGet()
+      .catch(handle404)
+
+    if (!incomePlan) {
+      return null
+    }
+
+    return mapIncomePlanDto(incomePlan) ?? null
+  }
+
+  async getIncomePlanConditions(
+    user: User,
+  ): Promise<TrWebCommonsExternalPortalsApiModelsIncomePlanIncomePlanConditionsDto> {
+    return this.incomePlanApiWithAuth(
+      user,
+    ).apiProtectedV1IncomePlanIncomePlanConditionsGet()
+  }
+
   sendApplication(
     user: User,
     applicationDTO: object,
@@ -97,7 +128,9 @@ export class SocialInsuranceAdministrationClientService {
   ): Promise<TrWebCommonsExternalPortalsApiModelsApplicationsIsEligibleForApplicationReturn> {
     return this.applicantApiWithAuth(
       user,
-    ).apiProtectedV1ApplicantApplicationTypeEligibleGet({ applicationType })
+    ).apiProtectedV1ApplicantApplicationTypeEligibleGet({
+      applicationType,
+    })
   }
 
   async getCurrencies(user: User): Promise<Array<string>> {
@@ -112,4 +145,34 @@ export class SocialInsuranceAdministrationClientService {
         parameters,
     })
   }
+
+  async getCategorizedIncomeTypes(
+    user: User,
+  ): Promise<
+    Array<TrWebCommonsExternalPortalsApiModelsIncomePlanExternalIncomeTypeDto>
+  > {
+    return this.incomePlanApiWithAuth(
+      user,
+    ).apiProtectedV1IncomePlanCategorizedIncomeTypesGet()
+  }
+
+  async getWithholdingTax(
+    user: User,
+    year: ApiProtectedV1IncomePlanWithholdingTaxGetRequest,
+  ): Promise<TrWebCommonsExternalPortalsApiModelsIncomePlanWithholdingTaxDto> {
+    return this.incomePlanApiWithAuth(
+      user,
+    ).apiProtectedV1IncomePlanWithholdingTaxGet(year)
+  }
+
+  async getTemporaryCalculations(
+    user: User,
+    parameters: ApiProtectedV1IncomePlanTemporaryCalculationsPostRequest['trWebApiServicesDomainFinanceModelsIslandIsIncomePlanDto'],
+  ): Promise<TrWebCommonsExternalPortalsApiModelsPaymentPlanPaymentPlanDto> {
+    return this.incomePlanApiWithAuth(
+      user,
+    ).apiProtectedV1IncomePlanTemporaryCalculationsPost({
+      trWebApiServicesDomainFinanceModelsIslandIsIncomePlanDto: parameters,
+    })
+  }
 }
diff --git a/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.type.ts b/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.type.ts
index e5fdca6d4ad2..6feb5ad7ad22 100644
--- a/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.type.ts
+++ b/libs/clients/social-insurance-administration/src/lib/socialInsuranceAdministrationClient.type.ts
@@ -7,7 +7,6 @@ import {
   PaymentPlanApi,
   PensionCalculatorApi,
   TestApi,
-  TrWebCommonsExternalPortalsApiModelsDocumentsDocument,
 } from '../../gen/fetch'
 
 export type Scope =
@@ -83,23 +82,31 @@ export interface Months {
   december?: number
 }
 
-export interface ApplicationDTO {
-  period?: Period
-  comment?: string
-  reasons?: Array<string>
-  applicationId?: string
-  domesticBankInfo?: DomesticBankInfo
-  foreignBankInfo?: ForeignBankInfo
-  taxInfo?: TaxInfo
-  applicantInfo?: ApplicantInfo
-  hasAbroadResidence?: boolean
-  hasOneTimePayment?: boolean
-  isSailorPension?: boolean
-  isRental?: boolean
-  hasAStudyingAdolescenceResident?: boolean
-  uploads?: Array<TrWebCommonsExternalPortalsApiModelsDocumentsDocument>
-  employment?: string
-  employers?: Array<Employer>
+export interface IncomePlanInfo {
+  incomeYear: number
+  incomeTypes: Array<IncomeTypes>
+}
+
+export interface IncomeTypes {
+  incomeTypeNumber: number
+  incomeTypeCode: string
+  incomeTypeName: string
+  currencyCode: string
+  incomeCategoryNumber: number
+  incomeCategoryCode: string
+  incomeCategoryName: string
+  amountJan: number
+  amountFeb: number
+  amountMar: number
+  amountApr: number
+  amountMay: number
+  amountJun: number
+  amountJul: number
+  amountAug: number
+  amountSep: number
+  amountOct: number
+  amountNov: number
+  amountDec: number
 }
 
 export enum DocumentTypeEnum {
@@ -117,3 +124,5 @@ export enum DocumentTypeEnum {
   HOUSE_RENT_AGREEMENT = 'houseRentAgreement',
   HOUSE_RENT_ALLOWANCE = 'houseRentAllowance',
 }
+
+export type IncomePlanStatus = 'Accepted' | 'Cancelled' | 'InProgress'
diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.types.ts b/libs/clients/syslumenn/src/lib/syslumennClient.types.ts
index 726aae1b79f4..c68f3c4da9c1 100644
--- a/libs/clients/syslumenn/src/lib/syslumennClient.types.ts
+++ b/libs/clients/syslumenn/src/lib/syslumennClient.types.ts
@@ -404,6 +404,7 @@ export interface JourneymanLicence {
 export interface ProfessionRight {
   name?: string
   profession?: string
+  nationalId?: string
 }
 
 export interface VehicleRegistration {
diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts b/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts
index bad846f59c24..8909d1c27f10 100644
--- a/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts
+++ b/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts
@@ -400,6 +400,8 @@ export const estateMemberMapper = (estateRaw: Erfingar): EstateMember => {
     nationalId: estateRaw.kennitala ?? '',
     relation: estateRaw.tengsl ?? 'Annað',
     advocate: estateRaw.malsvari ? mapAdvocate(estateRaw.malsvari) : undefined,
+    email: estateRaw.netfang ?? '',
+    phone: estateRaw.simi ?? '',
   }
 }
 
@@ -567,6 +569,7 @@ export const mapProfessionRight = (
   return {
     name: professionRight.nafn,
     profession: professionRight.starfsrettindi,
+    nationalId: professionRight.kennitala,
   }
 }
 
diff --git a/libs/clients/university-application/university-of-iceland/src/clientConfig.yaml b/libs/clients/university-application/university-of-iceland/src/clientConfig.yaml
index d426f73c801e..d02d5bbc95fd 100644
--- a/libs/clients/university-application/university-of-iceland/src/clientConfig.yaml
+++ b/libs/clients/university-application/university-of-iceland/src/clientConfig.yaml
@@ -1,9 +1,9 @@
 ---
 openapi: '3.0.0'
 paths:
-  /livness:
+  /liveness:
     get:
-      summary: 'Check livness status'
+      summary: 'Check liveness status'
       responses:
         '200':
           description: 'Successful response'
@@ -169,6 +169,8 @@ paths:
                                 type: 'string'
                               fieldType:
                                 type: 'string'
+                              fieldKey:
+                                $ref: '#/components/schemas/AttachmentKey'
                               uploadAcceptedFileType:
                                 type: 'string'
                               required:
@@ -424,41 +426,17 @@ paths:
                   type: 'array'
                   items:
                     type: 'string'
-                skrar:
-                  type: 'object'
-                  properties:
-                    cv:
-                      type: 'string'
-                    markmid:
-                      type: 'string'
-                    rannsoknaraaetlun:
-                      type: 'string'
-                    namsaaetlun:
-                      type: 'string'
-                    rannsoknarverkefni:
-                      type: 'string'
-                    vidhengi_medmaelendur:
-                      type: 'string'
-                    leidbeinandi:
-                      type: 'string'
-                    profskirteini:
-                      type: 'string'
-                    profskirteini2:
-                      type: 'string'
-                    onnur_skjol:
-                      type: 'string'
-                    kynningarbref:
-                      type: 'string'
-                    ferilsskra:
-                      type: 'string'
-                    leyfisbref:
-                      type: 'string'
-                    portofolio:
-                      type: 'string'
-                    sakavottord:
-                      type: 'string'
-                    profskirteini3:
-                      type: 'string'
+                attachments:
+                  type: 'array'
+                  items:
+                    type: 'object'
+                    properties:
+                      attachmentKey:
+                        $ref: '#/components/schemas/AttachmentKey'
+                      fileName:
+                        type: 'string'
+                      url:
+                        type: 'string'
                 namskeid:
                   type: 'object'
                   properties:
@@ -479,45 +457,6 @@ paths:
                     description: 'Application ID'
       tags:
         - 'Application'
-  /applications/attachments/{guid}:
-    post:
-      parameters:
-        - name: guid
-          required: true
-          in: path
-          allowEmptyValue: false
-          description: Application ID
-          schema:
-            type: string
-            format: uuid
-      summary: Submit an applications accompanying documents
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              type: object
-              properties:
-                attachment:
-                  type: string
-                  format: binary
-                attachmentKey:
-                  $ref: '#/components/schemas/AttachmentKey'
-      responses:
-        '200':
-          description: Successful submission
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  id:
-                    type: string
-                    description: Attachment ID
-        '400':
-          description: Bad Request - No application with given ID
-      tags:
-        - Application
   /openapi.yaml:
     get:
       operationId: 'InfraController_openapi'
@@ -587,6 +526,32 @@ components:
             - $ref: '#/components/schemas/Application'
       required:
         - 'data'
+    AttachmentKey:
+      type: 'string'
+      enum:
+        - 'cv'
+        - 'markmid'
+        - 'rannsoknaraaetlun'
+        - 'namsaaetlun'
+        - 'rannsoknarverkefni'
+        - 'profskirteini'
+        - 'profskirteini2'
+        - 'profskirteini3'
+        - 'onnur_skjol'
+        - 'kynningarbref'
+        - 'ferilsskra'
+        - 'leyfisbref'
+        - 'portofolio'
+        - 'sakavottord'
+    ExtraApplicationField:
+      type: 'object'
+      required:
+        - 'fieldType'
+      properties:
+        fieldType:
+          type: 'string'
+      discriminator:
+        propertyName: 'fieldType'
     CreateApplicationDto:
       type: 'object'
       properties:
@@ -614,23 +579,6 @@ components:
         - 'universityId'
         - 'programId'
         - 'modeOfDelivery'
-    AttachmentKey:
-      type: string
-      enum:
-        - cv
-        - markmid
-        - rannsoknaraaetlun
-        - namsaaetlun
-        - rannsoknarverkefni
-        - profskirteini
-        - profskirteini2
-        - profskirteini3
-        - onnur_skjol
-        - kynningarbref
-        - ferilsskra
-        - leyfisbref
-        - portofolio
-        - sakavottord
     UpdateApplicationDto:
       type: 'object'
       properties:
diff --git a/libs/clients/university-application/university-of-iceland/src/lib/universityOfIcelandClient.service.ts b/libs/clients/university-application/university-of-iceland/src/lib/universityOfIcelandClient.service.ts
index e5e155613781..9906779aa65e 100644
--- a/libs/clients/university-application/university-of-iceland/src/lib/universityOfIcelandClient.service.ts
+++ b/libs/clients/university-application/university-of-iceland/src/lib/universityOfIcelandClient.service.ts
@@ -2,22 +2,15 @@ import { Injectable } from '@nestjs/common'
 import { ApplicationApi, CoursesApi, ProgramsApi } from '../../gen/fetch/apis'
 import {
   ApplicationStatus,
-  CourseSeason,
-  DegreeType,
-  FieldType,
   IApplication,
   ICourse,
   IProgram,
-  ModeOfDelivery,
-  Requirement,
-  Season,
-  mapStringToEnum,
 } from '@island.is/university-gateway'
 import { logger } from '@island.is/logging'
 import { mapUglaPrograms } from './utils/mapUglaPrograms'
 import { mapUglaCourses } from './utils/mapUglaCourses'
 import { mapUglaApplication } from './utils/mapUglaApplication'
-import { AttachmentKey, InlineResponse2004 } from '../../gen/fetch'
+import { InlineResponse2004 } from '../../gen/fetch'
 
 @Injectable()
 export class UniversityOfIcelandApplicationClient {
@@ -55,7 +48,7 @@ export class UniversityOfIcelandApplicationClient {
   async createApplication(
     application: IApplication,
   ): Promise<InlineResponse2004> {
-    const mappedApplication = mapUglaApplication(
+    const mappedApplication = await mapUglaApplication(
       application,
       (courseExternalId: string, e: Error) => {
         logger.error(
@@ -65,24 +58,7 @@ export class UniversityOfIcelandApplicationClient {
       },
     )
 
-    const response = await this.applicationApi.applicationsPost(
-      mappedApplication,
-    )
-
-    application.attachments?.filter(Boolean).forEach(async (attachment) => {
-      const attachmentKey = attachment?.fileType
-        ? AttachmentKey[attachment.fileType as keyof typeof AttachmentKey] ||
-          undefined
-        : undefined
-      const requestParams = {
-        guid: application.id,
-        attachment: attachment?.blob,
-        attachmentKey,
-      }
-      await this.applicationApi.applicationsAttachmentsGuidPost(requestParams)
-    })
-
-    return response
+    return this.applicationApi.applicationsPost(mappedApplication)
   }
 
   async updateApplicationStatus(externalId: string, status: ApplicationStatus) {
diff --git a/libs/clients/university-application/university-of-iceland/src/lib/utils/mapUglaApplication.ts b/libs/clients/university-application/university-of-iceland/src/lib/utils/mapUglaApplication.ts
index 3fbf4a949115..46602aca0111 100644
--- a/libs/clients/university-application/university-of-iceland/src/lib/utils/mapUglaApplication.ts
+++ b/libs/clients/university-application/university-of-iceland/src/lib/utils/mapUglaApplication.ts
@@ -1,10 +1,18 @@
-import { ApplicationTypes, IApplication } from '@island.is/university-gateway'
-import { ApplicationsPostRequest } from '../../../gen/fetch'
+import {
+  ApplicationTypes,
+  IApplication,
+  IApplicationAttachment,
+} from '@island.is/university-gateway'
+import {
+  ApplicationsAttachments,
+  ApplicationsPostRequest,
+  AttachmentKey,
+} from '../../../gen/fetch'
 
-export const mapUglaApplication = (
+export const mapUglaApplication = async (
   application: IApplication,
   logError: (courseExternalId: string, error: Error) => void,
-): ApplicationsPostRequest => {
+): Promise<ApplicationsPostRequest> => {
   const uglaApplication: ApplicationsPostRequest = {
     inlineObject: {
       guid: application.id,
@@ -29,8 +37,6 @@ export const mapUglaApplication = (
 
       inntokuskilyrdiLesin: 'false', // TODO done when extraApplicationFields are connected
 
-      // kjorsvid: und, // TODO connect to chosen kjorsvid
-
       personuverndSamthykki: 'false', // TODO done when extraApplicationFields are connected
       hugverkaretturSamthykki: 'false', // TODO done when extraApplicationFields are connected
       eldriUmsokn: 'false', // TODO should we return this?
@@ -52,9 +58,27 @@ export const mapUglaApplication = (
       medmaelendur: [], // TODO are we doing this?
       leidbeinandi: undefined, // TODO are we doing this?
       tenglar: [], // TODO are we doing this?
-      skrar: undefined, // TODO connect files later
+      attachments: application.attachments
+        ? await mapApplicationAttachments(application.attachments)
+        : undefined,
       namskeid: undefined, // TODO what is this?
     },
   }
+
   return uglaApplication
 }
+
+const mapApplicationAttachments = async (
+  attachments: Array<IApplicationAttachment | undefined>,
+): Promise<Array<ApplicationsAttachments>> => {
+  return await Promise.all(
+    attachments.filter(Boolean).map(async (attachment) => {
+      return {
+        url: attachment?.url,
+        attachmentKey:
+          AttachmentKey[attachment?.fileType as keyof typeof AttachmentKey],
+        fileName: attachment?.fileName,
+      } as ApplicationsAttachments
+    }),
+  )
+}
diff --git a/libs/clients/work-machines/src/clientConfig.json b/libs/clients/work-machines/src/clientConfig.json
index f90018d093fc..4116b87c3863 100644
--- a/libs/clients/work-machines/src/clientConfig.json
+++ b/libs/clients/work-machines/src/clientConfig.json
@@ -1050,6 +1050,27 @@
         }
       }
     },
+    "/api/MachineStreetRegistration/MayStreetRegister": {
+      "get": {
+        "tags": ["MachineStreetRegistration"],
+        "summary": "Returns a list of registration number prefixes that require an inspection before street registration",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/MachineStreetRegistration/MustInspectBeforeRegistration": {
       "get": {
         "tags": ["MachineStreetRegistration"],
@@ -1217,6 +1238,13 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "subCategory",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -1501,6 +1529,9 @@
           },
           "paymentRequiredForOwnerChange": {
             "type": "boolean"
+          },
+          "mayStreetRegister": {
+            "type": "boolean"
           }
         },
         "additionalProperties": false
diff --git a/libs/clients/work-machines/src/lib/workMachines.service.ts b/libs/clients/work-machines/src/lib/workMachines.service.ts
index 2680daad169e..5ec34f55d3e7 100644
--- a/libs/clients/work-machines/src/lib/workMachines.service.ts
+++ b/libs/clients/work-machines/src/lib/workMachines.service.ts
@@ -133,6 +133,7 @@ export class WorkMachinesClientService {
       .apiMachinesGet(input)
       .catch(handle404)
   }
+
   getWorkMachineById = async (
     user: User,
     input: GetMachineRequest,
diff --git a/libs/cms/src/lib/cms.contentful.service.ts b/libs/cms/src/lib/cms.contentful.service.ts
index 1cdfd2c2c64a..7b48437abb7a 100644
--- a/libs/cms/src/lib/cms.contentful.service.ts
+++ b/libs/cms/src/lib/cms.contentful.service.ts
@@ -153,7 +153,7 @@ export class CmsContentfulService {
 
     const params = {
       ['content_type']: 'organization',
-      include: 10,
+      include: 4,
       limit: 1000,
       ...organizationTitles,
       ...organizationReferenceIdentifiers,
diff --git a/libs/cms/src/lib/cms.module.ts b/libs/cms/src/lib/cms.module.ts
index 07ab334acd68..f638377a5c16 100644
--- a/libs/cms/src/lib/cms.module.ts
+++ b/libs/cms/src/lib/cms.module.ts
@@ -12,6 +12,7 @@ import {
   PowerBiSliceResolver,
   LatestEventsSliceResolver,
   TeamListResolver,
+  LatestGenericListItemsResolver,
 } from './cms.resolver'
 import { CmsContentfulService } from './cms.contentful.service'
 import { ContentfulRepository } from './contentful.repository'
@@ -52,6 +53,7 @@ import { OrganizationTitleEnByReferenceIdLoader } from './loaders/organizationTi
     PowerBiSliceResolver,
     LatestEventsSliceResolver,
     TeamListResolver,
+    LatestGenericListItemsResolver,
   ],
   exports: [
     ContentfulRepository,
diff --git a/libs/cms/src/lib/cms.resolver.ts b/libs/cms/src/lib/cms.resolver.ts
index 7b18fc9dafb0..d6d2d2a821c0 100644
--- a/libs/cms/src/lib/cms.resolver.ts
+++ b/libs/cms/src/lib/cms.resolver.ts
@@ -120,6 +120,7 @@ import { GetTeamMembersInput } from './dto/getTeamMembers.input'
 import { TeamMemberResponse } from './models/teamMemberResponse.model'
 import { TeamList } from './models/teamList.model'
 import { TeamMember } from './models/teamMember.model'
+import { LatestGenericListItems } from './models/latestGenericListItems.model'
 
 const defaultCache: CacheControlOptions = { maxAge: CACHE_CONTROL_MAX_AGE }
 
@@ -838,3 +839,18 @@ export class TeamListResolver {
     return teamList?.variant === 'accordion' ? [] : teamList?.teamMembers ?? []
   }
 }
+
+@Resolver(() => LatestGenericListItems)
+export class LatestGenericListItemsResolver {
+  constructor(private cmsElasticsearchService: CmsElasticsearchService) {}
+
+  @ResolveField(() => GenericListItemResponse, { nullable: true })
+  async itemResponse(
+    @Parent() { itemResponse: input }: LatestGenericListItems,
+  ) {
+    if (!input) {
+      return null
+    }
+    return this.cmsElasticsearchService.getGenericListItems(input)
+  }
+}
diff --git a/libs/cms/src/lib/generated/contentfulTypes.d.ts b/libs/cms/src/lib/generated/contentfulTypes.d.ts
index bfda7cf33464..f0e1d38a31e0 100644
--- a/libs/cms/src/lib/generated/contentfulTypes.d.ts
+++ b/libs/cms/src/lib/generated/contentfulTypes.d.ts
@@ -581,14 +581,14 @@ export interface IChartFields {
   /** X Axis Format */
   xAxisFormat?: string | undefined
 
+  /** Y Axis Label */
+  yAxisLabel?: string | undefined
+
   /** Custom Style Config */
   customStyleConfig?: Record<string, any> | undefined
 
   /** Reduce and round value */
   reduceAndRoundValue?: boolean | undefined
-
-  /** Y Axis Label */
-  yAxisLabel?: string | undefined
 }
 
 /** A wrapper to render any graphical representation of data using [Chart Component]s. */
@@ -1333,7 +1333,7 @@ export interface IFormFields {
   intro?: string | undefined
 
   /** Recipient */
-  recipient: string
+  recipient?: string | undefined
 
   /** Default field namespace */
   defaultFieldNamespace?: Record<string, any> | undefined
@@ -1991,6 +1991,41 @@ export interface ILatestEventsSlice extends Entry<ILatestEventsSliceFields> {
   }
 }
 
+export interface ILatestGenericListItemsFields {
+  /** Internal Title */
+  internalTitle?: string | undefined
+
+  /** Title */
+  title?: string | undefined
+
+  /** Generic List */
+  genericList?: IGenericList | undefined
+
+  /** See more page */
+  seeMorePage?: IOrganizationSubpage | undefined
+
+  /** See more link text */
+  seeMoreLinkText?: string | undefined
+}
+
+export interface ILatestGenericListItems
+  extends Entry<ILatestGenericListItemsFields> {
+  sys: {
+    id: string
+    type: string
+    createdAt: string
+    updatedAt: string
+    locale: string
+    contentType: {
+      sys: {
+        id: 'latestGenericListItems'
+        linkType: 'ContentType'
+        type: 'Link'
+      }
+    }
+  }
+}
+
 export interface ILatestNewsSliceFields {
   /** Title */
   title?: string | undefined
@@ -2937,6 +2972,7 @@ export interface IOrganizationPageFields {
         | ISectionWithVideo
         | IAnchorPageList
         | ISectionWithImage
+        | IChartNumberBox
       )[]
     | undefined
 
@@ -3659,11 +3695,11 @@ export interface IServiceWebPageFields {
   /** Footer Items */
   footerItems?: IFooterItem[] | undefined
 
-  /** Email Config */
-  emailConfig?: Record<string, any> | undefined
-
   /** Contact Form Disclaimer */
   contactFormDisclaimer?: Document | undefined
+
+  /** Email Config */
+  emailConfig?: Record<string, any> | undefined
 }
 
 export interface IServiceWebPage extends Entry<IServiceWebPageFields> {
@@ -3770,6 +3806,9 @@ export interface ISliceConnectedComponentFields {
 
   /** Config */
   config?: Record<string, any> | undefined
+
+  /** Translation namespace */
+  translationNamespace?: INamespace | undefined
 }
 
 export interface ISliceConnectedComponent
@@ -4363,7 +4402,7 @@ export interface ITeamMemberFields {
   /** Image */
   mynd: Asset
 
-  /** Image On Select */
+  /** Image On Hover */
   imageOnSelect?: Asset | undefined
 
   /** Filter Tags */
@@ -4590,7 +4629,7 @@ export interface ITwoColumnTextFields {
   /** Left Title */
   leftTitle?: string | undefined
 
-  /** Only use one title */
+  /** Only use left title */
   onlyUseOneTitle?: boolean | undefined
 
   /** Left Content */
@@ -5010,6 +5049,7 @@ export type CONTENT_TYPE =
   | 'iconBullet'
   | 'introLinkImage'
   | 'latestEventsSlice'
+  | 'latestGenericListItems'
   | 'latestNewsSlice'
   | 'lifeEventPage'
   | 'link'
diff --git a/libs/cms/src/lib/models/connectedComponent.model.ts b/libs/cms/src/lib/models/connectedComponent.model.ts
index db37ee627b4a..d627d13d8b20 100644
--- a/libs/cms/src/lib/models/connectedComponent.model.ts
+++ b/libs/cms/src/lib/models/connectedComponent.model.ts
@@ -1,10 +1,11 @@
 import { Field, ID, ObjectType } from '@nestjs/graphql'
-import graphqlTypeJson from 'graphql-type-json'
+import graphqlTypeJson, { GraphQLJSONObject } from 'graphql-type-json'
 import {
   ISliceConnectedComponent,
   ISliceConnectedComponentFields,
 } from '../generated/contentfulTypes'
 import { SystemMetadata } from '@island.is/shared/types'
+import { CacheField } from '@island.is/nest/graphql'
 
 @ObjectType()
 export class ConnectedComponent {
@@ -25,6 +26,9 @@ export class ConnectedComponent {
 
   @Field(() => graphqlTypeJson, { nullable: true })
   configJson?: Record<string, any> | null
+
+  @CacheField(() => GraphQLJSONObject, { nullable: true })
+  translationStrings!: Record<string, string>
 }
 
 const parseJson = (fields: ISliceConnectedComponentFields) => {
@@ -71,4 +75,5 @@ export const mapConnectedComponent = ({
   type: fields?.type ?? 'None',
   json: fields?.json ? parseJson(fields) : null,
   configJson: fields?.config,
+  translationStrings: fields?.translationNamespace?.fields?.strings || {},
 })
diff --git a/libs/cms/src/lib/models/latestGenericListItems.model.ts b/libs/cms/src/lib/models/latestGenericListItems.model.ts
new file mode 100644
index 000000000000..56a0672ca3cd
--- /dev/null
+++ b/libs/cms/src/lib/models/latestGenericListItems.model.ts
@@ -0,0 +1,81 @@
+import { Field, ID, ObjectType } from '@nestjs/graphql'
+import { SystemMetadata } from '@island.is/shared/types'
+import { CacheField } from '@island.is/nest/graphql'
+import {
+  ILatestGenericListItems,
+  IOrganizationSubpage,
+} from '../generated/contentfulTypes'
+import { GenericList, mapGenericList } from './genericList.model'
+import { mapPageUnion, PageUnion } from '../unions/page.union'
+import { GetGenericListItemsInput } from '../dto/getGenericListItems.input'
+import { GenericListItemResponse } from './genericListItemResponse.model'
+import { ElasticsearchIndexLocale } from '@island.is/content-search-index-manager'
+import { mapOrganizationSubpage } from './organizationSubpage.model'
+
+@ObjectType()
+export class LatestGenericListItems {
+  @Field(() => ID)
+  id!: string
+
+  @Field()
+  title?: string
+
+  @CacheField(() => GenericList, { nullable: true })
+  genericList?: GenericList | null
+
+  @CacheField(() => PageUnion)
+  seeMorePage?: typeof PageUnion | null
+
+  @Field()
+  seeMoreLinkText?: string
+
+  @CacheField(() => GenericListItemResponse, { nullable: true })
+  itemResponse?: GetGenericListItemsInput | null // This field is populated by resolver
+}
+
+const mapSeeMorePage = (seeMorePage: IOrganizationSubpage | undefined) => {
+  if (!seeMorePage) {
+    return null
+  }
+  if (seeMorePage.sys.contentType.sys.id !== 'organizationSubpage') {
+    return mapPageUnion(seeMorePage)
+  }
+
+  return mapOrganizationSubpage({
+    ...seeMorePage,
+    fields: {
+      ...seeMorePage.fields,
+      organizationPage: {
+        ...seeMorePage.fields.organizationPage,
+        fields: {
+          ...seeMorePage.fields.organizationPage?.fields,
+          slices: [],
+          bottomSlices: [],
+        },
+      },
+    },
+  })
+}
+
+export const mapLatestGenericListItems = ({
+  fields,
+  sys,
+}: ILatestGenericListItems): SystemMetadata<LatestGenericListItems> => ({
+  typename: 'LatestGenericListItems',
+  id: sys.id,
+  title: fields.title ?? '',
+  genericList: fields.genericList ? mapGenericList(fields.genericList) : null,
+  seeMorePage: mapSeeMorePage(fields.seeMorePage),
+  seeMoreLinkText: fields.seeMoreLinkText ?? '',
+  itemResponse: fields.genericList?.sys.id
+    ? {
+        genericListId: fields.genericList?.sys.id,
+        lang:
+          sys.locale === 'is-IS'
+            ? 'is'
+            : (sys.locale as ElasticsearchIndexLocale),
+        page: 1,
+        size: 2,
+      }
+    : null,
+})
diff --git a/libs/cms/src/lib/models/organizationSubpage.model.ts b/libs/cms/src/lib/models/organizationSubpage.model.ts
index 8a6d26cdcb79..f8ec134d2482 100644
--- a/libs/cms/src/lib/models/organizationSubpage.model.ts
+++ b/libs/cms/src/lib/models/organizationSubpage.model.ts
@@ -11,6 +11,7 @@ import {
   SliceUnion,
 } from '../unions/slice.union'
 import { EmbeddedVideo, mapEmbeddedVideo } from './embeddedVideo.model'
+import { SystemMetadata } from '@island.is/shared/types'
 
 @ObjectType()
 export class OrganizationSubpage {
@@ -63,7 +64,8 @@ export class OrganizationSubpage {
 export const mapOrganizationSubpage = ({
   fields,
   sys,
-}: IOrganizationSubpage): OrganizationSubpage => ({
+}: IOrganizationSubpage): SystemMetadata<OrganizationSubpage> => ({
+  typename: 'OrganizationSubpage',
   id: sys.id,
   title: fields.title ?? '',
   shortTitle: fields.shortTitle || fields.title,
diff --git a/libs/cms/src/lib/unions/slice.union.ts b/libs/cms/src/lib/unions/slice.union.ts
index 79d1064c0bd2..c1030069963e 100644
--- a/libs/cms/src/lib/unions/slice.union.ts
+++ b/libs/cms/src/lib/unions/slice.union.ts
@@ -47,6 +47,7 @@ import {
   IChartNumberBox,
   IFeaturedEvents,
   IGenericList,
+  ILatestGenericListItems,
 } from '../generated/contentfulTypes'
 import { Image, mapImage } from '../models/image.model'
 import { Asset, mapAsset } from '../models/asset.model'
@@ -140,6 +141,10 @@ import {
   mapFeaturedEvents,
 } from '../models/featuredEvents.model'
 import { GenericList, mapGenericList } from '../models/genericList.model'
+import {
+  LatestGenericListItems,
+  mapLatestGenericListItems,
+} from '../models/latestGenericListItems.model'
 
 export type SliceTypes =
   | ITimeline
@@ -186,6 +191,7 @@ export type SliceTypes =
   | IChartNumberBox
   | IFeaturedEvents
   | IGenericList
+  | ILatestGenericListItems
 
 export const SliceUnion = createUnionType({
   name: 'Slice',
@@ -237,6 +243,7 @@ export const SliceUnion = createUnionType({
     ChartNumberBox,
     FeaturedEvents,
     GenericList,
+    LatestGenericListItems,
   ],
   resolveType: (document) => document.typename, // typename is appended to request on indexing
 })
@@ -332,6 +339,8 @@ export const mapSliceUnion = (slice: SliceTypes): typeof SliceUnion => {
       return mapFeaturedEvents(slice as IFeaturedEvents)
     case 'genericList':
       return mapGenericList(slice as IGenericList)
+    case 'latestGenericListItems':
+      return mapLatestGenericListItems(slice as ILatestGenericListItems)
     default:
       throw new ApolloError(`Can not convert to slice: ${contentType}`)
   }
diff --git a/libs/content-search-toolkit/src/services/elastic.service.ts b/libs/content-search-toolkit/src/services/elastic.service.ts
index 3e52d90244d9..3799eabdd04c 100644
--- a/libs/content-search-toolkit/src/services/elastic.service.ts
+++ b/libs/content-search-toolkit/src/services/elastic.service.ts
@@ -1,5 +1,7 @@
 import { Client } from '@elastic/elasticsearch'
 import merge from 'lodash/merge'
+import * as AWS from 'aws-sdk'
+import AwsConnector from 'aws-elasticsearch-connector'
 import { Injectable } from '@nestjs/common'
 import { logger } from '@island.is/logging'
 import { autocompleteTermQuery } from '../queries/autocomplete'
@@ -34,12 +36,8 @@ import { tagAggregationQuery } from '../queries/tagAggregation'
 import { typeAggregationQuery } from '../queries/typeAggregation'
 import { rankEvaluationQuery } from '../queries/rankEvaluation'
 import { filterDoc, getValidBulkRequestChunk } from './utils'
-import {
-  createAWSConnection,
-  awsGetCredentials,
-} from '@acuris/aws-es-connection'
 
-type RequestBodyType<T = Record<string, unknown>> = T | string | Buffer
+type RequestBodyType<T = Record<string, any>> = T | string | Buffer
 type RankResultMap<T extends string> = Record<string, RankEvaluationResponse<T>>
 
 const { elastic } = environment
@@ -271,7 +269,7 @@ export class ElasticService {
   async getTagAggregation(index: string, query: TagAggregationInput) {
     const requestBody = tagAggregationQuery(query)
     const data = await this.findByQuery<
-      SearchResponse<unknown, TagAggregationResponse>,
+      SearchResponse<any, TagAggregationResponse>,
       typeof requestBody
     >(index, requestBody)
     return data.body
@@ -280,7 +278,7 @@ export class ElasticService {
   async getTypeAggregation(index: string, query: TypeAggregationInput) {
     const requestBody = typeAggregationQuery(query)
     const data = await this.findByQuery<
-      SearchResponse<unknown, TypeAggregationResponse>,
+      SearchResponse<any, TypeAggregationResponse>,
       typeof requestBody
     >(index, requestBody)
     return data.body
@@ -289,7 +287,7 @@ export class ElasticService {
   async getDateAggregation(index: string, query: DateAggregationInput) {
     const requestBody = dateAggregationQuery(query)
     const data = await this.findByQuery<
-      SearchResponse<unknown, DateAggregationResponse>,
+      SearchResponse<any, DateAggregationResponse>,
       typeof requestBody
     >(index, requestBody)
     return data.body
@@ -394,19 +392,19 @@ export class ElasticService {
     }
 
     return new Client({
-      ...createAWSConnection(await awsGetCredentials()),
+      ...AwsConnector(AWS.config),
       node: elastic.node,
     })
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static handleError(message: string, context: unknown, error: Error): never {
+  static handleError(message: string, context: any, error: Error): never {
     ElasticService.logError(message, context, error)
     throw error
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static logError(message: string, context: unknown, error: any) {
+  static logError(message: string, context: any, error: any) {
     const errorCtx = {
       error: {
         message: error.message,
diff --git a/libs/content-search-toolkit/src/services/kibana.service.ts b/libs/content-search-toolkit/src/services/kibana.service.ts
index e3772cf4a9e0..6588343895d6 100644
--- a/libs/content-search-toolkit/src/services/kibana.service.ts
+++ b/libs/content-search-toolkit/src/services/kibana.service.ts
@@ -1,15 +1,13 @@
 import fetch from 'node-fetch'
 import FormData from 'form-data'
-import {
-  STSClient,
-  AssumeRoleWithWebIdentityCommand,
-} from '@aws-sdk/client-sts'
+import * as AWS from 'aws-sdk'
 import aws4 from 'aws4'
 import util from 'util'
 import fs from 'fs'
 import { Injectable } from '@nestjs/common'
 import { logger } from '@island.is/logging'
 import { KibanaSavedObject } from '@island.is/content-search-indexer/types'
+import { arnType } from 'aws-sdk/clients/sts'
 
 import { environment } from '../environments/environment'
 
@@ -31,10 +29,7 @@ interface ApiParams {
 
 @Injectable()
 export class KibanaService {
-  private stsClient: STSClient
-
   constructor() {
-    this.stsClient = new STSClient({})
     logger.info(
       `Created Kibana Service using the url: ${kibana.url} and ${process.env.ELASTIC_NODE}`,
     )
@@ -46,15 +41,16 @@ export class KibanaService {
     body,
     headers,
   }: ApiParams): Promise<object> {
+    const sts = new AWS.STS()
     const token = await readFile(awsWebIdentityTokenFile as string)
 
-    const command = new AssumeRoleWithWebIdentityCommand({
-      RoleArn: awsRoleName,
-      RoleSessionName: 'kibana',
-      WebIdentityToken: token.toString(),
-    })
-
-    const { Credentials } = await this.stsClient.send(command)
+    const { Credentials } = await sts
+      .assumeRoleWithWebIdentity({
+        RoleArn: awsRoleName as arnType,
+        RoleSessionName: 'kibana',
+        WebIdentityToken: token.toString(),
+      })
+      .promise()
 
     if (!Credentials) {
       throw new Error('AWS STS credentials missing.')
diff --git a/libs/content-search-toolkit/src/services/utils/index.ts b/libs/content-search-toolkit/src/services/utils/index.ts
index 2185c8585c26..65c3ac91b64f 100644
--- a/libs/content-search-toolkit/src/services/utils/index.ts
+++ b/libs/content-search-toolkit/src/services/utils/index.ts
@@ -1,14 +1,12 @@
 /**
- * @param node The node to filter
- * @param visited A set of nodes already visited
- * @param letterLimit The max number of letters allowed
- * @return True iff. a document was removed
+ * @param {T} err Error object
+ * @return {boolean} True iff a document was removed
  *
  * Filter the HUMONGOUS documents in an error object
  */
-export const filterDoc = function filterDoc<T extends object>(
+export function filterDoc<T>(
   node: T,
-  visited: Set<T> = new Set(),
+  visited = new Set(),
   letterLimit = 10000,
 ): boolean {
   if (visited.has(node) || !node) return false
@@ -26,7 +24,7 @@ export const filterDoc = function filterDoc<T extends object>(
       continue
     } else if (
       typeof value === 'object' &&
-      filterDoc(value as T, visited, letterLimit)
+      filterDoc(value, visited, letterLimit)
     ) {
       deleted = true
     }
@@ -34,7 +32,7 @@ export const filterDoc = function filterDoc<T extends object>(
   return deleted
 }
 
-export const getValidBulkRequestChunk = function getValidBulkRequestChunk(
+export function getValidBulkRequestChunk(
   requests: Record<string, unknown>[],
   maxSize = 20,
 ) {
diff --git a/libs/email-service/src/lib/email.service.ts b/libs/email-service/src/lib/email.service.ts
index 779a23b4b3cc..846b39d3161b 100644
--- a/libs/email-service/src/lib/email.service.ts
+++ b/libs/email-service/src/lib/email.service.ts
@@ -1,5 +1,5 @@
+import { SES } from 'aws-sdk'
 import nodemailer from 'nodemailer'
-import * as aws from '@aws-sdk/client-ses'
 
 import { Inject } from '@nestjs/common'
 
@@ -52,7 +52,7 @@ export class EmailService {
 
     this.logger.debug('Using SES')
 
-    const cfg: aws.SESClientConfig = {
+    const cfg: SES.ClientConfiguration = {
       apiVersion: '2010-12-01',
     }
 
@@ -60,9 +60,8 @@ export class EmailService {
       cfg.region = this.config.region
     }
 
-    const ses = new aws.SES(cfg)
     return {
-      SES: { ses, aws },
+      SES: new SES(cfg),
     }
   }
 
diff --git a/libs/feature-flags/src/lib/features.ts b/libs/feature-flags/src/lib/features.ts
index d0d394a58322..00d708e0408b 100644
--- a/libs/feature-flags/src/lib/features.ts
+++ b/libs/feature-flags/src/lib/features.ts
@@ -39,6 +39,7 @@ export enum Features {
   FinancialStatementCemetery = 'isFinancialStatementCemeteryEnabled',
   ParliamentaryElectionApplication = 'isParliamentaryElectionApplicationEnabled',
   FinancialStatementIndividualElectionEnabled = 'isFinancialStatementIndividualElectionEnabled',
+  IncomePlanEnabled = 'isIncomePlanEnabled',
 
   // Application System Delegations active
   applicationSystemDelegations = 'applicationSystemDelegations',
@@ -51,6 +52,8 @@ export enum Features {
   servicePortalSignatureCollection = 'isServicePortalSignatureCollectionEnabled',
   servicePortalVehicleMileagePageEnabled = 'isServicePortalVehicleMileagePageEnabled',
   servicePortalSocialInsurancePageEnabled = 'isServicePortalSocialInsurancePageEnabled',
+  servicePortalSocialInsuranceIncomePlanPageEnabled = 'isServicePortalSocialInsuranceIncomePlanPageEnabled',
+
   ServicePortalNotificationsEnabled = 'isServicePortalNotificationsPageEnabled',
 
   //Occupational License Health directorate fetch enabled
diff --git a/libs/file-storage/src/lib/file-storage.service.ts b/libs/file-storage/src/lib/file-storage.service.ts
index cf11e1f72780..8059fb66b043 100644
--- a/libs/file-storage/src/lib/file-storage.service.ts
+++ b/libs/file-storage/src/lib/file-storage.service.ts
@@ -1,34 +1,24 @@
 import { Inject, Injectable } from '@nestjs/common'
-import {
-  S3Client,
-  GetObjectCommand,
-  CopyObjectCommand,
-} from '@aws-sdk/client-s3'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
-import { createPresignedPost } from '@aws-sdk/s3-presigned-post'
-import { v4 as uuid } from 'uuid'
+import * as AWS from 'aws-sdk'
+import { uuid } from 'uuidv4'
 import AmazonS3URI from 'amazon-s3-uri'
 import kebabCase from 'lodash/kebabCase'
 import { ConfigType } from '@nestjs/config'
 import { FileStorageConfig } from './file-storage.configuration'
 
-const PRESIGNED_POST_EXPIRES = 60 * 5
+const PRESIGNED_POST_EXPIRES = 1000 * 60 * 5
 const SIGNED_GET_EXPIRES = 10 * 60
 
 @Injectable()
 export class FileStorageService {
-  private s3Client: S3Client
+  private s3 = new AWS.S3({ apiVersion: '2006-03-01' })
 
   constructor(
     @Inject(FileStorageConfig.KEY)
     private config: ConfigType<typeof FileStorageConfig>,
-  ) {
-    this.s3Client = new S3Client({ apiVersion: '2006-03-01' })
-  }
+  ) {}
 
-  async generatePresignedPost(
-    filename: string,
-  ): Promise<{ url: string; fields: Record<string, string> }> {
+  generatePresignedPost(filename: string): Promise<AWS.S3.PresignedPost> {
     if (!this.config.uploadBucket) {
       throw new Error('Upload bucket not configured.')
     }
@@ -47,25 +37,31 @@ export class FileStorageService {
     const fileId = uuid()
     const key = `${fileId}_${kebabCase(fName)}${fExt}`
 
-    const { url, fields } = await createPresignedPost(this.s3Client, {
+    const params = {
       Bucket: this.config.uploadBucket,
-      Key: key,
-      Conditions: [
-        ['content-length-range', 0, 10000000], // Max 10MB
-      ],
-      Expires: PRESIGNED_POST_EXPIRES, // createPresignedPost expects seconds
-    })
+      Expires: PRESIGNED_POST_EXPIRES,
+      Fields: {
+        key,
+      },
+      conditions: [['content-length-range', 0, 10000000]], // Max 10MB
+    }
 
-    return { url, fields }
+    return new Promise((resolve, reject) => {
+      this.s3.createPresignedPost(params, (err, data) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(data)
+        }
+      })
+    })
   }
 
-  public async generateSignedUrl(url: string): Promise<string> {
+  public generateSignedUrl(url: string): Promise<string> {
     const { bucket, key } = AmazonS3URI(url)
-    const command = new GetObjectCommand({ Bucket: bucket, Key: key })
+    const params = { Bucket: bucket, Expires: SIGNED_GET_EXPIRES, Key: key }
 
-    return getSignedUrl(this.s3Client, command, {
-      expiresIn: SIGNED_GET_EXPIRES,
-    })
+    return this.s3.getSignedUrlPromise('getObject', params)
   }
 
   public getObjectUrl(key: string): string {
@@ -81,15 +77,14 @@ export class FileStorageService {
       throw new Error('Upload bucket not configured.')
     }
 
-    const command = new CopyObjectCommand({
+    const params = {
       Key: destinationKey,
       Bucket: destinationBucket,
       CopySource: `${this.config.uploadBucket}/${sourceKey}`,
-    })
-
-    await this.s3Client.send(command)
+    }
+    const region = this.s3.config.region
 
-    const region = await this.s3Client.config.region()
+    await this.s3.copyObject(params).promise()
     return `https://${destinationBucket}.s3-${region}.amazonaws.com/${destinationKey}`
   }
 }
diff --git a/libs/infra-nest-server/src/lib/infra/health/health.logger.ts b/libs/infra-nest-server/src/lib/infra/health/health.logger.ts
new file mode 100644
index 000000000000..9867c2744034
--- /dev/null
+++ b/libs/infra-nest-server/src/lib/infra/health/health.logger.ts
@@ -0,0 +1,30 @@
+import { ConsoleLogger, Inject, Injectable, Scope } from '@nestjs/common'
+
+import { type Logger, LOGGER_PROVIDER } from '@island.is/logging'
+
+/**
+ * Creating a new logger used for health checks to use our winston
+ * wrapper and remove coloring of the default Terminus logger.
+ */
+
+@Injectable({ scope: Scope.TRANSIENT })
+export class HealthLogger extends ConsoleLogger {
+  constructor(
+    @Inject(LOGGER_PROVIDER)
+    private readonly logger: Logger,
+  ) {
+    super()
+  }
+
+  error(message: unknown, stack?: string, context?: string): void
+  error(message: unknown, ...optionalParams: unknown[]): void
+  error(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    message: any,
+    stack?: unknown,
+    context?: unknown,
+    ...rest: unknown[]
+  ): void {
+    this.logger.error(message, stack, context, ...rest)
+  }
+}
diff --git a/libs/infra-nest-server/src/lib/infra/health/health.module.ts b/libs/infra-nest-server/src/lib/infra/health/health.module.ts
index 7e171652d097..3b08dd39b081 100644
--- a/libs/infra-nest-server/src/lib/infra/health/health.module.ts
+++ b/libs/infra-nest-server/src/lib/infra/health/health.module.ts
@@ -1,8 +1,11 @@
 import { DynamicModule } from '@nestjs/common'
 import { TerminusModule } from '@nestjs/terminus'
 
+import { LoggingModule } from '@island.is/logging'
+
 import { HealthController } from './health.controller'
 import { HealthCheckOptions, HealthCheckOptionsProviderKey } from './types'
+import { HealthLogger } from './health.logger'
 
 const defaultOptions: HealthCheckOptions = {
   timeout: 1000,
@@ -22,8 +25,14 @@ export class HealthModule {
             ...options,
           } as HealthCheckOptions,
         },
+        HealthLogger,
+      ],
+      imports: [
+        TerminusModule.forRoot({
+          logger: HealthLogger,
+        }),
+        LoggingModule,
       ],
-      imports: [TerminusModule.forRoot()],
     }
   }
 }
diff --git a/libs/infra-nest-server/src/lib/processJob.ts b/libs/infra-nest-server/src/lib/processJob.ts
index 52b50fbcdd83..f91fa6ae3c98 100644
--- a/libs/infra-nest-server/src/lib/processJob.ts
+++ b/libs/infra-nest-server/src/lib/processJob.ts
@@ -1,7 +1,8 @@
 import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
 
 export const processJob = () =>
-  yargs(process.argv.slice(2))
+  yargs(hideBin(process.argv))
     .option('job', {
       string: true,
       choices: ['worker', 'server', 'cleanup'] as const,
diff --git a/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx b/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx
index cca83b057a70..984eb0c3ff2e 100644
--- a/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx
+++ b/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx
@@ -237,7 +237,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
     }
 
     return (
-      <Box marginTop={2}>
+      <Box marginTop={2} marginRight={5}>
         <ProgressMeter
           progress={
             Number(
diff --git a/libs/island-ui/core/src/lib/Input/Input.tsx b/libs/island-ui/core/src/lib/Input/Input.tsx
index efddbb660a2d..5f4bf2a59d55 100644
--- a/libs/island-ui/core/src/lib/Input/Input.tsx
+++ b/libs/island-ui/core/src/lib/Input/Input.tsx
@@ -41,6 +41,8 @@ export const Input = forwardRef(
       label,
       errorMessage = '',
       maxLength,
+      max,
+      min,
       hasError = Boolean(errorMessage),
       value,
       defaultValue,
@@ -226,6 +228,8 @@ export const Input = forwardRef(
               }}
               readOnly={readOnly}
               type={type}
+              max={max}
+              min={min}
               {...(ariaError as AriaError)}
               {...inputProps}
               {...(required && { 'aria-required': true })}
diff --git a/libs/island-ui/core/src/lib/Input/types.ts b/libs/island-ui/core/src/lib/Input/types.ts
index 6bc226e97bb6..0e9a78d9c404 100644
--- a/libs/island-ui/core/src/lib/Input/types.ts
+++ b/libs/island-ui/core/src/lib/Input/types.ts
@@ -24,6 +24,8 @@ export interface InputComponentProps {
   placeholder?: string
   autoFocus?: boolean
   maxLength?: number
+  max?: number | string
+  min?: number | string
   size?: keyof typeof styles.inputSize
   onFocus?: (
     event: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>,
@@ -79,6 +81,8 @@ export interface InputProps extends InputComponentProps {
   loading?: boolean
   icon?: InputIcon
   buttons?: InputButton[]
+  max?: number | string
+  min?: number | string
 }
 
 export interface AsideProps {
diff --git a/libs/island-ui/core/src/lib/RadioButton/RadioButton.css.ts b/libs/island-ui/core/src/lib/RadioButton/RadioButton.css.ts
index 0c27e6a3cf0b..6aac9fe66d26 100644
--- a/libs/island-ui/core/src/lib/RadioButton/RadioButton.css.ts
+++ b/libs/island-ui/core/src/lib/RadioButton/RadioButton.css.ts
@@ -35,6 +35,7 @@ export const label = style({
   display: 'flex',
   fontSize: theme.typography.baseFontSize,
   lineHeight: theme.typography.baseLineHeight,
+  width: '100%',
 })
 export const labelText = style({
   display: 'flex',
diff --git a/libs/judicial-system/consts/src/lib/consts.ts b/libs/judicial-system/consts/src/lib/consts.ts
index f889d30ef383..162b36cb1d1b 100644
--- a/libs/judicial-system/consts/src/lib/consts.ts
+++ b/libs/judicial-system/consts/src/lib/consts.ts
@@ -90,6 +90,7 @@ export const TIME_FORMAT = 'HH:mm'
 export const DEFENDER_CASES_ROUTE = '/verjandi/krofur'
 export const DEFENDER_ROUTE = '/verjandi/krafa'
 export const DEFENDER_INDICTMENT_ROUTE = '/verjandi/akaera'
+export const DEFENDER_ADD_FILES_ROUTE = '/verjandi/akaera/gogn'
 
 export const DEFENDER_APPEAL_ROUTE = '/verjandi/kaera'
 export const DEFENDER_APPEAL_FILES_ROUTE = '/verjandi/kaera/gogn'
@@ -189,6 +190,7 @@ export const INDICTMENTS_TRAFFIC_VIOLATION_ROUTE = '/akaera/akaera'
 export const INDICTMENTS_CASE_FILES_ROUTE = '/akaera/domskjol'
 export const INDICTMENTS_OVERVIEW_ROUTE = '/akaera/stadfesta'
 export const CLOSED_INDICTMENT_OVERVIEW_ROUTE = '/akaera/yfirlit'
+export const INDICTMENTS_ADD_FILES_ROUTE = '/akaera/gogn'
 //#endregion Prosecutor user routes
 
 //#region Admin user routes
diff --git a/libs/judicial-system/formatters/src/lib/formatters.ts b/libs/judicial-system/formatters/src/lib/formatters.ts
index fee74aa8d5fb..1c974929a9d4 100644
--- a/libs/judicial-system/formatters/src/lib/formatters.ts
+++ b/libs/judicial-system/formatters/src/lib/formatters.ts
@@ -76,6 +76,18 @@ export const formatNationalId = (nationalId?: string | null): string => {
   }
 }
 
+export const getInitials = (name?: string | null): string | undefined => {
+  if (!name?.trim()) return undefined
+
+  const names = name.trim().split(' ')
+  const initials =
+    names.length > 1
+      ? `${names[0][0]}${names[names.length - 1][0]}`
+      : names[0][0]
+
+  return initials.toUpperCase()
+}
+
 export const formatPhoneNumber = (phoneNumber?: string | null) => {
   if (!phoneNumber) {
     return
diff --git a/libs/judicial-system/types/src/index.ts b/libs/judicial-system/types/src/index.ts
index f3103257e18e..27dcae8b586d 100644
--- a/libs/judicial-system/types/src/index.ts
+++ b/libs/judicial-system/types/src/index.ts
@@ -1,6 +1,12 @@
 export { Feature } from './lib/feature'
 
-export { Gender, DefenderChoice, SubpoenaType } from './lib/defendant'
+export {
+  Gender,
+  DefenderChoice,
+  SubpoenaType,
+  DefendantPlea,
+  ServiceRequirement,
+} from './lib/defendant'
 export { InstitutionType } from './lib/institution'
 export { NotificationType } from './lib/notification'
 export type { Institution } from './lib/institution'
@@ -48,8 +54,6 @@ export {
   CaseAppealRulingDecision,
   CaseIndictmentRulingDecision,
   RequestSharedWithDefender,
-  DefendantPlea,
-  ServiceRequirement,
   SessionArrangements,
   indictmentCases,
   restrictionCases,
@@ -72,7 +76,6 @@ export {
   isRequestCaseState,
   isIndictmentCaseTransition,
   isRequestCaseTransition,
-  DistrictCourtLocation,
   CourtSessionType,
   courtSessionTypeNames,
 } from './lib/case'
@@ -82,7 +85,6 @@ export { getIndictmentVerdictAppealDeadline } from './lib/indictmentCase'
 export type {
   CrimeScene,
   CrimeSceneMap,
-  DistrictCourts,
   IndictmentSubtypeMap,
 } from './lib/case'
 
diff --git a/libs/judicial-system/types/src/lib/case.ts b/libs/judicial-system/types/src/lib/case.ts
index 8fc4d47a4f30..ff5dd9085aaf 100644
--- a/libs/judicial-system/types/src/lib/case.ts
+++ b/libs/judicial-system/types/src/lib/case.ts
@@ -132,50 +132,50 @@ export enum CaseAppealState {
 }
 
 export enum CaseTransition {
-  OPEN = 'OPEN',
+  ACCEPT = 'ACCEPT',
+  APPEAL = 'APPEAL',
+  ASK_FOR_CANCELLATION = 'ASK_FOR_CANCELLATION',
   ASK_FOR_CONFIRMATION = 'ASK_FOR_CONFIRMATION',
+  COMPLETE = 'COMPLETE',
+  COMPLETE_APPEAL = 'COMPLETE_APPEAL',
+  DELETE = 'DELETE',
   DENY_INDICTMENT = 'DENY_INDICTMENT',
-  SUBMIT = 'SUBMIT',
-  ASK_FOR_CANCELLATION = 'ASK_FOR_CANCELLATION',
+  DISMISS = 'DISMISS',
+  OPEN = 'OPEN',
   RECEIVE = 'RECEIVE',
-  RETURN_INDICTMENT = 'RETURN_INDICTMENT',
-  COMPLETE = 'COMPLETE',
-  ACCEPT = 'ACCEPT',
+  RECEIVE_APPEAL = 'RECEIVE_APPEAL',
   REJECT = 'REJECT',
-  DISMISS = 'DISMISS',
-  DELETE = 'DELETE',
   REOPEN = 'REOPEN',
-  APPEAL = 'APPEAL',
-  RECEIVE_APPEAL = 'RECEIVE_APPEAL',
-  COMPLETE_APPEAL = 'COMPLETE_APPEAL',
   REOPEN_APPEAL = 'REOPEN_APPEAL',
+  RETURN_INDICTMENT = 'RETURN_INDICTMENT',
+  SUBMIT = 'SUBMIT',
   WITHDRAW_APPEAL = 'WITHDRAW_APPEAL',
 }
 
 export enum IndictmentCaseTransition {
+  ASK_FOR_CANCELLATION = CaseTransition.ASK_FOR_CANCELLATION,
   ASK_FOR_CONFIRMATION = CaseTransition.ASK_FOR_CONFIRMATION,
+  COMPLETE = CaseTransition.COMPLETE,
+  DELETE = CaseTransition.DELETE,
   DENY_INDICTMENT = CaseTransition.DENY_INDICTMENT,
-  SUBMIT = CaseTransition.SUBMIT,
-  ASK_FOR_CANCELLATION = CaseTransition.ASK_FOR_CANCELLATION,
   RECEIVE = CaseTransition.RECEIVE,
   RETURN_INDICTMENT = CaseTransition.RETURN_INDICTMENT,
-  COMPLETE = CaseTransition.COMPLETE,
-  DELETE = CaseTransition.DELETE,
+  SUBMIT = CaseTransition.SUBMIT,
 }
 
 export enum RequestCaseTransition {
+  ACCEPT = CaseTransition.ACCEPT,
+  APPEAL = CaseTransition.APPEAL,
+  COMPLETE_APPEAL = CaseTransition.COMPLETE_APPEAL,
+  DELETE = CaseTransition.DELETE,
+  DISMISS = CaseTransition.DISMISS,
   OPEN = CaseTransition.OPEN,
-  SUBMIT = CaseTransition.SUBMIT,
   RECEIVE = CaseTransition.RECEIVE,
-  ACCEPT = CaseTransition.ACCEPT,
+  RECEIVE_APPEAL = CaseTransition.RECEIVE_APPEAL,
   REJECT = CaseTransition.REJECT,
-  DISMISS = CaseTransition.DISMISS,
-  DELETE = CaseTransition.DELETE,
   REOPEN = CaseTransition.REOPEN,
-  APPEAL = CaseTransition.APPEAL,
-  RECEIVE_APPEAL = CaseTransition.RECEIVE_APPEAL,
-  COMPLETE_APPEAL = CaseTransition.COMPLETE_APPEAL,
   REOPEN_APPEAL = CaseTransition.REOPEN_APPEAL,
+  SUBMIT = CaseTransition.SUBMIT,
   WITHDRAW_APPEAL = CaseTransition.WITHDRAW_APPEAL,
 }
 
@@ -262,18 +262,6 @@ export enum RequestSharedWithDefender {
   NOT_SHARED = 'NOT_SHARED',
 }
 
-export enum DefendantPlea {
-  GUILTY = 'GUILTY',
-  NOT_GUILTY = 'NOT_GUILTY',
-  NO_PLEA = 'NO_PLEA',
-}
-
-export enum ServiceRequirement {
-  REQUIRED = 'REQUIRED',
-  NOT_REQUIRED = 'NOT_REQUIRED',
-  NOT_APPLICABLE = 'NOT_APPLICABLE',
-}
-
 export enum CourtSessionType {
   MAIN_HEARING = 'MAIN_HEARING',
   OTHER = 'OTHER',
@@ -444,24 +432,3 @@ export const isRequestCaseTransition = (
     transition as RequestCaseTransition,
   )
 }
-
-export type DistrictCourts =
-  | 'Héraðsdómur Reykjavíkur'
-  | 'Héraðsdómur Reykjaness'
-  | 'Héraðsdómur Vesturlands'
-  | 'Héraðsdómur Vestfjarða'
-  | 'Héraðsdómur Norðurlands vestra'
-  | 'Héraðsdómur Norðurlands eystra'
-  | 'Héraðsdómur Austurlands'
-  | 'Héraðsdómur Suðurlands'
-
-export const DistrictCourtLocation: Record<DistrictCourts, string> = {
-  'Héraðsdómur Reykjavíkur': 'Dómhúsið við Lækjartorg, Reykjavík',
-  'Héraðsdómur Reykjaness': 'Fjarðargata 9, Hafnarfirði',
-  'Héraðsdómur Vesturlands': 'Bjarnarbraut 8, Borgarnesi',
-  'Héraðsdómur Vestfjarða': 'Hafnarstræti 9, Ísafirði',
-  'Héraðsdómur Norðurlands vestra': 'Skagfirðingabraut 21, Sauðárkróki',
-  'Héraðsdómur Norðurlands eystra': 'Hafnarstræti 107, 4. hæð, Akureyri',
-  'Héraðsdómur Austurlands': 'Lyngás 15, Egilsstöðum',
-  'Héraðsdómur Suðurlands': 'Austurvegur 4, Selfossi',
-}
diff --git a/libs/judicial-system/types/src/lib/defendant.ts b/libs/judicial-system/types/src/lib/defendant.ts
index d5c56068dd38..4be363ff2622 100644
--- a/libs/judicial-system/types/src/lib/defendant.ts
+++ b/libs/judicial-system/types/src/lib/defendant.ts
@@ -15,3 +15,15 @@ export enum SubpoenaType {
   ABSENCE = 'ABSENCE',
   ARREST = 'ARREST',
 }
+
+export enum DefendantPlea {
+  GUILTY = 'GUILTY',
+  NOT_GUILTY = 'NOT_GUILTY',
+  NO_PLEA = 'NO_PLEA',
+}
+
+export enum ServiceRequirement {
+  REQUIRED = 'REQUIRED',
+  NOT_REQUIRED = 'NOT_REQUIRED',
+  NOT_APPLICABLE = 'NOT_APPLICABLE',
+}
diff --git a/libs/judicial-system/types/src/lib/indictmentCase.spec.ts b/libs/judicial-system/types/src/lib/indictmentCase.spec.ts
index d7bb2e5c8ccd..f6391960f18f 100644
--- a/libs/judicial-system/types/src/lib/indictmentCase.spec.ts
+++ b/libs/judicial-system/types/src/lib/indictmentCase.spec.ts
@@ -9,10 +9,10 @@ describe('getIndictmentVerdictAppealDeadline', () => {
   it('should return undefined if any dates are undefined', () => {
     const result1 = getIndictmentVerdictAppealDeadline([
       undefined,
-      '2024-06-10T00:00:00Z',
+      new Date('2024-06-10T00:00:00Z'),
     ])
     const result2 = getIndictmentVerdictAppealDeadline([
-      '2024-06-10T00:00:00Z',
+      new Date('2024-06-10T00:00:00Z'),
       undefined,
     ])
     expect(result1).toBeUndefined()
@@ -21,22 +21,20 @@ describe('getIndictmentVerdictAppealDeadline', () => {
 
   it('should return the correct deadline', () => {
     const dates = [
-      '2024-06-01T00:00:00Z',
-      '2024-06-01T00:00:00Z',
-      '2024-06-01T00:00:00Z',
+      new Date('2024-06-01T00:00:00Z'),
+      new Date('2024-06-01T00:00:00Z'),
+      new Date('2024-06-01T00:00:00Z'),
     ]
     const result = getIndictmentVerdictAppealDeadline(dates)
-    const expectedDeadline = new Date('2024-06-01T00:00:00Z')
-    expectedDeadline.setDate(expectedDeadline.getDate() + 28)
+    const expectedDeadline = new Date('2024-06-29T00:00:00Z')
 
     expect(result).toStrictEqual(expectedDeadline)
   })
 
   it('should handle a single valid date', () => {
-    const dates = ['2024-07-15T00:00:00Z']
+    const dates = [new Date('2024-07-15T00:00:00Z')]
     const result = getIndictmentVerdictAppealDeadline(dates)
-    const expectedDeadline = new Date('2024-07-15T00:00:00Z')
-    expectedDeadline.setDate(expectedDeadline.getDate() + 28)
+    const expectedDeadline = new Date('2024-08-12T00:00:00Z')
 
     expect(result).toStrictEqual(expectedDeadline)
   })
diff --git a/libs/judicial-system/types/src/lib/indictmentCase.ts b/libs/judicial-system/types/src/lib/indictmentCase.ts
index 831936c26197..d4aea465da52 100644
--- a/libs/judicial-system/types/src/lib/indictmentCase.ts
+++ b/libs/judicial-system/types/src/lib/indictmentCase.ts
@@ -1,26 +1,20 @@
+const MILLISECONDS_TO_EXPIRY = 28 * 24 * 60 * 60 * 1000
+
 export const getIndictmentVerdictAppealDeadline = (
-  verdictViewDates?: (string | undefined)[],
+  verdictViewDates?: (Date | undefined)[],
 ): Date | undefined => {
   if (
-    !verdictViewDates?.length ||
-    !verdictViewDates.every((date) => date != null)
+    !verdictViewDates ||
+    verdictViewDates.length === 0 ||
+    verdictViewDates.some((date) => !date)
   ) {
     return undefined
   }
 
-  const viewDates = verdictViewDates.map((date) => new Date(date as string))
-
-  if (viewDates.length === 0) {
-    return undefined
-  }
-
-  const newestViewDate = viewDates.reduce(
-    (newest, current) => (current > newest ? current : newest),
+  const newestViewDate = verdictViewDates.reduce(
+    (newest: Date, current) => (current && current > newest ? current : newest),
     new Date(0),
   )
 
-  const expiryDate = new Date(newestViewDate.getTime())
-  expiryDate.setDate(newestViewDate.getDate() + 28)
-
-  return expiryDate
+  return new Date(newestViewDate.getTime() + MILLISECONDS_TO_EXPIRY)
 }
diff --git a/libs/judicial-system/types/src/lib/notification.ts b/libs/judicial-system/types/src/lib/notification.ts
index 5eff267962e5..afdf6ec82930 100644
--- a/libs/judicial-system/types/src/lib/notification.ts
+++ b/libs/judicial-system/types/src/lib/notification.ts
@@ -2,7 +2,7 @@ export enum NotificationType {
   HEADS_UP = 'HEADS_UP',
   READY_FOR_COURT = 'READY_FOR_COURT',
   RECEIVED_BY_COURT = 'RECEIVED_BY_COURT',
-  COURT_DATE = 'COURT_DATE', // TODO: Rename to ARRAIGNMENT_DATE at some point?
+  COURT_DATE = 'COURT_DATE',
   RULING = 'RULING',
   MODIFIED = 'MODIFIED',
   REVOKED = 'REVOKED',
diff --git a/libs/message-queue/src/lib/channel.spec.ts b/libs/message-queue/src/lib/channel.spec.ts
index e52980f5a93b..9f5e6528e6be 100644
--- a/libs/message-queue/src/lib/channel.spec.ts
+++ b/libs/message-queue/src/lib/channel.spec.ts
@@ -1,30 +1,17 @@
-import { logger } from '@island.is/logging'
 import Channel from './channel'
 
-const asyncMockFn = <T>(returnObject: T) =>
-  jest.fn(async (inputArguments: unknown): Promise<T> => {
-    logger.debug('Mock-replying', { inputArguments, returnObject })
-    return returnObject
-  })
+const mockReturn = (fn: jest.Func) => jest.fn().mockReturnValue({ promise: fn })
 
-const mockSend = <T>(sendMapping: { [key: string]: T }) =>
-  jest.fn(async (args): Promise<T> => {
-    const name = args.constructor.name
-    const returnObject = sendMapping[name]
-    logger.debug('Mock-sending', { args, name, returnObject })
-    // Call if returnObject is a function
-    if (typeof returnObject === 'function') {
-      return returnObject(args)
-    }
-    return returnObject
-  })
+const mockReturnPromise = (obj: object) =>
+  mockReturn(() => Promise.resolve(obj))
 
 describe('Channel', () => {
   describe('#declareExchange', () => {
     it('should call aws sdk and return topic arn', async () => {
       const topicArn = 'arn:123123123:exchange'
+      const mock = mockReturnPromise({ TopicArn: topicArn })
       const channel = new Channel(false)
-      channel.sns.send = asyncMockFn({ TopicArn: topicArn })
+      channel.sns.createTopic = mock
 
       const result = await channel.declareExchange({
         name: 'test-application-updates',
@@ -37,37 +24,33 @@ describe('Channel', () => {
   describe('#declareQueue', () => {
     it('should check if queue exists', async () => {
       const queueUrl = 'http://queue-url'
+      const getQueueUrlMock = mockReturnPromise({ QueueUrl: queueUrl })
+      const createQueueMock = jest.fn()
       const channel = new Channel(false)
-      const mockedSend = mockSend({
-        // Throw to be sure we're not creating the queue
-        CreateQueueCommand: jest.fn(async () => {
-          throw new Error('queue not found')
-        }),
-        GetQueueUrlCommand: { QueueUrl: queueUrl },
-      })
-      channel.sqs.send = mockedSend
+      channel.sqs.getQueueUrl = getQueueUrlMock
+      channel.sqs.createQueue = createQueueMock
 
-      const result = await channel.declareQueue({ name: 'my-queue' })
+      const result = await channel.declareQueue({ name: 'queue-name' })
 
-      expect(channel.sqs.send).toHaveBeenCalledTimes(1)
+      expect(channel.sqs.getQueueUrl).toHaveBeenCalled()
+      expect(channel.sqs.createQueue).not.toHaveBeenCalled()
       expect(result).toBe(queueUrl)
     })
 
     it('should create queue if it does not exists', async () => {
       const queueUrl = 'http://queue-url'
-      const channel = new Channel(false)
-      const mockedSend = mockSend({
-        CreateQueueCommand: { QueueUrl: queueUrl },
-        // Throw to be sure we're not fetching the newly created queue
-        GetQueueUrlCommand: jest.fn(async () => {
-          throw new Error('queue not found')
-        }),
+      const getQueueUrlMock = mockReturn(() => {
+        throw new Error('queue not found')
       })
-      channel.sqs.send = mockedSend
+      const createQueueMock = mockReturnPromise({ QueueUrl: queueUrl })
+      const channel = new Channel(false)
+      channel.sqs.getQueueUrl = getQueueUrlMock
+      channel.sqs.createQueue = createQueueMock
 
-      const result = await channel.declareQueue({ name: 'my-queue' })
+      const result = await channel.declareQueue({ name: 'queue-name' })
 
-      expect(channel.sqs.send).toHaveBeenCalled()
+      expect(channel.sqs.getQueueUrl).toHaveBeenCalled()
+      expect(channel.sqs.createQueue).toHaveBeenCalled()
       expect(result).toBe(queueUrl)
     })
   })
diff --git a/libs/message-queue/src/lib/channel.ts b/libs/message-queue/src/lib/channel.ts
index 21d4c2d27cef..763492d5cb52 100644
--- a/libs/message-queue/src/lib/channel.ts
+++ b/libs/message-queue/src/lib/channel.ts
@@ -1,64 +1,49 @@
-import {
-  SQSClient,
-  CreateQueueCommand,
-  GetQueueUrlCommand,
-  SetQueueAttributesCommand,
-  GetQueueAttributesCommand,
-  QueueAttributeName,
-} from '@aws-sdk/client-sqs'
-import {
-  CreateTopicCommand,
-  PublishCommand,
-  PublishCommandInput,
-  SetSubscriptionAttributesCommand,
-  SNSClient,
-  SubscribeCommand,
-} from '@aws-sdk/client-sns'
+import * as AWS from 'aws-sdk'
 import { Consumer } from 'sqs-consumer'
-import { Message } from '@aws-sdk/client-sqs'
+
 import { logger } from '@island.is/logging'
 
-const SNS_LOCALSTACK_ENDPOINT =
-  process.env.SNS_ENDPOINT ?? 'http://localhost:4566'
-const SQS_LOCALSTACK_ENDPOINT =
-  process.env.SQS_ENDPOINT ?? 'http://localhost:4566'
+AWS.config.update({ region: 'eu-west-1' })
+
+const SNS_LOCALSTACK_ENDPOINT = 'http://localhost:4575'
+const SQS_LOCALSTACK_ENDPOINT = 'http://localhost:4576'
 
 class Channel {
-  sns: SNSClient
-  sqs: SQSClient
+  sns: AWS.SNS
+  sqs: AWS.SQS
 
-  constructor(isProduction: boolean) {
-    this.sns = new SNSClient({
-      endpoint: isProduction ? undefined : SNS_LOCALSTACK_ENDPOINT,
+  constructor(production: boolean) {
+    this.sns = new AWS.SNS({
+      apiVersion: '2010-03-31',
+      endpoint: production ? undefined : SNS_LOCALSTACK_ENDPOINT,
     })
 
-    this.sqs = new SQSClient({
-      endpoint: isProduction ? undefined : SQS_LOCALSTACK_ENDPOINT,
+    this.sqs = new AWS.SQS({
+      apiVersion: '2012-11-05',
+      endpoint: production ? undefined : SQS_LOCALSTACK_ENDPOINT,
     })
   }
 
   async declareExchange({ name }: { name: string }) {
-    const cmd = new CreateTopicCommand({ Name: name })
-    const { TopicArn } = await this.sns.send(cmd)
-    logger.info(`Declared exchange`, { TopicArn })
+    const { TopicArn } = await this.sns.createTopic({ Name: name }).promise()
+    logger.info(`Declared exchange ${TopicArn}`)
     return TopicArn
   }
 
   async declareQueue({ name }: { name: string }) {
     const queueUrl = await this.getQueueUrl({ name })
     if (queueUrl) {
-      logger.info(`Declared queue`, { queueUrl })
+      logger.info(`Declared queue ${queueUrl}`)
       return queueUrl
     }
 
-    const command = new CreateQueueCommand({ QueueName: name })
-    const { QueueUrl } = await this.sqs.send(command)
+    const { QueueUrl } = await this.sqs
+      .createQueue({
+        QueueName: name,
+      })
+      .promise()
 
-    if (!QueueUrl) {
-      throw new Error(`Failed to create queue ${name}`)
-    }
-
-    logger.info(`Declared queue`, { QueueUrl })
+    logger.info(`Declared queue ${QueueUrl}`)
     return QueueUrl
   }
 
@@ -76,105 +61,100 @@ class Channel {
       attributes: ['QueueArn'],
     })
 
-    const command = new SetQueueAttributesCommand({
-      QueueUrl: queueId,
-      Attributes: {
-        RedrivePolicy: JSON.stringify({
-          deadLetterTargetArn: QueueArn,
-          maxReceiveCount: maxReceiveCount,
-        }),
-      },
-    })
-    await this.sqs.send(command)
-    logger.info(`Set dead letter queue`, {
-      deadLetterQueueId: dlQueueId,
-      queueId,
-    })
+    await this.sqs
+      .setQueueAttributes({
+        QueueUrl: queueId,
+        Attributes: {
+          RedrivePolicy: `{"deadLetterTargetArn": "${QueueArn}", "maxReceiveCount": ${maxReceiveCount}}`,
+        },
+      })
+      .promise()
+    logger.info(`Set queue ${dlQueueId} as dead letter queue for ${queueId}`)
   }
 
-  async bindQueue<K>({
+  async bindQueue<RoutingKey>({
     queueId,
     exchangeId,
     routingKeys = [],
   }: {
     queueId: string
     exchangeId: string
-    routingKeys?: K[]
+    routingKeys?: RoutingKey[]
   }) {
     const { QueueArn } = await this.getQueueAttributes({
       queueId,
       attributes: ['QueueArn'],
     })
 
-    const { SubscriptionArn } = await this.sns.send(
-      new SubscribeCommand({
+    const { SubscriptionArn } = await this.sns
+      .subscribe({
         Protocol: 'sqs',
         TopicArn: exchangeId,
         Endpoint: QueueArn,
-      }),
-    )
+      })
+      .promise()
     if (!SubscriptionArn) {
       throw new Error(`Unable to subscribe to SNS exchange ${exchangeId}`)
     }
 
     if (routingKeys.length > 0) {
-      await this.sns.send(
-        new SetSubscriptionAttributesCommand({
+      await this.sns
+        .setSubscriptionAttributes({
           SubscriptionArn,
           AttributeName: 'FilterPolicy',
           AttributeValue: `{"event_type": ["${routingKeys.join('", "')}"]}`,
-        }),
-      )
+        })
+        .promise()
     }
 
-    const setQueueAttributesCommand = new SetQueueAttributesCommand({
-      QueueUrl: queueId,
-      Attributes: {
-        Policy: JSON.stringify({
-          Statement: [
-            {
-              Effect: 'Allow',
-              Principal: '*',
-              Action: 'sqs:SendMessage',
-              Resource: QueueArn,
-              Condition: {
-                ArnEquals: {
-                  'aws:SourceArn': exchangeId,
-                },
-              },
-            },
-          ],
-        }),
-      },
-    })
-    await this.sqs.send(setQueueAttributesCommand)
+    await this.sqs
+      .setQueueAttributes({
+        QueueUrl: queueId,
+        Attributes: {
+          Policy: `{
+            "Statement": [{
+              "Effect": "Allow",
+              "Principal": "*",
+              "Action":"sqs:SendMessage",
+              "Resource": "${QueueArn}",
+              "Condition": {
+                "ArnEquals": {
+                  "aws:SourceArn": "${exchangeId}"
+                }
+              }
+            }]
+          }`,
+        },
+      })
+      .promise()
 
-    logger.info(`Bound queue to topic ${exchangeId}`, {
-      queueId,
-      exchangeId,
-      routingKeys,
-    })
+    logger.info(
+      `Bound queue ${queueId} to exchange ${exchangeId} with routingKeys: ${routingKeys.join(
+        ', ',
+      )}.`,
+    )
     return SubscriptionArn
   }
 
-  consume<M, K>({
+  consume<Message, RoutingKey>({
     queueId,
     messageHandler,
     errorHandler,
   }: {
     queueId: string
-    messageHandler: (message: M, routingKey: K) => Promise<void>
-    errorHandler?: (error: unknown) => void
+    messageHandler: (message: Message, routingKey: RoutingKey) => Promise<void>
+    errorHandler?: (error: any) => void // eslint-disable-line  @typescript-eslint/no-explicit-any
   }) {
     const parseMessage = (
-      sqsMessage: Message,
+      sqsMessage: AWS.SQS.Types.Message,
     ): {
-      message: M
-      routingKey: K
+      message: Message
+      routingKey: RoutingKey
     } => {
       if (!sqsMessage.Body) {
-        logger.error(`No Body found on sqs message!`, sqsMessage)
-        throw new Error(`No Body found on sqs message!`)
+        throw new Error(
+          `No Body found on sqs message ${JSON.stringify(sqsMessage)}`,
+        )
       }
       const parsedBody = JSON.parse(sqsMessage.Body)
       const { Message, MessageAttributes } = parsedBody
@@ -222,40 +202,40 @@ class Channel {
     return consumer
   }
 
-  async publish<M, K extends string>({
+  async publish<Message, RoutingKey extends string>({
     exchangeId,
     message,
     routingKey = undefined,
   }: {
     exchangeId: string
-    message: M
-    routingKey?: K
+    message: Message
+    routingKey?: RoutingKey
   }) {
-    const params: PublishCommandInput = {
+    const params: AWS.SNS.Types.PublishInput = {
       Message: JSON.stringify(message),
       TopicArn: exchangeId,
     }
     if (routingKey) {
       params['MessageAttributes'] = {
+        // eslint-disable-next-line
         event_type: {
           DataType: 'String',
           StringValue: routingKey,
         },
       }
     }
-    const { MessageId } = await this.sns.send(new PublishCommand(params))
-    logger.info(`Published message to topic ${exchangeId}`, {
-      messageId: MessageId,
-      topicArn: exchangeId,
-      routingKey,
-    })
+    const { MessageId } = await this.sns.publish(params).promise()
+    logger.info(
+      `Published message ${MessageId} to ${exchangeId} with routingKey ${routingKey}`,
+    )
     return MessageId
   }
 
   private async getQueueUrl({ name }: { name: string }) {
     try {
-      const command = new GetQueueUrlCommand({ QueueName: name })
-      const { QueueUrl } = await this.sqs.send(command)
+      const { QueueUrl } = await this.sqs
+        .getQueueUrl({ QueueName: name })
+        .promise()
       return QueueUrl
     } catch (err) {
       return undefined
@@ -267,13 +247,14 @@ class Channel {
     attributes,
   }: {
     queueId: string
-    attributes: QueueAttributeName[]
+    attributes: string[]
   }) {
-    const command = new GetQueueAttributesCommand({
-      QueueUrl: queueId,
-      AttributeNames: attributes,
-    })
-    const { Attributes } = await this.sqs.send(command)
+    const { Attributes } = await this.sqs
+      .getQueueAttributes({
+        QueueUrl: queueId,
+        AttributeNames: attributes,
+      })
+      .promise()
     if (!Attributes) {
       throw new Error(`Unable to get queue attributes for queue ${queueId}`)
     }
diff --git a/libs/message-queue/src/lib/nest/client.service.ts b/libs/message-queue/src/lib/nest/client.service.ts
index 80d0a7c1b68a..2807acb1a88f 100644
--- a/libs/message-queue/src/lib/nest/client.service.ts
+++ b/libs/message-queue/src/lib/nest/client.service.ts
@@ -12,9 +12,8 @@ import {
   SendMessageCommand,
   SetQueueAttributesCommand,
   Message,
-  QueueAttributeName,
 } from '@aws-sdk/client-sqs'
-import { AbortController } from '@smithy/abort-controller'
+import { AbortController } from '@aws-sdk/abort-controller'
 import { type Logger } from '@island.is/logging'
 
 @Injectable()
@@ -77,7 +76,7 @@ export class ClientService {
 
   async getQueueAttributes(
     url: string,
-    attributes: QueueAttributeName[],
+    attributes: string[],
   ): Promise<Record<string, string>> {
     const r = await this.client.send(
       new GetQueueAttributesCommand({
@@ -131,15 +130,12 @@ export class ClientService {
   async syncQueueAttributes(
     name: string,
     url: string,
-    attributes: Record<QueueAttributeName, string>,
+    attributes: Record<string, string>,
   ): Promise<void> {
-    const current = await this.getQueueAttributes(
-      url,
-      Object.keys(attributes) as QueueAttributeName[],
-    )
+    const current = await this.getQueueAttributes(url, Object.keys(attributes))
 
-    const areNotEqual = (k: QueueAttributeName) => attributes[k] !== current[k]
-    if ((Object.keys(attributes) as QueueAttributeName[]).some(areNotEqual)) {
+    const areNotEqual = (k: string) => attributes[k] !== current[k]
+    if (Object.keys(attributes).some(areNotEqual)) {
       this.logger.debug(`Updating "${name}" queue attributes`, attributes)
 
       await this.client.send(
@@ -154,8 +150,7 @@ export class ClientService {
   // Dispose of the client and abort any ongoing requests.
   dispose() {
     this.logger.debug('Aborting SQS requests')
-    // Causes error when running tests
-    // this.receiveMessagesAbortController.abort()
+    this.receiveMessagesAbortController.abort()
     this.logger.debug('Closing SQS client')
     this.client.destroy()
   }
diff --git a/libs/message-queue/src/lib/nest/queue.module.spec.ts b/libs/message-queue/src/lib/nest/queue.module.spec.ts
index 3c9d6a6f6a60..aa103c209d4a 100644
--- a/libs/message-queue/src/lib/nest/queue.module.spec.ts
+++ b/libs/message-queue/src/lib/nest/queue.module.spec.ts
@@ -48,8 +48,6 @@ describe('QueueModule', () => {
     app.get<QueueService>(getQueueServiceToken('test')).add({ the: 'message' })
     const worker = app.get(MockWorker)
     const start = Date.now()
-
-    // Wait until a message is received or 1 second has passed
     while (Date.now() - start < 1_000 && worker.received.length === 0) {
       await new Promise((r) => setTimeout(r, 10))
     }
diff --git a/libs/message-queue/src/lib/nest/queue.service.spec.ts b/libs/message-queue/src/lib/nest/queue.service.spec.ts
index 1166c1791f38..202f4f513a74 100644
--- a/libs/message-queue/src/lib/nest/queue.service.spec.ts
+++ b/libs/message-queue/src/lib/nest/queue.service.spec.ts
@@ -4,11 +4,9 @@ import { QueueService } from './queue.service'
 import { DAY, MINUTE } from './time'
 import { clientConfig, deleteQueues, makeQueueConfig } from './testHelpers'
 
-describe('QueueService', () => {
-  beforeEach(async () => {
-    await deleteQueues()
-  })
+beforeEach(deleteQueues)
 
+describe('QueueService', () => {
   it('creates queues on onApplicationBootstrap', async () => {
     const config = makeQueueConfig()
     const client = new ClientService(clientConfig, logger)
diff --git a/libs/message-queue/src/lib/nest/worker.service.ts b/libs/message-queue/src/lib/nest/worker.service.ts
index 8c3972407950..8a041f429a57 100644
--- a/libs/message-queue/src/lib/nest/worker.service.ts
+++ b/libs/message-queue/src/lib/nest/worker.service.ts
@@ -77,6 +77,7 @@ export class WorkerService implements OnModuleDestroy {
       `Processing ${messages.length} message${messages.length > 1 ? 's' : ''}`,
       {
         messageIds: messages.map((msg) => msg.MessageId),
+        institutions: messages.map((msg) => msg.Attributes?.institution),
       },
     )
 
@@ -88,10 +89,7 @@ export class WorkerService implements OnModuleDestroy {
           await messageHandler(JSON.parse(msg.Body ?? ''), job)
           return true
         } catch (e) {
-          this.logger.error('Worker exception', {
-            messageId: msg.MessageId,
-            error: e,
-          })
+          this.logger.error('Worker exception', e, { messageId: msg.MessageId })
           return false
         }
       }),
diff --git a/libs/nest/aws/src/lib/aws.service.ts b/libs/nest/aws/src/lib/aws.service.ts
index 86fcba42db3b..e6f81eb30345 100644
--- a/libs/nest/aws/src/lib/aws.service.ts
+++ b/libs/nest/aws/src/lib/aws.service.ts
@@ -1,64 +1,24 @@
 import { Injectable } from '@nestjs/common'
-import {
-  S3Client,
-  GetObjectCommand,
-  PutObjectCommand,
-  HeadObjectCommand,
-  DeleteObjectCommand,
-  GetObjectCommandOutput,
-} from '@aws-sdk/client-s3'
-import AmazonS3Uri from 'amazon-s3-uri'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
-
-const MINUTE = 60
-const HOUR = 60 * MINUTE
-export type Encoding = 'binary' | 'base64' | 'utf-8'
-
-interface GetFileOptions {
-  bucket?: string
-  fileName?: string
-  s3Uri?: string
-}
-
-interface GetEncodedFileOptions extends GetFileOptions {
-  encoding?: Encoding
-}
+import { S3 } from 'aws-sdk'
 
 @Injectable()
 export class AwsService {
-  s3Client: S3Client
+  s3: S3
 
   constructor() {
-    this.s3Client = new S3Client({})
+    this.s3 = new S3()
   }
 
-  async getFile(options: GetFileOptions): Promise<GetObjectCommandOutput> {
-    let { bucket, fileName } = options
-
-    if (options.s3Uri) {
-      const uri = AmazonS3Uri(options.s3Uri)
-      bucket = uri.bucket
-      fileName = uri.key
-    }
-
-    const command = new GetObjectCommand({
+  async getFile(
+    bucket: string,
+    fileName: string,
+  ): Promise<AWS.S3.GetObjectOutput> {
+    const downloadParams = {
       Bucket: bucket,
       Key: fileName,
-    })
-
-    return await this.s3Client.send(command)
-  }
-
-  async getFileEncoded(
-    options: GetEncodedFileOptions,
-  ): Promise<string | undefined> {
-    const encoding = options.encoding || 'base64'
-    const out = await this.getFile(options)
-    return out.Body?.transformToString(encoding)
-  }
+    }
 
-  async getFileBase64(options: GetFileOptions): Promise<string | undefined> {
-    return await this.getFileEncoded({ ...options, encoding: 'base64' })
+    return await this.s3.getObject(downloadParams).promise()
   }
 
   async uploadFile(
@@ -71,54 +31,44 @@ export class AwsService {
       ContentEncoding?: string
     },
   ): Promise<string> {
-    const command = new PutObjectCommand({
+    const uploadParams = {
       Bucket: bucket,
       Key: fileName,
       Body: content,
       ...uploadParameters,
-    })
+    }
 
-    await this.s3Client.send(command)
-    return `https://${bucket}.s3.amazonaws.com/${fileName}`
+    const { Location: url } = await this.s3.upload(uploadParams).promise()
+    return url
   }
 
-  async getPresignedUrl(
-    bucket: string,
-    fileName: string,
-    TTL = 2 * HOUR, // TODO: Select length for presigned url's in island.is
-  ): Promise<string> {
-    const command = new GetObjectCommand({
+  async getPresignedUrl(bucket: string, fileName: string): Promise<string> {
+    const oneMinute = 60
+    const presignedUrlParams = {
       Bucket: bucket,
       Key: fileName,
-    })
+      Expires: oneMinute * 120, // TODO: Select length for presigned url's in island.is
+    }
 
-    return await getSignedUrl(this.s3Client, command, {
-      expiresIn: TTL,
-    })
+    return await this.s3.getSignedUrlPromise('getObject', presignedUrlParams)
   }
 
   public async fileExists(bucket: string, fileName: string): Promise<boolean> {
-    const command = new HeadObjectCommand({
-      Bucket: bucket,
-      Key: fileName,
-    })
-
-    return await this.s3Client
-      .send(command)
-      .then(() => true)
-      .catch((error) => {
-        if (error.name === 'NotFound') {
-          return false
-        }
-        throw error
-      })
+    return await this.s3
+      .headObject({ Bucket: bucket, Key: fileName })
+      .promise()
+      .then(
+        () => true,
+        () => false,
+      )
   }
 
   public async deleteObject(bucket: string, key: string) {
-    const command = new DeleteObjectCommand({
-      Bucket: bucket,
-      Key: key,
-    })
-    return await this.s3Client.send(command)
+    await this.s3
+      .deleteObject({
+        Bucket: bucket,
+        Key: key,
+      })
+      .promise()
   }
 }
diff --git a/libs/nest/graphql/README.md b/libs/nest/graphql/README.md
index 9e3f5f4483fc..139d074c84f6 100644
--- a/libs/nest/graphql/README.md
+++ b/libs/nest/graphql/README.md
@@ -53,6 +53,10 @@ export class Article {
 }
 ```
 
+### 🚀 How to Verify Caching Setup
+
+**Check Cache-Control Headers**: When making a GraphQL query, inspect the HTTP response headers to ensure that the `Cache-Control` header is present. This header dictates how and for how long the response should be cached.
+
 Please read Apollo's documentation on [server-side caching](https://www.apollographql.com/docs/apollo-server/performance/caching/) to understand how caching works.
 
 ## Running unit tests
diff --git a/libs/nova-sms/src/lib/sms.service.ts b/libs/nova-sms/src/lib/sms.service.ts
index e72b058c3cfa..1a3f744b6847 100644
--- a/libs/nova-sms/src/lib/sms.service.ts
+++ b/libs/nova-sms/src/lib/sms.service.ts
@@ -9,7 +9,7 @@ import { type ConfigType } from '@island.is/nest/config'
 
 import { smsModuleConfig } from './sms.config'
 
-export interface NovaResponse {
+interface NovaResponse {
   Code: number
   Message: string
 }
diff --git a/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx b/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx
index 333df35ec545..7b20d6e862b4 100644
--- a/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx
+++ b/libs/portals/admin/regulations-admin/src/components/EditBasics.tsx
@@ -7,6 +7,7 @@ import {
   Text,
   Button,
   AlertMessage,
+  AlertBanner,
 } from '@island.is/island-ui/core'
 import { EditorInput } from './EditorInput'
 import { editorMsgs as msg, errorMsgs } from '../lib/messages'
@@ -161,6 +162,13 @@ export const EditBasics = () => {
             label={t(msg.text)}
             startExpanded={startTextExpanded}
           >
+            <Box marginBottom={3}>
+              <AlertBanner
+                description={t(msg.diffPrecisionWarning)}
+                variant="info"
+                dismissable
+              />
+            </Box>
             <Box marginBottom={3}>
               <EditorInput
                 key={editorKey} // Force re-render of TinyMCE
diff --git a/libs/portals/admin/regulations-admin/src/components/EditorInput.tsx b/libs/portals/admin/regulations-admin/src/components/EditorInput.tsx
index d818b05940cf..23d8021de22a 100644
--- a/libs/portals/admin/regulations-admin/src/components/EditorInput.tsx
+++ b/libs/portals/admin/regulations-admin/src/components/EditorInput.tsx
@@ -2,7 +2,7 @@ import * as s from './EditorInput.css'
 import { classes } from './Editor.css'
 
 import { useRef, useState } from 'react'
-import { Box } from '@island.is/island-ui/core'
+import { Box, LoadingDots } from '@island.is/island-ui/core'
 import {
   Editor as RegulationsEditor,
   EditorProps,
@@ -10,8 +10,10 @@ import {
 import cn from 'classnames'
 import { HTMLText, useDomid } from '@island.is/regulations'
 import { RegulationDraftId } from '@island.is/regulations/admin'
+import { editorMsgs as msg } from '../lib/messages'
 import { useFileUploader } from '../utils/fileUploader'
 import { fileUrl } from '../utils/dataHooks'
+import { useLocale } from '@island.is/localization'
 
 const KB = 1024
 
@@ -44,6 +46,7 @@ export const EditorInput = (props: EditorInputProps) => {
     ...editorProps
   } = props
 
+  const t = useLocale().formatMessage
   const valueRef = useRef(() => value)
   const [hasFocus, setHasFocus] = useState(false)
   const domid = useDomid()
@@ -82,6 +85,19 @@ export const EditorInput = (props: EditorInputProps) => {
           fileUploader={fileUploader()}
           baseText={baseText}
           uploadUrl={`${fileUrl}/admin-drafts/files/${props.draftId}`}
+          documentLoaderElement={
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              padding={1}
+            >
+              <Box display="inlineBlock" marginRight={3}>
+                {t(msg.uploadingWordDocument)}
+              </Box>
+              <LoadingDots />
+            </Box>
+          }
           onFocus={() => {
             setHasFocus(true)
           }}
diff --git a/libs/portals/admin/regulations-admin/src/lib/messages.ts b/libs/portals/admin/regulations-admin/src/lib/messages.ts
index a0e9585ad88d..5b41c6c6b044 100644
--- a/libs/portals/admin/regulations-admin/src/lib/messages.ts
+++ b/libs/portals/admin/regulations-admin/src/lib/messages.ts
@@ -341,6 +341,15 @@ export const editorMsgs = defineMessages({
     id: 'ap.regulations-admin:draft-label-deleteConfirmation',
     defaultMessage: 'Ertu alveg viss um að þú viljir eyða ',
   },
+  uploadingWordDocument: {
+    id: 'ap.regulations-admin:uploading-word-document',
+    defaultMessage: 'Hleð inn Word skjali',
+  },
+  diffPrecisionWarning: {
+    id: 'ap.regulations-admin:diff-precision-warning',
+    defaultMessage:
+      'Vakin er athygli á því að kerfið útbýr tillögu að breytingareglugerð sem starfsmaður þarf að rýna gaumgæfilega áður en haldið er áfram. Ekki er öruggt að inngangsliðir og efnisákvæði færist réttilega inn í breytingareglugerðina.',
+  },
 })
 
 export const impactMsgs = defineMessages({
diff --git a/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts b/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts
index ef46746b7e53..c4559ddaf114 100644
--- a/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts
+++ b/libs/portals/admin/regulations-admin/src/utils/fileUploader.ts
@@ -1,43 +1,62 @@
 import { EditorFileUploader } from '@island.is/regulations-tools/Editor'
 import { RegulationDraftId } from '@island.is/regulations/admin'
-import { useS3Upload } from './dataHooks'
+import { fileUrl, useS3Upload } from './dataHooks'
+import { isRunningOnEnvironment } from '@island.is/shared/utils'
 
 export function useFileUploader(draftId: RegulationDraftId) {
   const { createPresignedPost, createFormData } = useS3Upload()
 
+  const isDevelopment =
+    isRunningOnEnvironment('dev') || isRunningOnEnvironment('local')
+
   const fileUploader =
     (): EditorFileUploader => async (blobInfo, success, failure, progress) => {
-      const presignedPost = await createPresignedPost(
-        blobInfo.filename(),
-        draftId,
-      )
+      try {
+        const presignedPost = await createPresignedPost(
+          blobInfo.filename(),
+          draftId,
+        )
 
-      const blob = blobInfo.blob()
-      const formData = createFormData(presignedPost, blob as File)
+        if (!presignedPost) {
+          throw new Error('Failed to create presigned post')
+        }
 
-      const request = new XMLHttpRequest()
-      request.withCredentials = true
-      request.responseType = 'json'
+        const blob = blobInfo.blob()
 
-      request.upload.addEventListener('progress', (evt) => {
-        if (evt.lengthComputable) {
-          progress && progress((evt.loaded / evt.total) * 100)
-        }
-      })
+        const request = new XMLHttpRequest()
+        request.withCredentials = true
+        request.responseType = 'json'
 
-      request.upload.addEventListener('error', () => {
-        failure(`Upload errored out. ${request.statusText}`)
-      })
+        request.upload.addEventListener('progress', (evt) => {
+          if (evt.lengthComputable) {
+            progress && progress((evt.loaded / evt.total) * 100)
+          }
+        })
 
-      request.addEventListener('load', () => {
-        if (request.status >= 200 && request.status < 300) {
-          success(`https://files.reglugerd.is/${presignedPost.fields['key']}`)
-        } else {
-          failure(`Upload failed. ${request.statusText}`)
-        }
-      })
-      request.open('POST', presignedPost.url, true)
-      request.send(formData)
+        request.upload.addEventListener('error', () => {
+          failure(`Upload errored out. ${request.statusText}`)
+        })
+
+        request.addEventListener('load', () => {
+          if (request.status >= 200 && request.status < 300 && presignedPost) {
+            success(`${fileUrl}/${presignedPost?.fields?.['key']}`)
+          } else {
+            failure(`Upload failed. ${request.statusText}`)
+          }
+        })
+
+        // Create FormData and send the request
+        const formData = createFormData(presignedPost, blob as File)
+        request.open(
+          'POST',
+          `${isDevelopment ? presignedPost?.url : fileUrl + '/'}`,
+          true,
+        )
+        request.send(formData)
+      } catch (error) {
+        console.error('Error during upload:', error)
+        failure('Failed to upload file. Please try again.')
+      }
     }
   return fileUploader
 }
diff --git a/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts b/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts
index 8c95b81fe1be..d4cccd26ac03 100644
--- a/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts
+++ b/libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts
@@ -16,6 +16,19 @@ const removeRegPrefix = (title: string) => {
   return title
 }
 
+const moveMatchingStringsToEnd = (arr: Array<string>) => {
+  const isGildisTaka = (str: string) => {
+    return /(öðlast|tekur).*gildi|sett.*með.*(?:heimild|stoð)/.test(
+      (str || '').toLowerCase(),
+    )
+  }
+
+  const matchingStrings = arr.filter((str) => isGildisTaka(str))
+  const nonMatchingStrings = arr.filter((str) => !isGildisTaka(str))
+
+  return [...nonMatchingStrings, ...matchingStrings]
+}
+
 const removeRegNamePrefix = (name: string) => {
   if (/^0+/.test(name)) {
     return name.replace(/^0+/, '')
@@ -71,7 +84,7 @@ export const formatAmendingRegBody = (
       '',
     )}fellur brott.</p>` as HTMLText
     const gildistaka =
-      `<p>Reglugerð þessi er sett með heimild í [].</p><p>Reglugerðin öðlast þegar gildi</p>` as HTMLText
+      `<p>Reglugerð þessi er sett með heimild í [].</p><p>Reglugerðin öðlast þegar gildi.</p>` as HTMLText
     return [text, gildistaka]
   }
 
@@ -106,7 +119,7 @@ export const formatAmendingRegBody = (
 
     const regNameDisplay =
       regName && regName !== 'self'
-        ? `reglugerðar nr. ${regName}`
+        ? `reglugerðar nr. ${regName}`.replace(/\.$/, '')
         : 'reglugerðarinnar'
 
     group.forEach((element) => {
@@ -211,7 +224,7 @@ export const formatAmendingRegBody = (
                 ? (`<p>Á eftir ${
                     paragraph - 1
                   }. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein sem orðast svo:</p><p>${newText}</p>` as HTMLText)
-                : (`<p>1. mgr. ${articleTitle} ${regNameDisplay} orðast svo:</p><p>${newText}</p>` as HTMLText)
+                : (`<p>Á undan 1. mgr. ${articleTitle} ${regNameDisplay} kemur ný málsgrein svohljóðandi: </p><p>${newText}</p>` as HTMLText)
           } else if (isArticleTitle) {
             // Title was added
             testGroup.original?.push(`<p>${newText}</p>` as HTMLText)
@@ -256,7 +269,7 @@ export const formatAmendingRegBody = (
           } else if (isLetterList || isNumberList) {
             // List was changed
             pushHtml =
-              `<p>${paragraph}. mgr. ${articleTitle} ${regNameDisplay} breytist:</p> ${liHtml}` as HTMLText
+              `<p>Eftirfarandi breytingar verða á ${paragraph}. mgr. ${articleTitle} ${regNameDisplay}:</p> ${liHtml}` as HTMLText
           } else {
             // We don't know what you changed, but there was a change, and here's the changelog:
             pushHtml =
@@ -290,10 +303,22 @@ export const formatAmendingRegBody = (
       const originalTextArray = testGroup.original?.length
         ? flatten(testGroup.original)
         : []
+
+      const prevArticleTitleNumber = prevArticleTitle.match(/^\d+\. gr\./)
+
+      let articleDisplayText = ''
+
+      if (originalTextArray.length > 1) {
+        const [, ...rest] = originalTextArray
+        articleDisplayText = rest.join('')
+      } else {
+        articleDisplayText = testGroup.original
+          ? testGroup.original?.join('')
+          : ''
+      }
+
       additionArray.push([
-        `<p>Á eftir ${prevArticleTitle} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi: ${
-          originalTextArray ? testGroup.original?.join('') : ''
-        }` as HTMLText,
+        `<p>Á eftir ${prevArticleTitleNumber} ${regNameDisplay} kemur ný grein, ${articleTitleNumber}, ásamt fyrirsögn, svohljóðandi:</p> ${articleDisplayText}` as HTMLText,
       ])
     } else {
       additionArray.push(testGroup.arr)
@@ -325,7 +350,9 @@ export const formatAmendingBodyWithArticlePrefix = (
 
   const additions = flatten(impactAdditionArray)
 
-  const prependString = additions.map(
+  const returnArray = moveMatchingStringsToEnd(additions)
+
+  const prependString = returnArray.map(
     (item, i) =>
       `<h3 class="article__title">${i + 1}. gr.</h3>${item}` as HTMLText,
   )
diff --git a/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts b/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts
index 77507793b1b8..e515bec25e63 100644
--- a/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts
+++ b/libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts
@@ -73,26 +73,27 @@ export const formatListItemDiff = (item: Element) => {
       const isLiDeleted = newLiText === '' || newLiText === null
       const isLiAddition = oldLiText === '' || oldLiText === null
 
-      const liLidur = isStaflidur ? 'stafliður' : 'töluliður'
-      const liLidurShortened = isStaflidur ? 'stafl.' : 'tölul.'
+      const liLidur = isStaflidur ? '-liður' : 'töluliður'
+      const liLidurPassive = isStaflidur ? '-lið' : '. tölulið'
+      const liLidurShortened = isStaflidur ? '-liður' : '. tölul.'
 
       const lidurLabel = liItemHtml === '' ? liLidur.toLowerCase() : liLidur
 
       if (isLiDeleted) {
         liItemHtml = (liItemHtml +
-          `${getLiPoint(
-            lidur,
-            isStaflidur,
-          )}. ${lidurLabel} fellur brott og breytist númer annarra liða til samræmis.`) as HTMLText
+          `${getLiPoint(lidur, isStaflidur)}${
+            isStaflidur ? lidurLabel : '. ' + lidurLabel
+          } fellur brott og breytist númer annarra liða til samræmis.`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)
         liItemHtml = '' as HTMLText
       } else if (isLiAddition) {
         liItemHtml = (liItemHtml +
-          `Á eftir ${getLiPoint(lidur - 1, isStaflidur)}. ${
-            isStaflidur ? 'staflið' : 'tölulið'
-          } kemur nýr liður svohljóðandi, og breytist númer annarra lið til samræmis: ${newLiText}`) as HTMLText
+          `Á eftir ${getLiPoint(
+            lidur - 1,
+            isStaflidur,
+          )}${liLidurPassive} kemur nýr liður svohljóðandi, og breytist númer annarra lið til samræmis: ${newLiText}`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)
@@ -102,7 +103,7 @@ export const formatListItemDiff = (item: Element) => {
           `${getLiPoint(
             lidur,
             isStaflidur,
-          )}. ${liLidurShortened} orðast svo: ${newLiText}`) as HTMLText
+          )}${liLidurShortened} orðast svo: ${newLiText}`) as HTMLText
 
         // Finish up:
         returningArray.push(liItemHtml)
@@ -155,7 +156,7 @@ export const getDeletionOrAddition = (
 
       // Remove gr number if there is some more text within the title
       const modContent = modifiedTextContent ?? ''
-      const match = modContent.match(/^\d+\.\s*gr\.$/)
+      const match = modContent.match(/^\d+\.\s*gr\.\s*(<br\s*\/?>)?$/)
       if (match) {
         // If the string matches the pattern for "{num}. gr.", return it as is
         newText = modContent
diff --git a/libs/service-portal/applications/src/lib/messages.ts b/libs/service-portal/applications/src/lib/messages.ts
index 04a0dc997c1d..7d8d29c3434c 100644
--- a/libs/service-portal/applications/src/lib/messages.ts
+++ b/libs/service-portal/applications/src/lib/messages.ts
@@ -115,4 +115,9 @@ export const m = defineMessages({
     description:
       'Error message when no completed applications are found in the overview for national id',
   },
+  defaultInstitutionLabel: {
+    id: 'application.system:default-institution-label',
+    defaultMessage: 'Allar stofnanir',
+    description: 'Default institution filter label',
+  },
 })
diff --git a/libs/service-portal/applications/src/screens/Overview.tsx b/libs/service-portal/applications/src/screens/Overview.tsx
index ff5f86b486e8..768efd048b59 100644
--- a/libs/service-portal/applications/src/screens/Overview.tsx
+++ b/libs/service-portal/applications/src/screens/Overview.tsx
@@ -36,7 +36,7 @@ import { Application } from '@island.is/application/types'
 import { Problem } from '@island.is/react-spa/shared'
 
 const defaultInstitution: InstitutionOption = {
-  label: 'Allar stofnanir',
+  label: '',
   value: '',
 }
 
@@ -48,13 +48,21 @@ const defaultFilterValues: FilterValues = {
 const Overview = () => {
   useNamespaces('sp.applications')
   useNamespaces('application.system')
-  const { formatMessage } = useLocale()
+  const { formatMessage, locale } = useLocale()
   const { data: applications, loading, error, refetch } = useApplications()
   const location = useLocation()
   const statusToShow = mapLinkToStatus(location.pathname)
   let focusedApplication: Application | undefined
 
-  const { data: orgData, loading: loadingOrg } = useGetOrganizationsQuery()
+  const { data: orgData, loading: loadingOrg } = useGetOrganizationsQuery({
+    variables: {
+      input: {
+        lang: locale,
+      },
+    },
+  })
+
+  defaultInstitution.label = formatMessage(m.defaultInstitutionLabel)
 
   const [filterValue, setFilterValue] =
     useState<FilterValues>(defaultFilterValues)
diff --git a/libs/service-portal/applications/src/shared/utils/index.ts b/libs/service-portal/applications/src/shared/utils/index.ts
index 14af365abd0f..264dad610211 100644
--- a/libs/service-portal/applications/src/shared/utils/index.ts
+++ b/libs/service-portal/applications/src/shared/utils/index.ts
@@ -52,9 +52,11 @@ export const sortApplicationsOrganizations = (
   }
   apps.forEach((elem) => {
     const inst = institutionMapper[elem.typeId].slug ?? 'INSTITUTION_MISSING'
+    const contentfulId =
+      institutionMapper[elem.typeId].contentfulId ?? 'INSTITUTION_MISSING'
     institutions.push({
       value: inst,
-      label: organizations.find((x) => x.slug === inst)?.title ?? inst,
+      label: organizations.find((x) => x.id === contentfulId)?.title ?? inst,
     })
   })
   // Remove duplicates
diff --git a/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx b/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx
index 51bca935673d..1ade3d2b929d 100644
--- a/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx
+++ b/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx
@@ -224,7 +224,7 @@ const VehicleDetail = () => {
                           : ''
                       }
                       icon="pencil"
-                      variant="button"
+                      variant="utility"
                       text={formatMessage(messages.vehicleMileageInputTitle)}
                     />
                   </Box>
diff --git a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql b/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql
index 50425378a3e9..aedda4a840c6 100644
--- a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql
+++ b/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql
@@ -20,6 +20,7 @@ query GetWorkMachineById($input: WorkMachinesInput!) {
     importer
     insurer
     licensePlateNumber
+    dateLastInspection
     links {
       href
       rel
diff --git a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx b/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx
index 4511dad4d3f4..6498ad16edac 100644
--- a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx
+++ b/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx
@@ -5,21 +5,19 @@ import { useGetWorkMachineByIdQuery } from './WorkMachinesDetail.generated'
 import {
   IntroHeader,
   TableGrid,
-  UserInfoLine,
+  InfoLine,
   formatDate,
   m,
   VINNUEFTIRLITID_SLUG,
+  InfoLineStack,
 } from '@island.is/service-portal/core'
 import { messages, vehicleMessage } from '../../lib/messages'
 import {
   Box,
   Button,
-  Divider,
   GridColumn,
   GridRow,
   Inline,
-  Stack,
-  Text,
   IconMapIcon,
   Link,
 } from '@island.is/island-ui/core'
@@ -154,47 +152,45 @@ const WorkMachinesDetail = () => {
             </GridColumn>
           </GridRow>
           <Box marginBottom={[2, 2, 6]}>
-            <Stack space={2}>
-              <Text variant="eyebrow" color="purple400">
-                {formatMessage(messages.baseInfoWorkMachineTitle)}
-              </Text>
-              <UserInfoLine
+            <InfoLineStack
+              label={formatMessage(messages.baseInfoWorkMachineTitle)}
+            >
+              <InfoLine
                 label={labels.registrationNumber ?? ''}
                 content={workMachine?.registrationNumber ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.type ?? ''}
                 content={workMachine?.type ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.category ?? ''}
                 content={workMachine?.category ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.subCategory ?? ''}
                 content={workMachine?.subCategory ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
+                label={labels.dateLastInspection ?? ''}
+                content={formatDate(workMachine?.dateLastInspection ?? '')}
+                loading={loading}
+              />
+              <InfoLine
                 label={labels.registrationDate ?? ''}
                 content={formatDate(workMachine?.registrationDate ?? '')}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.status ?? ''}
                 content={workMachine?.status ?? ''}
                 loading={loading}
               />
-              <Divider />
-            </Stack>
+            </InfoLineStack>
           </Box>
           <Box marginBottom={[2, 2, 6]}>
             <TableGrid
@@ -268,64 +264,52 @@ const WorkMachinesDetail = () => {
             />
           </Box>
           <Box marginBottom={[2, 2, 6]}>
-            <Stack space={2}>
-              <UserInfoLine
-                title={formatMessage(m.owner)}
+            <InfoLineStack label={formatMessage(m.owner)}>
+              <InfoLine
                 label={labels.ownerName}
                 content={workMachine?.ownerName ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.ownerNationalId}
                 content={format(workMachine?.ownerNationalId ?? '')}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.ownerAddress}
                 content={workMachine?.ownerAddress ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.ownerPostcode}
                 content={workMachine?.ownerPostcode ?? ''}
                 loading={loading}
               />
-              <Divider />
-            </Stack>
+            </InfoLineStack>
           </Box>
           <Box marginBottom={[2, 2, 6]}>
-            <Stack space={2}>
-              <Text variant="eyebrow" color="purple400">
-                {formatMessage(vehicleMessage.operator)}
-              </Text>
-              <UserInfoLine
+            <InfoLineStack label={formatMessage(vehicleMessage.operator)}>
+              <InfoLine
                 label={labels.supervisorName}
                 content={workMachine?.supervisorName ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.supervisorNationalId}
                 content={format(workMachine?.supervisorNationalId ?? '')}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.supervisorAddress}
                 content={workMachine?.supervisorAddress ?? ''}
                 loading={loading}
               />
-              <Divider />
-              <UserInfoLine
+              <InfoLine
                 label={labels.supervisorPostcode}
                 content={workMachine?.supervisorPostcode ?? ''}
                 loading={loading}
               />
-              <Divider />
-            </Stack>
+            </InfoLineStack>
           </Box>
         </>
       )}
diff --git a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql b/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql
index 704fdb14cc48..8b585785457f 100644
--- a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql
+++ b/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql
@@ -5,6 +5,7 @@ query GetWorkMachines($input: WorkMachinesCollectionInput) {
       registrationNumber
       type
       status
+      dateLastInspection
     }
     links {
       rel
diff --git a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx b/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx
index 13fea50e1a49..2d836c948f19 100644
--- a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx
+++ b/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx
@@ -13,6 +13,7 @@ import {
   Filter,
   FootNote,
   VINNUEFTIRLITID_SLUG,
+  formatDate,
 } from '@island.is/service-portal/core'
 import {
   Box,
@@ -26,9 +27,9 @@ import {
   Pagination,
   Text,
 } from '@island.is/island-ui/core'
-import { messages } from '../../lib/messages'
+import { messages, vehicleMessage } from '../../lib/messages'
 import { useDebounce } from 'react-use'
-import { WorkMachinesFileType } from '@island.is/api/schema'
+import { WorkMachine, WorkMachinesFileType } from '@island.is/api/schema'
 import { AssetsPaths } from '../../lib/paths'
 import { Problem } from '@island.is/react-spa/shared'
 
@@ -123,6 +124,23 @@ const WorkMachinesOverview = () => {
       },
     })
   }
+  const generateCardText = (wm: WorkMachine): string | undefined => {
+    let text = wm.registrationNumber ?? undefined
+    const inspectionText = wm.dateLastInspection
+      ? `${formatMessage(vehicleMessage.lastInspection)}: ${formatDate(
+          wm.dateLastInspection,
+        )}`
+      : undefined
+
+    if (wm.dateLastInspection) {
+      text = wm.registrationNumber
+        ? `${text}, ${inspectionText}`
+        : inspectionText
+    }
+
+    return text
+  }
+
   return (
     <Box marginBottom={[6, 6, 10]}>
       <IntroHeader
@@ -255,7 +273,7 @@ const WorkMachinesOverview = () => {
           return (
             <Box marginBottom={3} key={index}>
               <ActionCard
-                text={wm.registrationNumber ?? ''}
+                text={generateCardText(wm)}
                 heading={wm.type ?? ''}
                 cta={{
                   label: formatMessage(m.seeDetails),
diff --git a/libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts b/libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts
index d0d34731a85c..60d0f6da36a2 100644
--- a/libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts
+++ b/libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts
@@ -8,7 +8,7 @@ export const downloadVehicleOwnedFile = async (
   header: Array<Array<string>>,
   data: Array<Array<any>>,
 ) => {
-  const getFile = (_name: string, output: string | undefined) => {
+  const getFile = (name: string, output: string | undefined) => {
     const uri =
       'data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64,'
     const encodedUri = encodeURI(`${uri}${output}`)
diff --git a/libs/service-portal/core/src/components/ActionCard/ActionCard.tsx b/libs/service-portal/core/src/components/ActionCard/ActionCard.tsx
index 064cea0afa70..29c012e7cd48 100644
--- a/libs/service-portal/core/src/components/ActionCard/ActionCard.tsx
+++ b/libs/service-portal/core/src/components/ActionCard/ActionCard.tsx
@@ -279,11 +279,11 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
                     icon={isExternalLink(cta.url) ? 'open' : cta.icon}
                     colorScheme="default"
                     iconType="outline"
-                    size="small"
+                    size={cta.size ?? 'small'}
                     type="span"
                     unfocusable
                     as="span"
-                    variant="text"
+                    variant={cta.variant ?? 'text'}
                   >
                     {cta.label}
                   </Button>
@@ -291,7 +291,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
               ) : (
                 <Button
                   variant={cta.variant}
-                  size="small"
+                  size={cta.size ?? 'small'}
                   onClick={cta.onClick}
                   disabled={cta.disabled}
                   icon={cta.icon}
diff --git a/libs/service-portal/core/src/components/LinkButton/LinkButton.tsx b/libs/service-portal/core/src/components/LinkButton/LinkButton.tsx
index 5f589b9d6f90..edf0aa6ffa82 100644
--- a/libs/service-portal/core/src/components/LinkButton/LinkButton.tsx
+++ b/libs/service-portal/core/src/components/LinkButton/LinkButton.tsx
@@ -6,12 +6,14 @@ import * as styles from './LinkButton.css'
 interface SharedProps {
   to: string
   text: string
+  size?: ButtonProps['size']
+  disabled?: ButtonProps['disabled']
   skipOutboundTrack?: boolean
 }
 
 type Props =
   | {
-      variant?: 'button'
+      variant?: 'primary' | 'ghost' | 'utility'
       icon?: ButtonProps['icon']
     }
   | {
@@ -26,14 +28,26 @@ type LinkButtonProps = SharedProps & Props
 
 export const LinkButton = ({
   variant = 'text',
+  size,
   to,
   text,
   icon,
+  disabled,
   skipOutboundTrack,
 }: LinkButtonProps) => {
   const isExternal = isExternalLink(to)
   if (variant === 'text') {
-    return (
+    return disabled ? (
+      <Button
+        size={size ?? 'small'}
+        unfocusable
+        disabled
+        icon={isExternal ? 'open' : undefined}
+        iconType={isExternal ? 'outline' : undefined}
+      >
+        {text}
+      </Button>
+    ) : (
       <LinkResolver
         className={styles.link}
         skipOutboundTrack={skipOutboundTrack}
@@ -41,7 +55,7 @@ export const LinkButton = ({
       >
         <Button
           as="span"
-          size="small"
+          size={size ?? 'small'}
           variant="text"
           unfocusable
           icon={isExternal ? 'open' : undefined}
@@ -52,7 +66,19 @@ export const LinkButton = ({
       </LinkResolver>
     )
   }
-  return (
+  return disabled ? (
+    <Button
+      colorScheme="default"
+      icon={icon}
+      iconType="outline"
+      size={size ?? 'default'}
+      disabled
+      variant={variant ?? 'utility'}
+      unfocusable
+    >
+      {text}
+    </Button>
+  ) : (
     <LinkResolver
       skipOutboundTrack={skipOutboundTrack}
       className={styles.link}
@@ -62,10 +88,10 @@ export const LinkButton = ({
         colorScheme="default"
         icon={icon}
         iconType="outline"
-        size="default"
+        size={size ?? 'default'}
         type="text"
         as="span"
-        variant="utility"
+        variant={variant ?? 'utility'}
         unfocusable
       >
         {text}
diff --git a/libs/service-portal/core/src/lib/messages.ts b/libs/service-portal/core/src/lib/messages.ts
index 3ca5dcdd88e2..3a5bff6b5f84 100644
--- a/libs/service-portal/core/src/lib/messages.ts
+++ b/libs/service-portal/core/src/lib/messages.ts
@@ -139,11 +139,26 @@ export const m = defineMessages({
     id: 'service.portal:amount',
     defaultMessage: 'Upphæð',
   },
+  approved: {
+    id: 'service.portal:approved',
+    defaultMessage: 'Samþykkt',
+  },
+  processed: {
+    id: 'service.portal:processed',
+    defaultMessage: 'Afgreitt',
+  },
+  rejected: {
+    id: 'service.portal:rejected',
+    defaultMessage: 'Hafnað',
+  },
+  unknown: {
+    id: 'service.portal:unknown',
+    defaultMessage: 'Óþekkt',
+  },
   view: {
     id: 'service.portal:view',
     defaultMessage: 'Skoða',
   },
-
   chooseDate: {
     id: 'service.portal:choose-date',
     defaultMessage: 'Veldu dagsetningu',
@@ -513,6 +528,14 @@ export const m = defineMessages({
     id: 'service.portal:signatureCollectionLists',
     defaultMessage: 'Meðmælasöfnun',
   },
+  signatureCollectionParliamentaryLists: {
+    id: 'service.portal:signatureCollectionParliamentaryLists',
+    defaultMessage: 'Alþingiskosningar - Meðmælasöfnun',
+  },
+  signatureCollectionPresidentialLists: {
+    id: 'service.portal:signatureCollectionPresidentialLists',
+    defaultMessage: 'Forsetakosningar - Meðmælasöfnun',
+  },
   notifications: {
     id: 'service.portal:notifications',
     defaultMessage: 'Tilkynningar',
@@ -1440,6 +1463,19 @@ export const m = defineMessages({
     defaultMessage:
       'Einstaklingar geta átt rétt á greiðslum frá Tryggingastofnun (TR) til að bæta afkomu sína og hag. Allar greiðslur frá TR þarf að sækja sérstaklega um.',
   },
+  incomePlan: {
+    id: 'service.portal:income-plan',
+    defaultMessage: 'Tekjuáætlun',
+  },
+  latestIncomePlan: {
+    id: 'service.portal:latest-income-plan',
+    defaultMessage: 'Yfirlit yfir núverandi tekjuáætlun',
+  },
+  incomePlanDescription: {
+    id: 'service.portal:income-plan',
+    defaultMessage:
+      'Ellilífeyrir, örorkulífeyrir, endurhæfingarlífeyrir og tengdar greiðslur eru tekjutengdar og reiknast út frá tekjuáætlun. Þegar sótt er um lífeyri þarf alltaf að skila inn tekjuáætlun. Hér er hægt að skoða gildandi tekjuáætlun.',
+  },
   paymentPlan: {
     id: 'service.portal:payment-plan',
     defaultMessage: 'Greiðsluáætlun',
diff --git a/libs/service-portal/core/src/utils/downloadDataFile.ts b/libs/service-portal/core/src/utils/downloadDataFile.ts
index 1d6fe8dfd0bc..c3fecfdad97b 100644
--- a/libs/service-portal/core/src/utils/downloadDataFile.ts
+++ b/libs/service-portal/core/src/utils/downloadDataFile.ts
@@ -24,7 +24,7 @@ export const downloadFile = async (
   if (type === 'csv') {
     const csvData = [header, ...data]
     const filename = `${name}, ${new Date().toISOString().split('T')[0]}.csv`
-    CSVStringify(csvData, (_err, output) => {
+    CSVStringify(csvData, (err, output) => {
       getFile(filename, output)
     })
   } else {
diff --git a/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBar.tsx b/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBar.tsx
deleted file mode 100644
index d8c1863e4dff..000000000000
--- a/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBar.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
-  Icon,
-  Box,
-  BoxProps,
-  LoadingDots,
-  Button,
-} from '@island.is/island-ui/core'
-import { useSubmitMailAction } from '../../utils/useSubmitMailAction'
-import * as styles from './DocumentActionBar.css'
-import { GetDocumentListInput } from '@island.is/api/schema'
-import { Tooltip, m } from '@island.is/service-portal/core'
-import { useLocale } from '@island.is/localization'
-import { ActiveDocumentType } from '../../lib/types'
-
-export type DocumentActionBarProps = {
-  onPrintClick?: () => void
-  onGoBack?: () => void
-  refetchInboxItems?: (input?: GetDocumentListInput) => void
-  spacing?: BoxProps['columnGap']
-  documentId: string
-  archived?: boolean
-  bookmarked?: boolean
-  activeDocument?: ActiveDocumentType
-}
-export const DocumentActionBar: React.FC<DocumentActionBarProps> = ({
-  onGoBack,
-  onPrintClick,
-  spacing = 1,
-  documentId,
-  bookmarked,
-  archived,
-  refetchInboxItems,
-  activeDocument,
-}) => {
-  const {
-    submitMailAction,
-    archiveSuccess,
-    bookmarkSuccess,
-    loading,
-    dataSuccess,
-  } = useSubmitMailAction({ messageId: documentId })
-
-  const { formatMessage } = useLocale()
-
-  const isBookmarked =
-    (bookmarked && !dataSuccess.unbookmark) || bookmarkSuccess
-  const isArchived = (archived && !dataSuccess.unarchive) || archiveSuccess
-
-  const getDocumentLink = (
-    document: ActiveDocumentType,
-    type: 'pdf' | 'html',
-  ) => {
-    const uri =
-      type === 'html'
-        ? `data:text/html,${document.document.html}`
-        : `data:application/pdf;base64,${document.document.content}`
-    return encodeURI(uri)
-  }
-
-  return (
-    <>
-      {onGoBack && (
-        <Box>
-          <button
-            aria-label={formatMessage(m.closeActiveDocument)}
-            onClick={onGoBack}
-          >
-            <Icon color="blue400" icon="arrowBack" />
-          </button>
-        </Box>
-      )}
-      <Box className={styles.filterBtns} display="flex" columnGap={spacing}>
-        {!loading && (
-          <>
-            <Tooltip
-              text={formatMessage(
-                isArchived ? m.removeFromStorage : m.addToStorage,
-              )}
-            >
-              <Button
-                circle
-                icon="fileTrayEmpty"
-                iconType={isArchived ? 'filled' : 'outline'}
-                onClick={async () => {
-                  await submitMailAction(isArchived ? 'unarchive' : 'archive')
-                  if (refetchInboxItems) {
-                    refetchInboxItems()
-                  }
-                }}
-                size="medium"
-                colorScheme="light"
-              />
-            </Tooltip>
-            <Tooltip
-              text={formatMessage(
-                isBookmarked ? m.removeFavorite : m.addFavorite,
-              )}
-            >
-              <Button
-                circle
-                icon="star"
-                iconType={isBookmarked ? 'filled' : 'outline'}
-                onClick={async () => {
-                  await submitMailAction(
-                    isBookmarked ? 'unbookmark' : 'bookmark',
-                  )
-                  if (refetchInboxItems) {
-                    refetchInboxItems()
-                  }
-                }}
-                size="medium"
-                colorScheme="light"
-              />
-            </Tooltip>
-          </>
-        )}
-        {loading && (
-          <Box display="flex" alignItems="center">
-            <LoadingDots />
-          </Box>
-        )}
-        {activeDocument &&
-          (activeDocument.document.content || activeDocument.document.html) && (
-            <Tooltip as="span" text={formatMessage(m.download)}>
-              <a
-                download={`${activeDocument.subject}${
-                  activeDocument.document.html ? '.html' : '.pdf'
-                }`}
-                href={getDocumentLink(
-                  activeDocument,
-                  activeDocument.document.html ? 'html' : 'pdf',
-                )}
-                aria-label={formatMessage(m.getDocument)}
-              >
-                <Button
-                  as="span"
-                  unfocusable
-                  circle
-                  icon="download"
-                  iconType="outline"
-                  size="medium"
-                  colorScheme="light"
-                />
-              </a>
-            </Tooltip>
-          )}
-        {onPrintClick && (
-          <Tooltip text={formatMessage(m.print)}>
-            <Button
-              circle
-              icon="print"
-              iconType={'outline'}
-              onClick={onPrintClick}
-              size="medium"
-              colorScheme="light"
-            />
-          </Tooltip>
-        )}
-      </Box>
-    </>
-  )
-}
diff --git a/libs/service-portal/documents/src/components/DocumentActionBar/index.ts b/libs/service-portal/documents/src/components/DocumentActionBar/index.ts
deleted file mode 100644
index 2207357f17fd..000000000000
--- a/libs/service-portal/documents/src/components/DocumentActionBar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DocumentActionBar } from './DocumentActionBar'
diff --git a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilter.tsx b/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilter.tsx
deleted file mode 100644
index da2790aab08e..000000000000
--- a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilter.tsx
+++ /dev/null
@@ -1,266 +0,0 @@
-import React from 'react'
-import {
-  Box,
-  DatePicker,
-  Checkbox,
-  FilterMultiChoice,
-  AccordionItem,
-  Accordion,
-  Input,
-  Hidden,
-  Text,
-} from '@island.is/island-ui/core'
-import { m, Filter } from '@island.is/service-portal/core'
-import { useLocale, useNamespaces } from '@island.is/localization'
-import { messages } from '../../utils/messages'
-import * as styles from './DocumentsFilter.css'
-import DocumentsFilterTags from './DocumentsFilterTags'
-import isEqual from 'lodash/isEqual'
-import { defaultFilterValues, FilterValuesType } from '../../utils/types'
-import {
-  DocumentCategory,
-  DocumentSender,
-  DocumentType,
-} from '@island.is/api/schema'
-
-interface Props {
-  filterValue: FilterValuesType
-  debounceChange: (e: any) => void
-  handleClearFilters: () => void
-  handleShowUnread: (value: boolean) => void
-  handleShowArchived: (value: boolean) => void
-  handleShowBookmarked: (value: boolean) => void
-  handleCategoriesChange: (values: string[]) => void
-  handleSendersChange: (values: string[]) => void
-  handleDateFromChange: (date: Date | null) => void
-  handleDateToChange: (date: Date | null) => void
-  clearCategories: () => void
-  clearSenders: () => void
-  categories: DocumentCategory[]
-  senders: DocumentSender[]
-  documentsLength: number
-}
-const DocumentsFilter = ({
-  filterValue,
-  debounceChange,
-  handleClearFilters,
-  handleShowUnread,
-  handleShowArchived,
-  handleShowBookmarked,
-  handleCategoriesChange,
-  handleSendersChange,
-  handleDateFromChange,
-  handleDateToChange,
-  clearCategories,
-  clearSenders,
-  categories,
-  senders,
-  documentsLength,
-}: Props) => {
-  useNamespaces('sp.documents')
-  const { formatMessage, lang } = useLocale()
-
-  const hasActiveFilters = () => !isEqual(filterValue, defaultFilterValues)
-
-  const documentsFoundText = () =>
-    documentsLength === 1 || (lang === 'is' && documentsLength % 10 === 1)
-      ? messages.foundSingular
-      : messages.found
-
-  const mapToFilterItem = (
-    array: DocumentCategory[] | DocumentSender[] | DocumentType[],
-  ) => {
-    return array.map((item) => {
-      return {
-        label: item.name,
-        value: item.id,
-      }
-    })
-  }
-
-  const sendersAvailable = mapToFilterItem(senders)
-  const categoriesAvailable = mapToFilterItem(categories)
-  return (
-    <>
-      <Filter
-        resultCount={0}
-        variant="popover"
-        align="left"
-        reverse
-        labelClear={formatMessage(m.clearFilter)}
-        labelClearAll={formatMessage(m.clearAllFilters)}
-        labelOpen={formatMessage(m.openFilter)}
-        labelClose={formatMessage(m.closeFilter)}
-        fullWidthInput
-        filterInput={
-          <Input
-            placeholder={formatMessage(m.searchPlaceholder)}
-            name="rafraen-skjol-input"
-            size="xs"
-            onChange={debounceChange}
-            backgroundColor="blue"
-            icon={{ name: 'search' }}
-          />
-        }
-        onFilterClear={handleClearFilters}
-      >
-        <Box
-          display="flex"
-          flexDirection="column"
-          justifyContent="spaceBetween"
-          paddingX={3}
-          className={styles.unreadFilter}
-        >
-          <Box paddingTop={3}>
-            <Checkbox
-              id="show-unread"
-              label={formatMessage(messages.onlyShowUnread)}
-              checked={filterValue.showUnread}
-              onChange={(e) => handleShowUnread(e.target.checked)}
-            />
-          </Box>
-          <Box paddingTop={1}>
-            <Checkbox
-              id="show-bookmarked"
-              label={formatMessage(messages.onlyShowBookmarked)}
-              checked={filterValue.bookmarked}
-              onChange={(e) => handleShowBookmarked(e.target.checked)}
-            />
-          </Box>
-          <Box paddingTop={1} paddingBottom={3}>
-            <Checkbox
-              id="show-archived"
-              label={formatMessage(messages.onlyShowArchived)}
-              checked={filterValue.archived}
-              onChange={(e) => handleShowArchived(e.target.checked)}
-            />
-          </Box>
-          <Box
-            borderBottomWidth="standard"
-            borderColor="blue200"
-            width="full"
-          />
-        </Box>
-        <FilterMultiChoice
-          labelClear={formatMessage(m.clearSelected)}
-          singleExpand={false}
-          onChange={({ categoryId, selected }) => {
-            if (categoryId === 'senders') {
-              handleSendersChange(selected)
-            }
-            if (categoryId === 'categories') {
-              handleCategoriesChange(selected)
-            }
-          }}
-          onClear={(categoryId) => {
-            if (categoryId === 'senders') {
-              clearSenders()
-            }
-            if (categoryId === 'categories') {
-              clearCategories()
-            }
-          }}
-          categories={[
-            {
-              id: 'senders',
-              label: formatMessage(messages.institutionLabel),
-              selected: [...filterValue.activeSenders],
-              filters: sendersAvailable,
-              inline: false,
-              singleOption: false,
-            },
-            {
-              id: 'categories',
-              label: formatMessage(messages.groupLabel),
-              selected: [...filterValue.activeCategories],
-              filters: categoriesAvailable,
-              inline: false,
-              singleOption: false,
-            },
-          ]}
-        />
-        <Box className={styles.dateFilter} paddingX={3}>
-          <Box
-            borderBottomWidth="standard"
-            borderColor="blue200"
-            width="full"
-          />
-          <Box marginTop={1}>
-            <Accordion
-              dividerOnBottom={false}
-              dividerOnTop={false}
-              singleExpand={false}
-            >
-              <AccordionItem
-                key="date-accordion-item"
-                id="date-accordion-item"
-                label={formatMessage(m.datesLabel)}
-                labelUse="h2"
-                labelVariant="h5"
-                iconVariant="small"
-              >
-                <Box display="flex" flexDirection="column">
-                  <Box>
-                    <DatePicker
-                      label={formatMessage(m.datepickerFromLabel)}
-                      placeholderText={formatMessage(m.datepickLabel)}
-                      locale="is"
-                      backgroundColor="blue"
-                      size="xs"
-                      selected={filterValue.dateFrom}
-                      handleChange={handleDateFromChange}
-                      appearInline
-                    />
-                  </Box>
-                  <Box marginTop={3}>
-                    <DatePicker
-                      label={formatMessage(m.datepickerToLabel)}
-                      placeholderText={formatMessage(m.datepickLabel)}
-                      locale="is"
-                      backgroundColor="blue"
-                      size="xs"
-                      selected={filterValue.dateTo}
-                      handleChange={handleDateToChange}
-                      appearInline
-                      minDate={filterValue.dateFrom || undefined}
-                    />
-                  </Box>
-                </Box>
-              </AccordionItem>
-            </Accordion>
-          </Box>
-        </Box>
-      </Filter>
-      <Hidden print>
-        {hasActiveFilters() && (
-          <Box display="flex" flexDirection="column" marginTop={4}>
-            <DocumentsFilterTags
-              filterValue={filterValue}
-              categories={categoriesAvailable}
-              senders={sendersAvailable}
-              handleCategoriesChange={handleCategoriesChange}
-              handleSendersChange={handleSendersChange}
-              handleDateFromChange={handleDateFromChange}
-              handleDateToChange={handleDateToChange}
-              handleShowUnread={handleShowUnread}
-              handleClearFilters={handleClearFilters}
-              handleShowArchived={handleShowArchived}
-              handleShowBookmarked={handleShowBookmarked}
-            />
-
-            <Text
-              variant="eyebrow"
-              as="h3"
-              dataTestId="doc-found-text"
-              marginTop={2}
-            >{`${documentsLength} ${formatMessage(
-              documentsFoundText(),
-            )}`}</Text>
-          </Box>
-        )}
-      </Hidden>
-    </>
-  )
-}
-
-export default DocumentsFilter
diff --git a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTags.tsx b/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTags.tsx
deleted file mode 100644
index 90fb491bdf3c..000000000000
--- a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTags.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Box, Button } from '@island.is/island-ui/core'
-import { useLocale, useNamespaces } from '@island.is/localization'
-import React from 'react'
-import FilterTag from '../FilterTag/FilterTag'
-import { m } from '@island.is/service-portal/core'
-import format from 'date-fns/format'
-import { dateFormat } from '@island.is/shared/constants'
-import { messages } from '../../utils/messages'
-import { FilterValuesType } from '../../utils/types'
-
-interface Props {
-  filterValue: FilterValuesType
-  handleShowUnread: (value: boolean) => void
-  handleCategoriesChange: (values: string[]) => void
-  handleSendersChange: (values: string[]) => void
-  handleDateFromChange: (date: Date | null) => void
-  handleDateToChange: (date: Date | null) => void
-  handleClearFilters: () => void
-  handleShowArchived: (value: boolean) => void
-  handleShowBookmarked: (value: boolean) => void
-  categories: { label: string; value: string }[]
-  senders: { label: string; value: string }[]
-}
-const DocumentsFilterTags = ({
-  filterValue,
-  handleClearFilters,
-  handleShowUnread,
-  handleCategoriesChange,
-  handleSendersChange,
-  handleDateFromChange,
-  handleDateToChange,
-  handleShowArchived,
-  handleShowBookmarked,
-  categories,
-  senders,
-}: Props) => {
-  useNamespaces('sp.documents')
-  const { formatMessage } = useLocale()
-
-  const getCategoryTitle = (id: string) => {
-    if (categories.length === 0) {
-      return ''
-    }
-    const category = categories?.find((item) => item.value === id)
-    return category?.label || ''
-  }
-
-  const getSenderTitle = (id: string) => {
-    const sender = senders?.find((item) => item.value === id)
-    return sender?.label || ''
-  }
-  return (
-    <Box display="flex" flexWrap="wrap" rowGap={1} alignItems="center">
-      {filterValue.activeCategories.length > 0 &&
-        filterValue.activeCategories.map((activecat) => (
-          <FilterTag
-            onClick={() =>
-              handleCategoriesChange(
-                filterValue.activeCategories.filter(
-                  (item) => item !== activecat,
-                ),
-              )
-            }
-            key={`cat-${activecat}`}
-            title={getCategoryTitle(activecat)}
-          />
-        ))}
-      {filterValue.activeSenders.length > 0 &&
-        filterValue.activeSenders.map((activeSender) => (
-          <FilterTag
-            onClick={() =>
-              handleSendersChange(
-                filterValue.activeSenders.filter(
-                  (item) => item !== activeSender,
-                ),
-              )
-            }
-            key={`sender-${activeSender}`}
-            title={getSenderTitle(activeSender)}
-          />
-        ))}
-      {filterValue.dateFrom && (
-        <FilterTag
-          onClick={() => handleDateFromChange(null)}
-          title={`${formatMessage(m.datepickerFromLabel)} - ${format(
-            filterValue.dateFrom,
-            dateFormat.is,
-          )}`}
-        />
-      )}
-      {filterValue.dateTo && (
-        <FilterTag
-          onClick={() => handleDateToChange(null)}
-          title={`${formatMessage(m.datepickerToLabel)} - ${format(
-            filterValue.dateTo,
-            dateFormat.is,
-          )}`}
-        />
-      )}
-      {filterValue.showUnread && (
-        <FilterTag
-          onClick={() => handleShowUnread(false)}
-          title={formatMessage(messages.onlyShowUnreadShort)}
-        />
-      )}
-      {filterValue.archived && (
-        <FilterTag
-          onClick={() => handleShowArchived(false)}
-          title={formatMessage(messages.onlyShowArchived)}
-        />
-      )}
-      {filterValue.bookmarked && (
-        <FilterTag
-          onClick={() => handleShowBookmarked(false)}
-          title={formatMessage(messages.onlyShowBookmarked)}
-        />
-      )}
-      <Box marginLeft={1}>
-        <Button
-          icon="reload"
-          size="small"
-          variant="text"
-          onClick={handleClearFilters}
-        >
-          {formatMessage(m.clearFilter)}
-        </Button>
-      </Box>
-    </Box>
-  )
-}
-
-export default DocumentsFilterTags
diff --git a/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeader.tsx b/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeader.tsx
deleted file mode 100644
index 1a9f3b11afa6..000000000000
--- a/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeader.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { useEffect, useRef } from 'react'
-import { Box, Text } from '@island.is/island-ui/core'
-import AvatarImage from '../DocumentLine/AvatarImage'
-import { DocumentCategory, DocumentsV2Category } from '@island.is/api/schema'
-import * as styles from './DocumentHeader.css'
-import {
-  DocumentActionBar,
-  DocumentActionBarProps,
-} from '../DocumentActionBar/DocumentActionBar'
-import { helperStyles } from '@island.is/island-ui/theme'
-
-type DocumentHeaderProps = {
-  avatar?: string
-  sender?: string
-  date?: string
-  category?: DocumentCategory | DocumentsV2Category
-  actionBar?: DocumentActionBarProps
-  subject?: string
-}
-
-export const DocumentHeader: React.FC<DocumentHeaderProps> = ({
-  avatar,
-  sender,
-  date,
-  category,
-  actionBar,
-  subject,
-}) => {
-  const wrapper = useRef<HTMLDivElement>(null)
-
-  useEffect(() => {
-    if (wrapper.current) {
-      wrapper.current.focus()
-    }
-  }, [wrapper])
-
-  return (
-    <Box tabIndex={0} outline="none" ref={wrapper} display="flex">
-      <p className={helperStyles.srOnly} aria-live="assertive">
-        {subject}
-      </p>
-      {avatar && <AvatarImage large img={avatar} background="blue100" />}
-      <Box
-        display="flex"
-        flexDirection="column"
-        justifyContent="spaceBetween"
-        marginBottom={4}
-        marginLeft={2}
-      >
-        {sender && (
-          <Text variant="medium" fontWeight="semiBold">
-            {sender}
-          </Text>
-        )}
-        <Box
-          className={styles.titleText}
-          display="flex"
-          justifyContent="flexStart"
-          alignItems="center"
-        >
-          {date && <Text variant="medium">{date}</Text>}
-          {category && (
-            <Box className={styles.categoryDivider}>
-              <Text variant="medium">{category.name ?? ''}</Text>
-            </Box>
-          )}
-        </Box>
-      </Box>
-      {actionBar && (
-        <Box className={styles.actionBarWrapper}>
-          <DocumentActionBar spacing={1} {...actionBar} />
-        </Box>
-      )}
-    </Box>
-  )
-}
diff --git a/libs/service-portal/documents/src/components/DocumentHeader/index.ts b/libs/service-portal/documents/src/components/DocumentHeader/index.ts
deleted file mode 100644
index ac85f39138f7..000000000000
--- a/libs/service-portal/documents/src/components/DocumentHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DocumentHeader } from './DocumentHeader'
diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts b/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts
index 4b00cc192ada..e94de7c80748 100644
--- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts
+++ b/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts
@@ -1,4 +1,4 @@
-import { globalStyle, style } from '@vanilla-extract/css'
+import { style } from '@vanilla-extract/css'
 import { theme, themeUtils } from '@island.is/island-ui/theme'
 
 export const wrapper = style({
@@ -23,20 +23,6 @@ export const unread = style({
   backgroundColor: theme.color.blueberry100,
 })
 
-export const unopenedWrapper = style({
-  backgroundColor: 'unset',
-  ...themeUtils.responsiveStyle({
-    sm: {
-      backgroundColor: '#FBFBFC',
-    },
-  }),
-})
-
-export const line = style({
-  fontSize: theme.typography.baseFontSize,
-  borderBottom: `1px solid ${theme.color.blue100}`,
-})
-
 export const docLineButton = style({
   overflow: 'hidden',
   cursor: 'pointer',
@@ -44,21 +30,6 @@ export const docLineButton = style({
 
 export const button = style({})
 
-export const unopened = style({
-  fontWeight: theme.typography.semiBold,
-})
-
-export const sender = style({
-  fontWeight: theme.typography.light,
-  fontSize: 14,
-  ...themeUtils.responsiveStyle({
-    md: {
-      fontWeight: theme.typography.regular,
-      fontSize: theme.typography.baseFontSize,
-    },
-  }),
-})
-
 export const image = style({
   width: 28,
   height: 28,
@@ -74,10 +45,6 @@ export const fakeBorder = style({
   margin: 'auto',
 })
 
-export const icon = style({
-  marginLeft: 6,
-})
-
 export const imageContainer = style({
   minWidth: 48,
   minHeight: 48,
@@ -104,24 +71,3 @@ export const checkCircle = style({
   maxWidth: 30,
   transition: 'background-color .25s',
 })
-
-export const linkWrapper = style({
-  backgroundColor: 'unset',
-  ...themeUtils.responsiveStyle({
-    sm: {
-      backgroundColor: theme.color.blueberry100,
-    },
-  }),
-})
-
-export const badge = style({
-  position: 'absolute',
-  top: -12,
-  bottom: 0,
-  right: 'auto',
-  left: -107,
-  height: theme.spacing[1],
-  width: theme.spacing[1],
-  borderRadius: '50%',
-  backgroundColor: theme.color.red400,
-})
diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx b/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx
deleted file mode 100644
index a7b4dc4f74c0..000000000000
--- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx
+++ /dev/null
@@ -1,320 +0,0 @@
-import cn from 'classnames'
-import format from 'date-fns/format'
-import { FC, useEffect, useRef, useState } from 'react'
-
-import {
-  Document,
-  DocumentDetails,
-  GetDocumentListInput,
-} from '@island.is/api/schema'
-import { Box, Text, LoadingDots, Icon } from '@island.is/island-ui/core'
-import { dateFormat } from '@island.is/shared/constants'
-import { m } from '@island.is/service-portal/core'
-import * as styles from './DocumentLine.css'
-import { gql, useLazyQuery } from '@apollo/client'
-import { useLocale } from '@island.is/localization'
-import { messages } from '../../utils/messages'
-import AvatarImage from './AvatarImage'
-import {
-  matchPath,
-  useNavigate,
-  useParams,
-  useLocation,
-} from 'react-router-dom'
-import { DocumentsPaths } from '../../lib/paths'
-import { FavAndStash } from '../FavAndStash'
-import { useSubmitMailAction } from '../../utils/useSubmitMailAction'
-import { useIsChildFocusedorHovered } from '../../hooks/useIsChildFocused'
-import { ActiveDocumentType } from '../../lib/types'
-
-interface Props {
-  documentLine: Document
-  img?: string
-  onClick?: (doc: ActiveDocumentType) => void
-  onError?: (error?: string) => void
-  onLoading?: (loading: boolean) => void
-  setSelectLine?: (id: string) => void
-  refetchInboxItems?: (input?: GetDocumentListInput) => void
-  active: boolean
-  asFrame?: boolean
-  includeTopBorder?: boolean
-  selected?: boolean
-  bookmarked?: boolean
-  archived?: boolean
-}
-
-const GET_DOCUMENT_BY_ID = gql`
-  query getDocumentInboxLineQuery($input: GetDocumentInput!) {
-    getDocument(input: $input) {
-      html
-      content
-      url
-    }
-  }
-`
-export const DocumentLine: FC<Props> = ({
-  documentLine,
-  img,
-  onClick,
-  onError,
-  onLoading,
-  setSelectLine,
-  refetchInboxItems,
-  active,
-  asFrame,
-  includeTopBorder,
-  bookmarked,
-  archived,
-  selected,
-}) => {
-  const [hasFocusOrHover, setHasFocusOrHover] = useState(false)
-  const [hasAvatarFocus, setHasAvatarFocus] = useState(false)
-  const { formatMessage } = useLocale()
-  const navigate = useNavigate()
-  const location = useLocation()
-  const date = format(new Date(documentLine.date), dateFormat.is)
-  const { id } = useParams<{
-    id: string
-  }>()
-
-  const {
-    submitMailAction,
-    archiveSuccess,
-    bookmarkSuccess,
-    loading: postLoading,
-  } = useSubmitMailAction({ messageId: documentLine.id })
-
-  const wrapperRef = useRef(null)
-  const avatarRef = useRef(null)
-
-  const isFocused = useIsChildFocusedorHovered(wrapperRef)
-
-  const isAvatarFocused = useIsChildFocusedorHovered(avatarRef)
-
-  useEffect(() => {
-    setHasFocusOrHover(isFocused)
-  }, [isFocused])
-
-  useEffect(() => {
-    setHasAvatarFocus(isAvatarFocused)
-  }, [isAvatarFocused])
-
-  useEffect(() => {
-    if (id === documentLine.id) {
-      onLineClick()
-    }
-  }, [id, documentLine])
-
-  const displayPdf = (docContent?: DocumentDetails) => {
-    if (onClick) {
-      onClick({
-        document:
-          docContent || (getFileByIdData?.getDocument as DocumentDetails),
-        id: documentLine.id,
-        sender: documentLine.senderName,
-        subject: documentLine.subject,
-        senderNatReg: documentLine.senderNatReg,
-        downloadUrl: documentLine.url,
-        date: date,
-        img,
-        categoryId: documentLine.categoryId ?? undefined,
-      })
-      window.scrollTo({
-        top: 0,
-        behavior: 'smooth',
-      })
-    }
-  }
-
-  const [getDocument, { data: getFileByIdData, loading: fileLoading }] =
-    useLazyQuery(GET_DOCUMENT_BY_ID, {
-      variables: {
-        input: {
-          id: documentLine.id,
-        },
-      },
-      fetchPolicy: 'no-cache',
-      onCompleted: (data) => {
-        const docContent = data?.getDocument
-        if (asFrame) {
-          navigate(
-            DocumentsPaths.ElectronicDocumentSingle.replace(
-              ':id',
-              documentLine.id,
-            ),
-          )
-        } else {
-          displayPdf(docContent)
-          if (onError) {
-            onError(undefined)
-          }
-        }
-      },
-      onError: () => {
-        if (onError) {
-          onError(
-            formatMessage(messages.documentFetchError, {
-              senderName: documentLine.senderName,
-            }),
-          )
-        }
-      },
-    })
-
-  useEffect(() => {
-    if (onLoading) {
-      onLoading(fileLoading)
-    }
-  }, [fileLoading])
-
-  const onLineClick = async () => {
-    const pathName = location.pathname
-    const match = matchPath(
-      {
-        path: DocumentsPaths.ElectronicDocumentSingle,
-      },
-      pathName,
-    )
-    if (match?.params?.id && match?.params?.id !== documentLine?.id) {
-      navigate(DocumentsPaths.ElectronicDocumentsRoot, { replace: true })
-    }
-
-    getFileByIdData
-      ? displayPdf()
-      : await getDocument({
-          variables: { input: { id: documentLine.id } },
-        })
-  }
-
-  const unread = !documentLine.opened
-  const isBookmarked = bookmarked || bookmarkSuccess
-  const isArchived = archived || archiveSuccess
-
-  return (
-    <Box className={styles.wrapper} ref={wrapperRef}>
-      <Box
-        display="flex"
-        position="relative"
-        borderColor="blue200"
-        borderBottomWidth="standard"
-        borderTopWidth={includeTopBorder ? 'standard' : undefined}
-        paddingX={2}
-        width="full"
-        className={cn(styles.docline, {
-          [styles.active]: active,
-          [styles.unread]: unread,
-        })}
-      >
-        <div ref={avatarRef}>
-          <AvatarImage
-            img={img}
-            onClick={(e) => {
-              e.stopPropagation()
-              if (documentLine.id && setSelectLine) {
-                setSelectLine(documentLine.id)
-              }
-            }}
-            avatar={
-              (hasAvatarFocus || selected) && !asFrame ? (
-                <Box
-                  display="flex"
-                  alignItems="center"
-                  justifyContent="center"
-                  background={selected ? 'blue400' : 'blue300'}
-                  borderRadius="circle"
-                  className={styles.checkCircle}
-                >
-                  <Icon icon="checkmark" color="white" type="filled" />
-                </Box>
-              ) : undefined
-            }
-            background={
-              hasAvatarFocus
-                ? asFrame
-                  ? 'white'
-                  : 'blue200'
-                : documentLine.opened
-                ? 'blue100'
-                : 'white'
-            }
-          />
-        </div>
-        <Box
-          width="full"
-          display="flex"
-          flexDirection="column"
-          paddingLeft={2}
-          minWidth={0}
-        >
-          {active && <div className={styles.fakeBorder} />}
-          <Box display="flex" flexDirection="row" justifyContent="spaceBetween">
-            <Text variant="small" truncate>
-              {documentLine.senderName}
-            </Text>
-            <Text variant="small">{date}</Text>
-          </Box>
-          <Box display="flex" flexDirection="row" justifyContent="spaceBetween">
-            <button
-              onClick={async () => onLineClick()}
-              aria-label={formatMessage(m.openDocumentAriaLabel, {
-                subject: documentLine.subject,
-              })}
-              type="button"
-              id={active ? `button-${documentLine.id}` : undefined}
-              className={styles.docLineButton}
-            >
-              <Text
-                fontWeight={unread ? 'medium' : 'regular'}
-                color="blue400"
-                truncate
-              >
-                {documentLine.subject}
-              </Text>
-            </button>
-            {(hasFocusOrHover || isBookmarked || isArchived) &&
-              !postLoading &&
-              !asFrame && (
-                <FavAndStash
-                  bookmarked={isBookmarked}
-                  archived={isArchived}
-                  onFav={
-                    isBookmarked || hasFocusOrHover
-                      ? async (e) => {
-                          e.stopPropagation()
-                          await submitMailAction(
-                            isBookmarked ? 'unbookmark' : 'bookmark',
-                          )
-                          if (refetchInboxItems) {
-                            refetchInboxItems()
-                          }
-                        }
-                      : undefined
-                  }
-                  onStash={
-                    isArchived || hasFocusOrHover
-                      ? async (e) => {
-                          e.stopPropagation()
-                          await submitMailAction(
-                            isArchived ? 'unarchive' : 'archive',
-                          )
-                          if (refetchInboxItems) {
-                            refetchInboxItems()
-                          }
-                        }
-                      : undefined
-                  }
-                />
-              )}
-            {(postLoading || (asFrame && fileLoading)) && (
-              <Box display="flex" alignItems="center">
-                <LoadingDots single />
-              </Box>
-            )}
-          </Box>
-        </Box>
-      </Box>
-    </Box>
-  )
-}
-
-export default DocumentLine
diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx b/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx
index 3c5596681b49..3249b6ba453c 100644
--- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx
+++ b/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx
@@ -58,11 +58,10 @@ export const DocumentLine: FC<Props> = ({
   const {
     submitMailAction,
     loading: postLoading,
-    archiveSuccess,
     bookmarkSuccess,
   } = useMailAction()
 
-  const { activeArchive, fetchObject, refetch } = useDocumentList()
+  const { fetchObject, refetch } = useDocumentList()
 
   const {
     setActiveDocument,
diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRenderer.tsx b/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRenderer.tsx
deleted file mode 100644
index e5a9761161ad..000000000000
--- a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRenderer.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { HtmlDocument } from './HTMLDocument'
-import { PdfDocWithModal } from './PdfDocument'
-import { UrlDocument } from './UrlDocment'
-import NoPDF from '../NoPDF/NoPDF'
-import { messages } from '../../utils/messages'
-import { ActiveDocumentType } from '../../lib/types'
-import { useLocale } from '@island.is/localization'
-import { customUrl } from '../../utils/customUrlHandler'
-
-const parseDocmentType = (document: ActiveDocumentType) => {
-  const doc = document.document
-  const overviewUrl = document.downloadUrl
-
-  if (doc.html && doc.html.length > 0) {
-    return 'html'
-  }
-  if (doc.content && doc.content.length > 0) {
-    return 'pdf'
-  }
-  if ((doc.url && doc.url.length > 0) || overviewUrl) {
-    return 'url'
-  }
-  return 'unknown'
-}
-
-type DocumentRendererProps = {
-  document: ActiveDocumentType
-}
-
-export const DocumentRenderer: React.FC<DocumentRendererProps> = ({
-  document,
-}) => {
-  const { formatMessage } = useLocale()
-  const type = parseDocmentType(document)
-
-  if (type === 'unknown') return <NoPDF text={formatMessage(messages.error)} />
-
-  if (type === 'html') {
-    return <HtmlDocument html={document.document.html} />
-  }
-
-  if (type === 'pdf') {
-    return <PdfDocWithModal document={document} />
-  }
-
-  if (type === 'url') {
-    const docUrl = customUrl(document)
-
-    return <UrlDocument url={docUrl} />
-  }
-
-  return <NoPDF />
-}
diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx b/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx
index a4b85b8b6b28..7572d0637d7a 100644
--- a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx
+++ b/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx
@@ -19,19 +19,7 @@ export const DocumentRenderer: React.FC<DocumentRendererProps> = ({ doc }) => {
   }
 
   if (doc?.document?.type === 'PDF') {
-    return (
-      <PdfDocWithModal
-        document={{
-          ...doc,
-          document: {
-            content: doc.document.value ?? '',
-            html: doc.document.value ?? '',
-            url: doc.document.value ?? '',
-            fileType: doc.document.type ?? '',
-          },
-        }}
-      />
-    )
+    return <PdfDocWithModal document={doc} />
   }
 
   if (doc?.document?.type === 'URL' || doc.downloadUrl) {
diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx b/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx
index 7873f528565b..c28333da0e53 100644
--- a/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx
+++ b/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx
@@ -3,14 +3,14 @@ import { useLocale } from '@island.is/localization'
 import { Box, Button, PdfViewer, Text } from '@island.is/island-ui/core'
 import { Modal, m } from '@island.is/service-portal/core'
 import { useUserInfo } from '@island.is/auth/react'
-import { ActiveDocumentType } from '../../lib/types'
-import { downloadFile } from '../../utils/downloadDocument'
+import { ActiveDocumentType2 } from '../../lib/types'
+import { downloadFile } from '../../utils/downloadDocumentV2'
 import { messages } from '../../utils/messages'
 import { Problem } from '@island.is/react-spa/shared'
 import * as styles from './DocumentRenderer.css'
 
 type PdfDocumentProps = {
-  document: ActiveDocumentType
+  document: ActiveDocumentType2
   expandCallback?: (value: boolean) => void
   initScale?: number
   onClose?: () => void
@@ -100,7 +100,7 @@ export const PdfDocument: React.FC<PdfDocumentProps> = ({
         ref={ref}
       >
         <PdfViewer
-          file={`data:application/pdf;base64,${document.document.content}`}
+          file={`data:application/pdf;base64,${document.document.value}`}
           scale={scalePDF}
           autoWidth={false}
           errorComponent={
diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/index.ts b/libs/service-portal/documents/src/components/DocumentRenderer/index.ts
deleted file mode 100644
index 1eaca774e4dd..000000000000
--- a/libs/service-portal/documents/src/components/DocumentRenderer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DocumentRenderer } from './DocumentRenderer'
diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverview.tsx b/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverview.tsx
deleted file mode 100644
index bd0feea8aa7e..000000000000
--- a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverview.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { FC } from 'react'
-import { m } from '@island.is/service-portal/core'
-import { Box, LoadingDots } from '@island.is/island-ui/core'
-import { DocumentCategory } from '@island.is/api/schema'
-import { useLocale, useNamespaces } from '@island.is/localization'
-import { useUserInfo } from '@island.is/auth/react'
-import { DocumentRenderer } from '../DocumentRenderer'
-import { DocumentHeader } from '../DocumentHeader'
-import { downloadFile } from '../../utils/downloadDocument'
-import { ActiveDocumentType } from '../../lib/types'
-import * as styles from './OverviewDisplay.css'
-import NoPDF from '../NoPDF/NoPDF'
-import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/service-portal/constants'
-
-interface Props {
-  activeDocument: ActiveDocumentType | null
-  onRefetch: () => void
-  activeArchive: boolean
-  activeBookmark: boolean
-  loading?: boolean
-  category?: DocumentCategory
-}
-
-export const DesktopOverview: FC<Props> = ({
-  activeDocument,
-  onRefetch,
-  activeArchive,
-  activeBookmark,
-  category,
-  loading,
-}) => {
-  useNamespaces('sp.documents')
-  const userInfo = useUserInfo()
-  const { formatMessage } = useLocale()
-
-  if (loading) {
-    return (
-      <Box
-        position="sticky"
-        style={{ top: SERVICE_PORTAL_HEADER_HEIGHT_LG + 50 }}
-        paddingLeft={8}
-      >
-        <Box
-          display="flex"
-          alignItems="center"
-          justifyContent="center"
-          paddingTop={6}
-        >
-          <LoadingDots />
-        </Box>
-      </Box>
-    )
-  }
-
-  if (!activeDocument) {
-    return <NoPDF />
-  }
-
-  return (
-    <Box
-      marginLeft={8}
-      marginTop={3}
-      padding={5}
-      borderRadius="large"
-      background="white"
-      className={styles.docWrap}
-    >
-      <DocumentHeader
-        avatar={activeDocument.img}
-        sender={activeDocument.sender}
-        date={activeDocument.date}
-        category={category}
-        subject={formatMessage(m.activeDocumentOpenAriaLabel, {
-          subject: activeDocument.subject,
-        })}
-        actionBar={{
-          activeDocument: activeDocument,
-          documentId: activeDocument.id,
-          archived: activeArchive,
-          bookmarked: activeBookmark,
-          refetchInboxItems: onRefetch,
-          onPrintClick: activeDocument
-            ? () => downloadFile(activeDocument, userInfo)
-            : undefined,
-        }}
-      />
-      <Box>{<DocumentRenderer document={activeDocument} />}</Box>
-      {activeDocument?.id && (
-        <Box className={styles.reveal}>
-          <button
-            onClick={() => {
-              document.getElementById(`button-${activeDocument?.id}`)?.focus()
-            }}
-          >
-            {formatMessage(m.backToList)}
-          </button>
-        </Box>
-      )}
-    </Box>
-  )
-}
-
-export default DesktopOverview
diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverview.tsx b/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverview.tsx
deleted file mode 100644
index bbef2d91b82a..000000000000
--- a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverview.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { FC } from 'react'
-import { LoadModal, m } from '@island.is/service-portal/core'
-import { Box, Text, GridColumn, GridRow } from '@island.is/island-ui/core'
-import { DocumentCategory } from '@island.is/api/schema'
-import { useLocale, useNamespaces } from '@island.is/localization'
-import { useUserInfo } from '@island.is/auth/react'
-import { DocumentRenderer } from '../../components/DocumentRenderer'
-import { DocumentHeader } from '../../components/DocumentHeader'
-import { DocumentActionBar } from '../../components/DocumentActionBar'
-import { downloadFile } from '../../utils/downloadDocument'
-import { ActiveDocumentType } from '../../lib/types'
-import FocusLock from 'react-focus-lock'
-import * as styles from './OverviewDisplay.css'
-
-interface Props {
-  activeDocument: ActiveDocumentType | null
-  onPressBack: () => void
-  onRefetch: () => void
-  activeArchive: boolean
-  activeBookmark: boolean
-  loading?: boolean
-  category?: DocumentCategory
-}
-
-export const MobileOverview: FC<Props> = ({
-  activeDocument,
-  onPressBack,
-  onRefetch,
-  activeArchive,
-  activeBookmark,
-  category,
-  loading,
-}) => {
-  useNamespaces('sp.documents')
-  const userInfo = useUserInfo()
-  const { formatMessage } = useLocale()
-
-  if (loading) {
-    return <LoadModal />
-  }
-
-  if (!activeDocument) {
-    return null
-  }
-
-  return (
-    <GridRow>
-      <GridColumn span="12/12" position="relative">
-        <FocusLock autoFocus={false}>
-          <Box className={styles.modalBase}>
-            <Box className={styles.modalHeader}>
-              <DocumentActionBar
-                onGoBack={onPressBack}
-                documentId={activeDocument.id}
-                archived={activeArchive}
-                bookmarked={activeBookmark}
-                refetchInboxItems={onRefetch}
-                activeDocument={activeDocument}
-                onPrintClick={
-                  activeDocument
-                    ? () => downloadFile(activeDocument, userInfo)
-                    : undefined
-                }
-              />
-            </Box>
-            <Box className={styles.modalContent}>
-              <DocumentHeader
-                avatar={activeDocument.img}
-                sender={activeDocument.sender}
-                date={activeDocument.date}
-                category={category}
-                subject={formatMessage(m.activeDocumentOpenAriaLabel, {
-                  subject: activeDocument.subject,
-                })}
-              />
-              <Text variant="h3" as="h3" marginBottom={3}>
-                {activeDocument?.subject}
-              </Text>
-              {<DocumentRenderer document={activeDocument} />}
-            </Box>
-          </Box>
-        </FocusLock>
-      </GridColumn>
-    </GridRow>
-  )
-}
-
-export default MobileOverview
diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplay.tsx b/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplay.tsx
deleted file mode 100644
index a6602e59b723..000000000000
--- a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplay.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { FC } from 'react'
-import { theme } from '@island.is/island-ui/theme'
-import { DocumentCategory } from '@island.is/api/schema'
-import { ActiveDocumentType } from '../../lib/types'
-import useWindowSize from 'react-use/lib/useWindowSize'
-import DesktopOverview from './DesktopOverview'
-import MobileOverview from './MobileOverview'
-import NoPDF from '../NoPDF/NoPDF'
-
-export interface Props {
-  activeDocument: ActiveDocumentType | null
-  onPressBack: () => void
-  onRefetch: () => void
-  activeArchive: boolean
-  activeBookmark: boolean
-  loading?: boolean
-  error?: {
-    message?: string
-    code: 'list' | 'single'
-  }
-  category?: DocumentCategory
-}
-
-export const DocumentDisplay: FC<Props> = (props) => {
-  const { width } = useWindowSize()
-
-  const isDesktop = width > theme.breakpoints.lg
-
-  if (props.error?.message) {
-    if (props.error?.code === 'single' && !isDesktop) {
-      return null
-    }
-    return <NoPDF text={props.error?.message} error />
-  }
-
-  if (isDesktop) {
-    const { onPressBack, ...deskProps } = props
-    return <DesktopOverview {...deskProps} />
-  }
-
-  return <MobileOverview {...props} />
-}
-
-export default DocumentDisplay
diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx b/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx
index 425eae10384b..68e0f47f754d 100644
--- a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx
+++ b/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx
@@ -1,4 +1,5 @@
 import { FC } from 'react'
+import { toast } from '@island.is/island-ui/core'
 import { theme } from '@island.is/island-ui/theme'
 import { DocumentsV2Category } from '@island.is/api/schema'
 import useWindowSize from 'react-use/lib/useWindowSize'
@@ -23,6 +24,9 @@ export const DocumentDisplay: FC<Props> = (props) => {
   const isDesktop = width > theme.breakpoints.lg
 
   if (props.error?.message) {
+    if (!isDesktop) {
+      toast.error(props.error?.message, { toastId: 'single-doc-error' })
+    }
     if (props.error?.code === 'single' && !isDesktop) {
       return null
     }
diff --git a/libs/service-portal/documents/src/screens/Documents.loader.ts b/libs/service-portal/documents/src/screens/Documents.loader.ts
index a9d3eb5b5799..cfe38ab394eb 100644
--- a/libs/service-portal/documents/src/screens/Documents.loader.ts
+++ b/libs/service-portal/documents/src/screens/Documents.loader.ts
@@ -2,9 +2,9 @@ import { Query } from '@island.is/api/schema'
 import { gql } from '@apollo/client'
 import { matchPath } from 'react-router'
 import type { WrappedLoaderFn } from '@island.is/portals/core'
-import { pageSize } from './Overview/Overview'
 import { DocumentsPaths } from '../lib/paths'
 import { ServicePortalPaths } from '@island.is/service-portal/core'
+import { pageSize } from '../hooks/useDocumentList'
 
 export const GET_PAGE_NUMBER_QUERY = gql`
   query GetDocumentPageNumber($input: DocumentInput!) {
diff --git a/libs/service-portal/documents/src/screens/Overview/Overview.tsx b/libs/service-portal/documents/src/screens/Overview/Overview.tsx
deleted file mode 100644
index ffe87e0176a7..000000000000
--- a/libs/service-portal/documents/src/screens/Overview/Overview.tsx
+++ /dev/null
@@ -1,564 +0,0 @@
-import { useState, useCallback, useEffect, useMemo } from 'react'
-import {
-  Box,
-  Stack,
-  Pagination,
-  Text,
-  GridContainer,
-  GridColumn,
-  GridRow,
-  SkeletonLoader,
-  Checkbox,
-  toast,
-} from '@island.is/island-ui/core'
-import {
-  useListDocuments,
-  useOrganizations,
-} from '@island.is/service-portal/graphql'
-import {
-  GoBack,
-  formatPlausiblePathToParams,
-  m,
-  useScrollTopOnUpdate,
-} from '@island.is/service-portal/core'
-import {
-  DocumentCategory,
-  DocumentSender,
-  DocumentType,
-} from '@island.is/api/schema'
-import { useLocale, useNamespaces } from '@island.is/localization'
-import { documentsSearchDocumentsInitialized } from '@island.is/plausible'
-import { useLoaderData, useLocation, useNavigate } from 'react-router-dom'
-import { getOrganizationLogoUrl } from '@island.is/shared/utils'
-import isAfter from 'date-fns/isAfter'
-import differenceInYears from 'date-fns/differenceInYears'
-import DocumentsFilter from '../../components/DocumentFilter/DocumentsFilter'
-import debounce from 'lodash/debounce'
-import { defaultFilterValues, FilterValuesType } from '../../utils/types'
-import * as styles from './Overview.css'
-import { AuthDelegationType } from '@island.is/shared/types'
-import DocumentLine from '../../components/DocumentLine/DocumentLine'
-import { useUserInfo } from '@island.is/auth/react'
-import { useKeyDown } from '../../hooks/useKeyDown'
-import { usePostBulkMailActionMutation } from './BatchMailAction.generated'
-import { FavAndStash } from '../../components/FavAndStash'
-import { messages } from '../../utils/messages'
-import DocumentDisplay from '../../components/OverviewDisplay/OverviewDocumentDisplay'
-import { ActiveDocumentType } from '../../lib/types'
-import {
-  useDocumentCategoriesQuery,
-  useDocumentSendersQuery,
-  useDocumentTypesQuery,
-} from './DocumentExtra.generated'
-import { DocumentsPaths } from '../../lib/paths'
-
-export const pageSize = 10
-
-export const ServicePortalDocuments = () => {
-  useNamespaces('sp.documents')
-  const userInfo = useUserInfo()
-  const { formatMessage } = useLocale()
-  const navigate = useNavigate()
-  const loaderNumber = useLoaderData() as number
-  const [page, setPage] = useState(loaderNumber)
-  const [selectedLines, setSelectedLines] = useState<Array<string>>([])
-  const [documentDisplayError, setDocumentDisplayError] = useState<string>()
-  const [docLoading, setDocLoading] = useState(false)
-  const [totalPages, setTotalPages] = useState<number>()
-  const location = useLocation()
-  const [activeDocument, setActiveDocument] =
-    useState<ActiveDocumentType | null>(null)
-  const isLegal = userInfo.profile.delegationType?.includes(
-    AuthDelegationType.LegalGuardian,
-  )
-
-  const [bulkMailAction, { loading: bulkMailActionLoading }] =
-    usePostBulkMailActionMutation({
-      onError: (_) => toast.error(formatMessage(m.errorTitle)),
-      onCompleted: (data) => {
-        if (data.postBulkMailAction?.success) {
-          if (refetch) {
-            refetch({
-              ...fetchObject(),
-            })
-          }
-        } else {
-          toast.error(formatMessage(m.errorTitle))
-        }
-      },
-    })
-
-  const dateOfBirth = userInfo?.profile.dateOfBirth
-  let isOver15 = false
-  if (dateOfBirth) {
-    isOver15 = differenceInYears(new Date(), dateOfBirth) > 15
-  }
-  const hideHealthData = isOver15 && isLegal
-
-  const sortState = {
-    direction: 'Descending',
-    key: 'Date',
-  }
-  const [searchInteractionEventSent, setSearchInteractionEventSent] =
-    useState(false)
-  useScrollTopOnUpdate([page])
-
-  const [filterValue, setFilterValue] =
-    useState<FilterValuesType>(defaultFilterValues)
-
-  const fetchObject = () => {
-    return {
-      senderKennitala: filterValue.activeSenders.join(),
-      dateFrom: filterValue.dateFrom?.toISOString(),
-      dateTo: filterValue.dateTo?.toISOString(),
-      categoryId: filterValue.activeCategories.join(),
-      subjectContains: filterValue.searchQuery,
-      typeId: null,
-      sortBy: sortState.key,
-      order: sortState.direction,
-      opened: filterValue.showUnread ? false : null,
-      page: page,
-      pageSize: pageSize,
-      isLegalGuardian: hideHealthData,
-      archived: filterValue.archived,
-      bookmarked: filterValue.bookmarked,
-    }
-  }
-
-  const { data, totalCount, loading, error, refetch } = useListDocuments({
-    ...fetchObject(),
-  })
-
-  const { data: categoriesData, loading: categoriesLoading } =
-    useDocumentCategoriesQuery()
-
-  const { data: typesData, loading: typesLoading } = useDocumentTypesQuery()
-
-  const { data: sendersData, loading: sendersLoading } =
-    useDocumentSendersQuery()
-
-  const [categoriesAvailable, setCategoriesAvailable] = useState<
-    DocumentCategory[]
-  >([])
-
-  const [sendersAvailable, setSendersAvailable] = useState<DocumentSender[]>([])
-
-  const [typesAvailable, setTypesAvailable] = useState<DocumentType[]>([])
-  useEffect(() => {
-    if (
-      !sendersLoading &&
-      sendersData?.getDocumentSenders &&
-      sendersAvailable.length === 0
-    ) {
-      setSendersAvailable(sendersData.getDocumentSenders)
-    }
-  }, [sendersLoading])
-
-  useEffect(() => {
-    if (
-      !typesLoading &&
-      typesData?.getDocumentTypes &&
-      typesAvailable.length === 0
-    ) {
-      setTypesAvailable(typesData.getDocumentTypes)
-    }
-  }, [typesLoading])
-
-  useEffect(() => {
-    if (location?.state?.doc) {
-      setActiveDocument(location?.state?.doc)
-    }
-  }, [location?.state?.doc])
-
-  useEffect(() => {
-    if (
-      !categoriesLoading &&
-      categoriesData?.getDocumentCategories &&
-      categoriesAvailable.length === 0
-    ) {
-      setCategoriesAvailable(categoriesData.getDocumentCategories)
-    }
-  }, [categoriesLoading])
-
-  const filteredDocuments = data.documents
-
-  useEffect(() => {
-    const pageCount = Math.ceil(totalCount / pageSize)
-    if (pageCount !== totalPages && pageCount !== 0) {
-      setTotalPages(pageCount)
-    }
-  }, [pageSize, totalCount])
-
-  const { data: organizations } = useOrganizations()
-
-  const handleDateFromInput = useCallback((value: Date | null) => {
-    setPage(1)
-    setFilterValue((oldState) => {
-      const { dateTo } = oldState
-      const dateToValue = () => {
-        if (!value) {
-          return dateTo
-        }
-        return dateTo ? (isAfter(value, dateTo) ? value : dateTo) : dateTo
-      }
-      return {
-        ...oldState,
-        dateTo: dateToValue(),
-        dateFrom: value,
-      }
-    })
-  }, [])
-
-  const handleDateToInput = useCallback((value: Date | null) => {
-    setPage(1)
-    setFilterValue((oldState) => ({
-      ...oldState,
-      dateTo: value,
-    }))
-  }, [])
-
-  const handlePageChange = useCallback((newPage: number) => {
-    setPage(newPage)
-  }, [])
-
-  const handleCategoriesChange = useCallback((selected: string[]) => {
-    setPage(1)
-    setFilterValue((oldFilter) => ({
-      ...oldFilter,
-      activeCategories: [...selected],
-    }))
-  }, [])
-
-  const handleSendersChange = useCallback((selected: string[]) => {
-    setPage(1)
-    setFilterValue((oldFilter) => ({
-      ...oldFilter,
-      activeSenders: [...selected],
-    }))
-  }, [])
-
-  const handleClearFilters = useCallback(() => {
-    setPage(1)
-    setFilterValue({ ...defaultFilterValues })
-  }, [])
-
-  const handleShowUnread = useCallback((showUnread: boolean) => {
-    setPage(1)
-    setFilterValue((prevFilter) => ({
-      ...prevFilter,
-      showUnread,
-    }))
-  }, [])
-
-  const handleShowArchived = useCallback((showArchived: boolean) => {
-    setPage(1)
-    setFilterValue((prevFilter) => ({
-      ...prevFilter,
-      archived: showArchived,
-    }))
-  }, [])
-
-  const handleShowBookmarked = useCallback((showBookmarked: boolean) => {
-    setPage(1)
-    setFilterValue((prevFilter) => ({
-      ...prevFilter,
-      bookmarked: showBookmarked,
-    }))
-  }, [])
-
-  const handleSearchChange = (e: any) => {
-    setPage(1)
-    if (e) {
-      setFilterValue((prevFilter) => ({
-        ...prevFilter,
-        searchQuery: e.target?.value ?? '',
-      }))
-      if (!searchInteractionEventSent) {
-        documentsSearchDocumentsInitialized(
-          formatPlausiblePathToParams(DocumentsPaths.ElectronicDocumentsRoot),
-        )
-        setSearchInteractionEventSent(true)
-      }
-    }
-  }
-
-  useEffect(() => {
-    return () => {
-      debouncedResults.cancel()
-    }
-  })
-
-  useKeyDown('Escape', () => {
-    setActiveDocument(null)
-    navigate(DocumentsPaths.ElectronicDocumentsRoot, {
-      replace: true,
-    })
-  })
-
-  const debouncedResults = useMemo(() => {
-    return debounce(handleSearchChange, 500)
-  }, [])
-
-  const activeArchive = filterValue.archived === true
-
-  const rowDirection = error ? 'column' : 'columnReverse'
-  return (
-    <GridContainer>
-      <GridRow direction={[rowDirection, rowDirection, rowDirection, 'row']}>
-        <GridColumn
-          hiddenBelow={activeDocument?.document ? 'lg' : undefined}
-          span={['12/12', '12/12', '12/12', '5/12']}
-        >
-          <Box marginBottom={2} printHidden marginY={3}>
-            <Box
-              className={styles.btn}
-              display={'inlineFlex'}
-              alignItems={'center'}
-            >
-              <GoBack display="inline" noUnderline marginBottom={0} />
-              <Box
-                borderRadius={'circle'}
-                display={'inlineBlock'}
-                marginY={0}
-                marginX={1}
-                className={styles.bullet}
-              ></Box>
-              <Text
-                as="h1"
-                variant="eyebrow"
-                color="blue400"
-                fontWeight="semiBold"
-              >
-                <button
-                  onClick={() =>
-                    navigate(DocumentsPaths.ElectronicDocumentsRoot, {
-                      replace: true,
-                    })
-                  }
-                >
-                  {formatMessage(m.documents)}
-                </button>
-              </Text>
-            </Box>
-          </Box>
-          <DocumentsFilter
-            filterValue={filterValue}
-            categories={categoriesAvailable}
-            senders={sendersAvailable}
-            debounceChange={debouncedResults}
-            clearCategories={() =>
-              setFilterValue((oldFilter) => ({
-                ...oldFilter,
-                activeCategories: [],
-              }))
-            }
-            clearSenders={() =>
-              setFilterValue((oldFilter) => ({
-                ...oldFilter,
-                activeSenders: [],
-              }))
-            }
-            handleCategoriesChange={handleCategoriesChange}
-            handleSendersChange={handleSendersChange}
-            handleDateFromChange={handleDateFromInput}
-            handleDateToChange={handleDateToInput}
-            handleShowUnread={handleShowUnread}
-            handleShowArchived={handleShowArchived}
-            handleShowBookmarked={handleShowBookmarked}
-            handleClearFilters={handleClearFilters}
-            documentsLength={totalCount}
-          />
-          <Box marginTop={4}>
-            <Box
-              background="blue100"
-              width="full"
-              borderColor="blue200"
-              borderBottomWidth="standard"
-              display="flex"
-              justifyContent="spaceBetween"
-              padding={2}
-            >
-              <Box display="flex">
-                <Box className={styles.checkboxWrap} marginRight={3}>
-                  {!activeArchive && (
-                    <Checkbox
-                      name="checkbox-select-all"
-                      checked={selectedLines.length > 0}
-                      onChange={(e) => {
-                        if (e.target.checked) {
-                          const allDocumentIds = filteredDocuments.map(
-                            (item) => item.id,
-                          )
-                          setSelectedLines([...allDocumentIds])
-                        } else {
-                          setSelectedLines([])
-                        }
-                      }}
-                    />
-                  )}
-                </Box>
-                {selectedLines.length > 0 ? null : (
-                  <Text variant="eyebrow">{formatMessage(m.info)}</Text>
-                )}
-              </Box>
-
-              {selectedLines.length > 0 && !activeArchive ? (
-                <FavAndStash
-                  loading={bulkMailActionLoading}
-                  onStash={() =>
-                    bulkMailAction({
-                      variables: {
-                        input: {
-                          messageIds: selectedLines,
-                          action: 'archive',
-                          status: true,
-                        },
-                      },
-                    })
-                      .then(() => {
-                        toast.success(
-                          formatMessage(messages.successArchiveMulti),
-                        )
-                      })
-                      .catch((e) => {
-                        toast.error(formatMessage(m.errorTitle))
-                      })
-                  }
-                  onFav={() =>
-                    bulkMailAction({
-                      variables: {
-                        input: {
-                          messageIds: selectedLines,
-                          action: 'bookmark',
-                          status: true,
-                        },
-                      },
-                    })
-                  }
-                  onRead={() =>
-                    bulkMailAction({
-                      variables: {
-                        input: {
-                          messageIds: selectedLines,
-                          action: 'read',
-                          status: true,
-                        },
-                      },
-                    })
-                  }
-                />
-              ) : (
-                <Text variant="eyebrow">{formatMessage(m.date)}</Text>
-              )}
-            </Box>
-            {loading && (
-              <Box marginTop={2}>
-                <SkeletonLoader
-                  space={2}
-                  repeat={pageSize}
-                  display="block"
-                  width="full"
-                  height={57}
-                />
-              </Box>
-            )}
-            <Stack space={0}>
-              {filteredDocuments.map((doc) => (
-                <Box key={doc.id}>
-                  <DocumentLine
-                    img={getOrganizationLogoUrl(
-                      doc.senderName,
-                      organizations,
-                      60,
-                      'none',
-                    )}
-                    documentLine={doc}
-                    onClick={setActiveDocument}
-                    onError={(err) => setDocumentDisplayError(err)}
-                    onLoading={(l) => setDocLoading(l)}
-                    active={doc.id === activeDocument?.id}
-                    bookmarked={!!doc.bookmarked}
-                    selected={selectedLines.includes(doc.id)}
-                    archived={activeArchive}
-                    refetchInboxItems={() => {
-                      if (refetch) {
-                        refetch({
-                          ...fetchObject(),
-                        })
-                      }
-                    }}
-                    setSelectLine={(docId) => {
-                      if (selectedLines.includes(doc.id)) {
-                        const filtered = selectedLines.filter(
-                          (item) => item !== doc.id,
-                        )
-                        setSelectedLines([...filtered])
-                      } else {
-                        setSelectedLines([...selectedLines, docId])
-                      }
-                    }}
-                  />
-                </Box>
-              ))}
-              {totalPages && (
-                <Box paddingBottom={4} marginTop={4}>
-                  <Pagination
-                    page={page}
-                    totalPages={totalPages}
-                    renderLink={(page, className, children) => (
-                      <button
-                        className={className}
-                        onClick={handlePageChange.bind(null, page)}
-                      >
-                        {children}
-                      </button>
-                    )}
-                  />
-                </Box>
-              )}
-            </Stack>
-          </Box>
-        </GridColumn>
-        <GridColumn
-          span={['12/12', '12/12', '12/12', '7/12']}
-          position="relative"
-        >
-          <DocumentDisplay
-            activeDocument={activeDocument}
-            activeArchive={activeArchive}
-            activeBookmark={
-              !!filteredDocuments?.filter(
-                (doc) => doc?.id === activeDocument?.id,
-              )?.[0]?.bookmarked
-            }
-            category={categoriesAvailable.find(
-              (i) => i.id === activeDocument?.categoryId,
-            )}
-            onPressBack={() => {
-              setActiveDocument(null)
-              navigate(DocumentsPaths.ElectronicDocumentsRoot, {
-                replace: true,
-              })
-            }}
-            onRefetch={() => {
-              if (refetch) {
-                refetch({
-                  ...fetchObject(),
-                })
-              }
-            }}
-            error={{
-              message: error
-                ? formatMessage(messages.error)
-                : documentDisplayError ?? undefined,
-              code: error ? 'list' : 'single',
-            }}
-            loading={docLoading}
-          />
-        </GridColumn>
-      </GridRow>
-    </GridContainer>
-  )
-}
-
-export default ServicePortalDocuments
diff --git a/libs/service-portal/documents/src/screens/Overview/index.tsx b/libs/service-portal/documents/src/screens/Overview/index.tsx
index 46206dbef0df..4adee80c881c 100644
--- a/libs/service-portal/documents/src/screens/Overview/index.tsx
+++ b/libs/service-portal/documents/src/screens/Overview/index.tsx
@@ -1,39 +1,15 @@
-import { useFeatureFlagClient } from '@island.is/react/feature-flags'
-import ServicePortalDocuments from './Overview'
 import ServicePortalDocumentsV2 from './OverviewV2'
-import { useEffect, useState } from 'react'
 import { DocumentsProvider } from './DocumentContext'
 import { Box } from '@island.is/island-ui/core'
 
 export const DocumentIndex = () => {
-  const featureFlagClient = useFeatureFlagClient()
-  const [v2Enabled, setV2Enabled] = useState<boolean>()
-
-  useEffect(() => {
-    const isFlagEnabled = async () => {
-      const ffEnabled = await featureFlagClient.getValue(
-        `isServicePortalDocumentsV2PageEnabled`,
-        false,
-      )
-      setV2Enabled(ffEnabled as boolean)
-    }
-    isFlagEnabled()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  if (v2Enabled) {
-    return (
-      <Box paddingTop={2}>
-        <DocumentsProvider>
-          <ServicePortalDocumentsV2 />
-        </DocumentsProvider>
-      </Box>
-    )
-  }
-  if (v2Enabled === false) {
-    return <ServicePortalDocuments />
-  }
-  return null
+  return (
+    <Box paddingTop={2}>
+      <DocumentsProvider>
+        <ServicePortalDocumentsV2 />
+      </DocumentsProvider>
+    </Box>
+  )
 }
 
 export default DocumentIndex
diff --git a/libs/service-portal/documents/src/utils/downloadDocument.ts b/libs/service-portal/documents/src/utils/downloadDocument.ts
deleted file mode 100644
index 6e3aaff48e77..000000000000
--- a/libs/service-portal/documents/src/utils/downloadDocument.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { User } from '@island.is/auth/react'
-import { ActiveDocumentType } from '../lib/types'
-
-export const downloadFile = async (doc: ActiveDocumentType, userInfo: User) => {
-  let html: string | undefined = undefined
-  if (doc?.document.html) {
-    html = doc?.document.html.length > 0 ? doc?.document.html : undefined
-  }
-  if (html) {
-    setTimeout(() => {
-      const win = window.open('', '_blank')
-      win && html && win.document.write(html)
-      win?.focus()
-    }, 250)
-  } else {
-    // Create form elements
-    const form = document.createElement('form')
-    const documentIdInput = document.createElement('input')
-    const tokenInput = document.createElement('input')
-
-    const token = userInfo?.access_token
-
-    if (!token) return
-
-    form.appendChild(documentIdInput)
-    form.appendChild(tokenInput)
-
-    // Form values
-    form.method = 'post'
-    form.action = doc?.downloadUrl ?? ''
-    form.target = '_blank'
-
-    // Document Id values
-    documentIdInput.type = 'hidden'
-    documentIdInput.name = 'documentId'
-    documentIdInput.value = doc?.id ?? ''
-
-    // National Id values
-    tokenInput.type = 'hidden'
-    tokenInput.name = '__accessToken'
-    tokenInput.value = token
-
-    document.body.appendChild(form)
-    form.submit()
-    document.body.removeChild(form)
-  }
-}
diff --git a/libs/service-portal/documents/src/utils/mockData.ts b/libs/service-portal/documents/src/utils/mockData.ts
deleted file mode 100644
index 9fa9d1ec10d0..000000000000
--- a/libs/service-portal/documents/src/utils/mockData.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import { Document } from '@island.is/api/schema'
-
-export const documents: Document[] = [
-  {
-    id: '1',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '2',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '3',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '4',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '5',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '6',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '7',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '8',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '9',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '10',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '11',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '12',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '13',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '14',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '15',
-    date: new Date(),
-
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '16',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '17',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '18',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '19',
-    date: new Date(),
-    subject: 'Subject subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: true,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-  {
-    id: '20',
-    date: new Date(),
-    subject: 'UNREAD subject',
-    senderName: 'Ríkislögreglustjóri',
-    senderNatReg: 'NatReg?',
-    opened: false,
-    fileType: 'pdf',
-    url: 'https://visir.is',
-  },
-]
diff --git a/libs/service-portal/documents/src/utils/useSubmitMailAction.ts b/libs/service-portal/documents/src/utils/useSubmitMailAction.ts
deleted file mode 100644
index f86a94e0c7ae..000000000000
--- a/libs/service-portal/documents/src/utils/useSubmitMailAction.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { gql, useMutation } from '@apollo/client'
-import { MailActions } from './types'
-import { useState } from 'react'
-import { toast } from '@island.is/island-ui/core'
-import { useLocale } from '@island.is/localization'
-import { m } from '@island.is/service-portal/core'
-import { messages } from './messages'
-
-const POST_MAIL_ACTION = gql`
-  mutation PostMailActionMutation($input: PostMailActionResolverInput!) {
-    postMailAction(input: $input) {
-      success
-      messageId
-      action
-    }
-  }
-`
-
-export const useSubmitMailAction = (input?: { messageId: string }) => {
-  const { formatMessage } = useLocale()
-  const [postMailAction, { data, loading }] = useMutation(POST_MAIL_ACTION)
-
-  const [bookmarkSuccess, setBookmarkSuccess] = useState(false)
-  const [archiveSuccess, setArchiveSuccess] = useState(false)
-  const [dataSuccess, setDataSuccess] = useState({
-    bookmark: false,
-    unbookmark: false,
-    unarchive: false,
-    archive: false,
-  })
-
-  const submitMailAction = async (action: MailActions) => {
-    try {
-      await postMailAction({
-        variables: {
-          input: {
-            messageId: input?.messageId,
-            action,
-          },
-        },
-      }).then((d) => {
-        const actionName = d.data?.postMailAction?.action as MailActions
-
-        if (!d.data?.postMailAction?.success) {
-          toast.error(formatMessage(m.errorTitle))
-          return
-        }
-
-        if (actionName === 'bookmark') {
-          setBookmarkSuccess(true)
-          setDataSuccess({
-            ...dataSuccess,
-            bookmark: true,
-          })
-        }
-        if (actionName === 'unbookmark') {
-          setBookmarkSuccess(false)
-          setDataSuccess({
-            ...dataSuccess,
-            unbookmark: true,
-          })
-        }
-        if (actionName === 'archive') {
-          setArchiveSuccess(true)
-          toast.success(formatMessage(messages.successArchive))
-          setDataSuccess({
-            ...dataSuccess,
-            archive: true,
-          })
-        }
-        if (actionName === 'unarchive') {
-          setArchiveSuccess(false)
-          toast.success(formatMessage(messages.successUnarchive))
-          setDataSuccess({
-            ...dataSuccess,
-            unarchive: true,
-          })
-        }
-      })
-    } catch (err) {
-      toast.error(formatMessage(m.errorTitle))
-    }
-  }
-
-  return {
-    data,
-    submitMailAction,
-    loading,
-    archiveSuccess,
-    bookmarkSuccess,
-    dataSuccess,
-  }
-}
diff --git a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx
index b840febd2543..ab3f832ef896 100644
--- a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx
+++ b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx
@@ -82,9 +82,17 @@ export const EducationGraduation = () => {
             return (
               <ActionCard
                 key={`education-graduation-${index}`}
-                heading={`${item.studyProgram} - ${item.degree}`}
+                heading={
+                  item.studyProgram && item.degree
+                    ? `${item.studyProgram} - ${item.degree}`
+                    : item.institution.displayName ?? undefined
+                }
                 text={item.faculty}
-                subText={item.institution.displayName ?? undefined}
+                subText={
+                  item.studyProgram && item.degree
+                    ? item.institution.displayName ?? undefined
+                    : undefined
+                }
                 cta={{
                   label: defineMessage({
                     id: 'sp.education-graduation:details',
diff --git a/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx b/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx
index 187411225b49..ce8e66bccbee 100644
--- a/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx
+++ b/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx
@@ -5,10 +5,8 @@ import {
   AlertMessage,
   Box,
   Button,
-  Divider,
   GridColumn,
   GridRow,
-  Stack,
   Text,
 } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
@@ -148,22 +146,26 @@ export const EducationGraduationDetail = () => {
               loading={loading}
               content={graduationDate}
             />
-            <InfoLine
-              label={defineMessage({
-                id: 'sp.education-graduation:education-grad-detail-degree',
-                defaultMessage: 'Gráða',
-              })}
-              loading={loading}
-              content={formatNationalId(studentInfo?.degree ?? '')}
-            />
-            <InfoLine
-              label={defineMessage({
-                id: 'sp.education-graduation:education-grad-detail-program',
-                defaultMessage: 'Námsleið',
-              })}
-              loading={loading}
-              content={formatNationalId(studentInfo?.studyProgram ?? '')}
-            />
+            {studentInfo?.degree && (
+              <InfoLine
+                label={defineMessage({
+                  id: 'sp.education-graduation:education-grad-detail-degree',
+                  defaultMessage: 'Gráða',
+                })}
+                loading={loading}
+                content={formatNationalId(studentInfo.degree)}
+              />
+            )}
+            {studentInfo?.studyProgram && (
+              <InfoLine
+                label={defineMessage({
+                  id: 'sp.education-graduation:education-grad-detail-program',
+                  defaultMessage: 'Námsleið',
+                })}
+                loading={loading}
+                content={formatNationalId(studentInfo?.studyProgram ?? '')}
+              />
+            )}
             <InfoLine
               label={defineMessage({
                 id: 'sp.education-graduation:education-grad-detail-faculty',
diff --git a/libs/service-portal/health/src/screens/Vaccinations/wrapper/VaccinationsWrapper.tsx b/libs/service-portal/health/src/screens/Vaccinations/wrapper/VaccinationsWrapper.tsx
index 0e6c4e89193f..bed64757288f 100644
--- a/libs/service-portal/health/src/screens/Vaccinations/wrapper/VaccinationsWrapper.tsx
+++ b/libs/service-portal/health/src/screens/Vaccinations/wrapper/VaccinationsWrapper.tsx
@@ -33,14 +33,14 @@ export const VaccinationsWrapper = ({
         <LinkButton
           to={formatMessage(m.readAboutVaccinationsLink)}
           icon="open"
-          variant="button"
+          variant="utility"
           text={formatMessage(m.readAboutVaccinations)}
         />
         <Box marginLeft={1}>
           <LinkButton
             to={formatMessage(m.makeVaccinationAppointmentLink)}
             icon="open"
-            variant="button"
+            variant="utility"
             text={formatMessage(m.makeVaccinationAppointment)}
           />
         </Box>
diff --git a/libs/service-portal/information/src/lib/navigation.ts b/libs/service-portal/information/src/lib/navigation.ts
index bf2978ecb59d..e4ae141622cb 100644
--- a/libs/service-portal/information/src/lib/navigation.ts
+++ b/libs/service-portal/information/src/lib/navigation.ts
@@ -56,7 +56,18 @@ export const informationNavigation: PortalNavigationItem = {
       path: InformationPaths.Lists,
       children: [
         {
-          name: m.signatureCollectionLists,
+          name: m.signatureCollectionParliamentaryLists,
+          path: SignatureCollectionPaths.SignatureCollectionParliamentaryLists,
+          children: [
+            {
+              name: m.viewSignatureList,
+              navHide: true,
+              path: SignatureCollectionPaths.ViewParliamentaryList,
+            },
+          ],
+        },
+        {
+          name: m.signatureCollectionPresidentialLists,
           path: SignatureCollectionPaths.SignatureCollectionLists,
           children: [
             {
diff --git a/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx b/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx
index 6c85cb59e7f1..4660a6b6c34d 100644
--- a/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx
+++ b/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx
@@ -117,7 +117,7 @@ const ChildCustody = () => {
                         <LinkButton
                           to={formatMessage(urls.contactThjodskra)}
                           text={formatMessage(spmm.childRegisterModalButton)}
-                          variant="button"
+                          variant="utility"
                           icon="receipt"
                         />
 
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 602b3c2baff9..b1b7e586c25a 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -118,7 +118,7 @@ const UserNotifications = () => {
           </Column>
           <Column width="content">
             <LinkButton
-              variant="button"
+              variant="utility"
               icon="settings"
               to={InformationPaths.Settings}
               text={formatMessage(m.mySettings)}
diff --git a/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx b/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx
index 327fffc93f62..9ae0e16e3a35 100644
--- a/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx
+++ b/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx
@@ -121,7 +121,7 @@ const LicenseDetail = () => {
                   if (link.label && link.value && link.type) {
                     return (
                       <LinkButton
-                        variant="button"
+                        variant="utility"
                         key={`${type}-license-button-${index}`}
                         to={link.value}
                         text={link.label}
diff --git a/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx b/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx
index 495ea662c61f..036d5d4d598c 100644
--- a/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx
+++ b/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx
@@ -17,6 +17,7 @@ type LicenseDetailProps = {
   serviceProviderTooltip?: string
   isOldEducationLicense?: boolean
   name?: string | null
+  licenseNumber?: string | null
   dateOfBirth?: string | null
   profession?: string | null
   licenseType?: string | null
@@ -34,6 +35,7 @@ export const LicenseDetail: React.FC<LicenseDetailProps> = ({
   isOldEducationLicense,
   buttonGroup,
   name,
+  licenseNumber,
   dateOfBirth,
   profession,
   licenseType,
@@ -44,7 +46,7 @@ export const LicenseDetail: React.FC<LicenseDetailProps> = ({
   const { formatMessage } = useLocale()
 
   return (
-    <Box paddingTop="p1" borderBottomWidth="standard" borderColor="blue200">
+    <Box>
       <IntroHeader
         title={title ? title : om.occupationalLicense}
         intro={intro ? intro : undefined}
@@ -70,6 +72,14 @@ export const LicenseDetail: React.FC<LicenseDetailProps> = ({
             valueColumnSpan={['6/12']}
           />
         )}
+        {licenseNumber && (
+          <InfoLine
+            label={formatMessage(om.licenseNumber)}
+            content={licenseNumber}
+            labelColumnSpan={['6/12']}
+            valueColumnSpan={['6/12']}
+          />
+        )}
         {dateOfBirth && (
           <InfoLine
             label={formatMessage(om.dateOfBirth)}
diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx b/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx
index 2423dd953eda..051a4af284de 100644
--- a/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx
+++ b/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx
@@ -12,6 +12,7 @@ import { useUserInfo } from '@island.is/auth/react'
 import { LicenseDetail } from '../../../components/LicenseDetail'
 import { olMessage as om } from '../../../lib/messages'
 import { m } from '@island.is/service-portal/core'
+import { OccupationalLicenseV2LicenseType } from '@island.is/service-portal/graphql'
 
 type UseParams = {
   id: string
@@ -55,6 +56,11 @@ export const EducationDetail = () => {
       serviceProviderSlug={HEALTH_DIRECTORATE_SLUG}
       serviceProviderTooltip={formatMessage(om.healthDirectorateTooltip)}
       name={user.profile.name}
+      licenseNumber={
+        license.__typename === 'OccupationalLicensesHealthDirectorateLicense'
+          ? license.number
+          : undefined
+      }
       dateOfBirth={birthday ? formatDateFns(birthday, 'dd.MM.yyyy') : undefined}
       profession={license.profession}
       licenseType={license.type}
diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx b/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx
index eff28f63e012..f363140e81a6 100644
--- a/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx
+++ b/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx
@@ -28,7 +28,6 @@ const OverviewV1 = () => {
   useNamespaces('sp.occupational-licenses')
   const organizations =
     (data?.getOrganizations?.items as Array<Organization>) ?? []
-
   const generateUrl = (route: string, id: string, type: string) =>
     route
       .replace(':id', id)
diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx
index ef1b2387dee0..ecc45395cf6b 100644
--- a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx
+++ b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx
@@ -93,7 +93,7 @@ const OccupationalLicenseDetail = () => {
                   return (
                     <LinkButton
                       key={`button-link-${index}`}
-                      variant="button"
+                      variant="utility"
                       to={
                         a.type === OccupationalLicensesV2LinkType.DOCUMENT
                           ? DocumentsPaths.ElectronicDocumentSingle.replace(
diff --git a/libs/service-portal/signature-collection/src/lib/constants.ts b/libs/service-portal/signature-collection/src/lib/constants.ts
new file mode 100644
index 000000000000..04eb57fdee3a
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/lib/constants.ts
@@ -0,0 +1,14 @@
+export const CollectionType = {
+  Presidential: 'Forsetakosningar',
+  Parliamentary: 'Alþingiskosningar',
+}
+
+// will be fetched later on
+export const constituencies = [
+  'Norðvesturkjördæmi',
+  'Norðausturkjördæmi',
+  'Suðurkjördæmi',
+  'Suðvesturkjördæmi',
+  'Reykjavíkurkjördæmi suður',
+  'Reykjavíkurkjördæmi norður',
+]
diff --git a/libs/service-portal/signature-collection/src/lib/messages.ts b/libs/service-portal/signature-collection/src/lib/messages.ts
index 0bb77887ba8b..ac1781136297 100644
--- a/libs/service-portal/signature-collection/src/lib/messages.ts
+++ b/libs/service-portal/signature-collection/src/lib/messages.ts
@@ -1,6 +1,7 @@
 import { defineMessages } from 'react-intl'
 
 export const m = defineMessages({
+  /* Forsetakosningar */
   pageTitle: {
     id: 'sp.signatureCollection:title',
     defaultMessage: 'Meðmælasöfnun',
@@ -30,7 +31,12 @@ export const m = defineMessages({
   },
   myListsDescription: {
     id: 'sp.signatureCollection:myListsDescription',
-    defaultMessage: 'Yfirlit safnanna sem þú hefur stofnað:',
+    defaultMessage: 'Yfirlit safnana sem þú hefur stofnað',
+    description: '',
+  },
+  myListsInfo: {
+    id: 'sp.signatureCollection:myListsInfo#markdown',
+    defaultMessage: 'Norðvesturkjördæmi - 7 þingsæti. 210 - 280 meðmæli.',
     description: '',
   },
   copyLinkButton: {
@@ -245,4 +251,115 @@ export const m = defineMessages({
     defaultMessage: 'Heimilisfang',
     description: '',
   },
+
+  /* Parliamentary */
+  parliamentaryElectionsTitle: {
+    id: 'sp.signatureCollection:parliamentaryElectionsTitle',
+    defaultMessage: 'Alþingiskosningar',
+    description: '',
+  },
+  pageTitleParliamentary: {
+    id: 'sp.signatureCollection:pageTitleParliamentary',
+    defaultMessage: 'Meðmælasöfnun fyrir Alþingiskosningar',
+    description: '',
+  },
+  pageDescriptionParliamentary: {
+    id: 'sp.signatureCollection:pageDescriptionParliamentary',
+    defaultMessage:
+      'Hægt er að gera einstaklinga að umsjónaraðilum hér að neðan. Fjöldi meðmælenda er margfeldi af þingsætatölu hvers kjördæmis og 30 að lágmarki og 40 að hámarki. Söfnun lýkur 16.10.2024.',
+    description: '',
+  },
+  infoProviderTooltip: {
+    id: 'sp.signatureCollection:infoProviderTooltip',
+    defaultMessage:
+      'Þjóðskrá Íslands hefur umsjón með gögnum um meðmælasöfnun.',
+  },
+  managers: {
+    id: 'sp.signatureCollection:managers',
+    defaultMessage: 'Ábyrgðaraðilar',
+    description: '',
+  },
+  addManager: {
+    id: 'sp.signatureCollection:addManager',
+    defaultMessage: 'Bæta við ábyrgðaraðila',
+    description: '',
+  },
+  supervisors: {
+    id: 'sp.signatureCollection:supervisors',
+    defaultMessage: 'Umsjónaraðilar',
+    description: '',
+  },
+  add: {
+    id: 'sp.signatureCollection:add',
+    defaultMessage: 'Bæta við',
+    description: '',
+  },
+  addSupervisor: {
+    id: 'sp.signatureCollection:addSupervisor',
+    defaultMessage: 'Bæta við umsjónaraðila',
+    description: '',
+  },
+  personName: {
+    id: 'sp.signatureCollection:personName',
+    defaultMessage: 'Nafn',
+    description: '',
+  },
+  personNationalId: {
+    id: 'sp.signatureCollection:personNationalId',
+    defaultMessage: 'Kennitala',
+    description: '',
+  },
+  nationalIdInvalid: {
+    id: 'sp.signatureCollection:nationalIdInvalid',
+    defaultMessage: 'Ógild kennitala',
+    description: '',
+  },
+  constituency: {
+    id: 'sp.signatureCollection:constituency',
+    defaultMessage: 'Kjördæmi',
+    description: '',
+  },
+  allConstituencies: {
+    id: 'sp.signatureCollection:allConstituencies',
+    defaultMessage: 'Öll kjördæmi',
+    description: '',
+  },
+  addConstituency: {
+    id: 'sp.signatureCollection:addConstituency',
+    defaultMessage: 'Bæta við kjördæmi',
+    description: '',
+  },
+  addConstituencyDescription: {
+    id: 'sp.signatureCollection:addConstituencyDescription',
+    defaultMessage:
+      'Veldu viðeigandi kjördæmi sem þú vilt stofna meðmælendasöfnun í.',
+    description: '',
+  },
+  addConstituencyAlertInfo: {
+    id: 'sp.signatureCollection:addConstituencyAlertInfo',
+    defaultMessage:
+      'Athugið að skrá þarf viðeigandi ábyrgðar-/umsjónaraðila á yfirlitssíðu fyrir ný kjördæmi.',
+    description: '',
+  },
+  deleteManager: {
+    id: 'sp.signatureCollection:deleteManager',
+    defaultMessage: 'Eyða umsjónaraðila',
+    description: '',
+  },
+  deleteManagerDescription: {
+    id: 'sp.signatureCollection:deleteManagerDescription',
+    defaultMessage:
+      'Þú ert að fara að taka Nafna Nafnason af lista yfir umsjónaraðila. Ertu viss um að þú viljir halda áfram?',
+    description: '',
+  },
+  delete: {
+    id: 'sp.signatureCollection:delete',
+    defaultMessage: 'Eyða',
+    description: '',
+  },
+  save: {
+    id: 'sp.signatureCollection:save',
+    defaultMessage: 'Vista',
+    description: '',
+  },
 })
diff --git a/libs/service-portal/signature-collection/src/lib/paths.ts b/libs/service-portal/signature-collection/src/lib/paths.ts
index 8b510fbe4ad3..2a24a90b1a8e 100644
--- a/libs/service-portal/signature-collection/src/lib/paths.ts
+++ b/libs/service-portal/signature-collection/src/lib/paths.ts
@@ -1,5 +1,12 @@
 export enum SignatureCollectionPaths {
   RootPath = '/min-gogn/listar',
+  GeneralPetitions = '/min-gogn/listar/undirskriftalistar',
+
+  // Parliamentary
+  SignatureCollectionParliamentaryLists = '/min-gogn/listar/althingis-medmaelasofnun',
+  ViewParliamentaryList = '/min-gogn/listar/althingis-medmaelasofnun/:id',
+
+  // Presidential
   SignatureCollectionLists = '/min-gogn/listar/medmaelasofnun',
   ViewList = '/min-gogn/listar/medmaelasofnun/:id',
 }
diff --git a/libs/service-portal/signature-collection/src/module.tsx b/libs/service-portal/signature-collection/src/module.tsx
index 6b2baed19503..50bc7c53217f 100644
--- a/libs/service-portal/signature-collection/src/module.tsx
+++ b/libs/service-portal/signature-collection/src/module.tsx
@@ -2,40 +2,60 @@ import { lazy } from 'react'
 import { m } from '@island.is/service-portal/core'
 import { PortalModule, PortalRoute } from '@island.is/portals/core'
 import { SignatureCollectionPaths } from './lib/paths'
-import { Features } from '@island.is/feature-flags'
 import { ApiScope } from '@island.is/auth/scopes'
 import { Navigate } from 'react-router-dom'
 
-const SignatureLists = lazy(() => import('./screens'))
-const ViewList = lazy(() => import('./screens/CandidateView/ViewList'))
+const SignatureListsParliamentary = lazy(() =>
+  import('./screens/Parliamentary/'),
+)
+const SignatureListsPresidential = lazy(() => import('./screens/Presidential'))
+const ViewListPresidential = lazy(() =>
+  import('./screens/Presidential/OwnerView/ViewList'),
+)
+const ViewListParliamentary = lazy(() =>
+  import('./screens/Parliamentary/OwnerView/ViewList'),
+)
 
 export const signatureCollectionModule: PortalModule = {
   name: m.signatureCollectionLists,
-  featureFlag: Features.servicePortalSignatureCollection,
   routes: ({ userInfo }) => {
     const applicationRoutes: PortalRoute[] = [
       {
-        name: m.signatureCollectionLists,
+        name: m.signatureCollectionParliamentaryLists,
         path: SignatureCollectionPaths.RootPath,
         enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
         element: (
-          <Navigate
-            to={SignatureCollectionPaths.SignatureCollectionLists}
-            replace
-          />
+          /* Default path to general petitions since these are always ongoing */
+          <Navigate to={SignatureCollectionPaths.GeneralPetitions} replace />
         ),
       },
       {
-        name: m.signatureCollectionLists,
+        name: m.signatureCollectionParliamentaryLists,
+        enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
+        path: SignatureCollectionPaths.SignatureCollectionParliamentaryLists,
+        key: 'ParliamentaryLists',
+        element: <SignatureListsParliamentary />,
+      },
+      {
+        name: m.signatureCollectionPresidentialLists,
+        path: SignatureCollectionPaths.ViewParliamentaryList,
+        enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
+        key: 'ParliamentaryLists',
+        element: <ViewListParliamentary />,
+      },
+      {
+        name: m.signatureCollectionPresidentialLists,
         enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
         path: SignatureCollectionPaths.SignatureCollectionLists,
-        element: <SignatureLists />,
+        key: 'PresidentialLists',
+        element: <SignatureListsPresidential />,
       },
       {
-        name: m.signatureCollectionLists,
+        name: m.signatureCollectionPresidentialLists,
         path: SignatureCollectionPaths.ViewList,
+        key: 'PresidentialLists',
         enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
-        element: <ViewList />,
+        element: <ViewListPresidential />,
       },
     ]
 
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees.tsx
new file mode 100644
index 000000000000..00407d53f316
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees.tsx
@@ -0,0 +1,142 @@
+import {
+  Box,
+  Text,
+  Table as T,
+  Pagination,
+  FilterInput,
+} from '@island.is/island-ui/core'
+import { useLocale, useNamespaces } from '@island.is/localization'
+import { m } from '../../../../lib/messages'
+import format from 'date-fns/format'
+import { useEffect, useState } from 'react'
+import { useGetListSignees } from '../../../../hooks'
+import { useLocation } from 'react-router-dom'
+import { format as formatNationalId } from 'kennitala'
+import { SkeletonTable } from '../../../../skeletons'
+import { SignatureCollectionSignature as Signature } from '@island.is/api/schema'
+
+const Signees = () => {
+  useNamespaces('sp.signatureCollection')
+  const { formatMessage } = useLocale()
+  const { pathname } = useLocation()
+  const listId = pathname.replace('/min-gogn/listar/medmaelasofnun/', '')
+
+  const [searchTerm, setSearchTerm] = useState('')
+  const { listSignees, loadingSignees } = useGetListSignees(listId)
+  const [signees, setSignees] = useState(listSignees)
+
+  const [page, setPage] = useState(1)
+  const pageSize = 10
+
+  useEffect(() => {
+    if (!loadingSignees && listSignees.length) {
+      setSignees(listSignees)
+    }
+  }, [listSignees])
+
+  // list search
+  useEffect(() => {
+    let filteredSignees: Signature[] = listSignees
+
+    filteredSignees = filteredSignees.filter((s) => {
+      return (
+        s.signee.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+        formatNationalId(s.signee.nationalId).includes(searchTerm) ||
+        s.signee.nationalId.includes(searchTerm)
+      )
+    })
+
+    setPage(1)
+    setSignees(filteredSignees)
+  }, [searchTerm])
+
+  return (
+    <Box marginTop={[0, 5]}>
+      <Text variant="h4">{formatMessage(m.signeesHeader)}</Text>
+      <Box
+        display={['block', 'flex']}
+        justifyContent="spaceBetween"
+        marginTop={2}
+      >
+        <Box marginBottom={[2, 0]}>
+          <FilterInput
+            name="searchSignee"
+            value={searchTerm}
+            onChange={(v) => setSearchTerm(v)}
+            placeholder={formatMessage(m.searchInListPlaceholder)}
+            backgroundColor="white"
+          />
+        </Box>
+      </Box>
+      {!loadingSignees ? (
+        signees.length > 0 ? (
+          <Box marginTop={[3, 5]}>
+            <T.Table>
+              <T.Head>
+                <T.Row>
+                  <T.HeadData>{formatMessage(m.signeeDate)}</T.HeadData>
+                  <T.HeadData>{formatMessage(m.signeeName)}</T.HeadData>
+                  <T.HeadData>{formatMessage(m.signeeNationalId)}</T.HeadData>
+                  <T.HeadData>{formatMessage(m.signeeAddress)}</T.HeadData>
+                </T.Row>
+              </T.Head>
+              <T.Body>
+                {signees
+                  .slice(pageSize * (page - 1), pageSize * page)
+                  .map((s: Signature) => {
+                    return (
+                      <T.Row key={s.id}>
+                        <T.Data text={{ variant: 'medium' }}>
+                          {format(new Date(), 'dd.MM.yyyy')}
+                        </T.Data>
+                        <T.Data text={{ variant: 'medium' }}>
+                          {s.signee.name}
+                        </T.Data>
+                        <T.Data text={{ variant: 'medium' }}>
+                          {formatNationalId(s.signee.nationalId)}
+                        </T.Data>
+                        <T.Data text={{ variant: 'medium' }}>
+                          {s.signee.address}
+                        </T.Data>
+                      </T.Row>
+                    )
+                  })}
+              </T.Body>
+            </T.Table>
+
+            <Box marginTop={5}>
+              <Pagination
+                totalItems={signees.length}
+                itemsPerPage={pageSize}
+                page={page}
+                renderLink={(page, className, children) => (
+                  <Box
+                    cursor="pointer"
+                    className={className}
+                    onClick={() => setPage(page)}
+                    component="button"
+                  >
+                    {children}
+                  </Box>
+                )}
+              />
+            </Box>
+          </Box>
+        ) : searchTerm.length > 0 ? (
+          <Box display="flex" marginTop={3}>
+            <Text>{formatMessage(m.noSigneesFoundBySearch)}</Text>
+            <Box marginLeft={1}>
+              <Text variant="h5">{searchTerm}</Text>
+            </Box>
+          </Box>
+        ) : (
+          <Text marginTop={3}>{formatMessage(m.noSignees)}</Text>
+        )
+      ) : (
+        <SkeletonTable />
+      )}
+    </Box>
+  )
+}
+
+export default Signees
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx
new file mode 100644
index 000000000000..073523619387
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx
@@ -0,0 +1,70 @@
+import { Box, Stack, Text } from '@island.is/island-ui/core'
+import { useLocale, useNamespaces } from '@island.is/localization'
+import { m } from '../../../../lib/messages'
+import { useLocation } from 'react-router-dom'
+import { useGetSignatureList } from '../../../../hooks'
+import format from 'date-fns/format'
+import Signees from './Signees'
+import CancelCollection from '../../../Presidential/OwnerView/CancelCollection'
+import { SignatureCollectionPaths } from '../../../../lib/paths'
+
+const ViewList = () => {
+  useNamespaces('sp.signatureCollection')
+  const { formatMessage } = useLocale()
+  const { pathname } = useLocation()
+  const listId = pathname.replace(
+    SignatureCollectionPaths.SignatureCollectionParliamentaryLists + '/',
+    '',
+  )
+  const { listInfo, loadingList } = useGetSignatureList(listId)
+
+  return (
+    <>
+      {/*!loadingList && !!listInfo && (*/}
+      <Stack space={5}>
+        <Box>
+          <Text variant="h3">{'Listi A'}</Text>
+        </Box>
+        <Box display={['block', 'flex']} justifyContent="spaceBetween">
+          <Box>
+            <Text variant="h5">{formatMessage(m.listPeriod)}</Text>
+            {/*<Text>
+                {format(new Date(listInfo.startTime), "dd.MM.yyyy") +
+                  " - " +
+                  format(new Date(listInfo.endTime), "dd.MM.yyyy")}
+              </Text>*/}
+          </Box>
+          <Box marginTop={[2, 0]}>
+            <Text variant="h5">{formatMessage(m.numberOfSigns)}</Text>
+            <Text>{listInfo?.numberOfSignatures}</Text>
+          </Box>
+          <Box marginTop={[2, 0]}>
+            {!!listInfo?.collectors?.length && (
+              <>
+                <Text marginTop={[2, 0]} variant="h5">
+                  {formatMessage(m.coOwners)}
+                </Text>
+                {listInfo?.collectors?.map((collector) => (
+                  <Box
+                    key={collector.name}
+                    width="half"
+                    display={['block', 'flex']}
+                    justifyContent="spaceBetween"
+                  >
+                    <Text>{collector.name}</Text>
+                  </Box>
+                ))}
+              </>
+            )}
+          </Box>
+        </Box>
+        <Signees />
+
+        <CancelCollection collectionId={'1'} />
+      </Stack>
+      {/*)}*/}
+    </>
+  )
+}
+
+export default ViewList
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx
new file mode 100644
index 000000000000..b1f00d7303e9
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx
@@ -0,0 +1,110 @@
+import {
+  ActionCard,
+  Box,
+  Stack,
+  Text,
+  Table as T,
+  Tooltip,
+} from '@island.is/island-ui/core'
+import { constituencies } from '../../../lib/constants'
+import { useNavigate } from 'react-router-dom'
+import { SignatureCollectionPaths } from '../../../lib/paths'
+import LookupPerson from './modals/LookupPerson'
+import { useLocale } from '@island.is/localization'
+import { m } from '../../../lib/messages'
+import AddConstituency from './modals/AddConstituency'
+import DeletePerson from './modals/DeletePerson'
+
+const OwnerView = () => {
+  const navigate = useNavigate()
+  const { formatMessage } = useLocale()
+
+  return (
+    <Stack space={8}>
+      <Box marginTop={5}>
+        <Box
+          display="flex"
+          justifyContent="spaceBetween"
+          alignItems="baseline"
+          marginBottom={3}
+        >
+          <Text variant="h4">
+            {formatMessage(m.myListsDescription) + ' '}
+            <Tooltip
+              placement="right"
+              text={formatMessage(m.myListsInfo)}
+              color="blue400"
+            />
+          </Text>
+          <AddConstituency />
+        </Box>
+        {constituencies.map((c: string, index: number) => (
+          <Box key={index} marginTop={3}>
+            <ActionCard
+              key={index}
+              backgroundColor="white"
+              heading={'Listi A - ' + c}
+              progressMeter={{
+                currentProgress: 10,
+                maxProgress: 350,
+                withLabel: true,
+              }}
+              cta={{
+                label: formatMessage(m.viewList),
+                variant: 'text',
+                icon: 'arrowForward',
+                onClick: () => {
+                  navigate(
+                    SignatureCollectionPaths.ViewParliamentaryList.replace(
+                      ':id',
+                      '1',
+                    ),
+                  )
+                },
+              }}
+            />
+          </Box>
+        ))}
+      </Box>
+      <Box>
+        <Box
+          display="flex"
+          justifyContent="spaceBetween"
+          alignItems="baseline"
+          marginBottom={3}
+        >
+          <Text variant="h4">
+            {formatMessage(m.supervisors) + ' '}
+            <Tooltip placement="right" text="info" color="blue400" />
+          </Text>
+          <LookupPerson
+            collectionId={'1'}
+            title={formatMessage(m.addSupervisor)}
+          />
+        </Box>
+        <T.Table>
+          <T.Head>
+            <T.Row>
+              <T.HeadData>{formatMessage(m.personName)}</T.HeadData>
+              <T.HeadData>{formatMessage(m.personNationalId)}</T.HeadData>
+              <T.HeadData></T.HeadData>
+            </T.Row>
+          </T.Head>
+          <T.Body>
+            <T.Row>
+              <T.Data width={'30%'}>{'Nafni Nafnason'}</T.Data>
+              <T.Data>{'010130-3019'}</T.Data>
+              <T.Data>
+                <Box display="flex" justifyContent="flexEnd">
+                  <DeletePerson />
+                </Box>
+              </T.Data>
+            </T.Row>
+          </T.Body>
+        </T.Table>
+      </Box>
+    </Stack>
+  )
+}
+
+export default OwnerView
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/AddConstituency/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/AddConstituency/index.tsx
new file mode 100644
index 000000000000..199cd26fb938
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/AddConstituency/index.tsx
@@ -0,0 +1,49 @@
+import { useState } from 'react'
+import { Box, Button, Text, Checkbox } from '@island.is/island-ui/core'
+import { Modal } from '@island.is/service-portal/core'
+import { useLocale } from '@island.is/localization'
+import { m } from '../../../../../lib/messages'
+import { constituencies } from '../../../../../lib/constants'
+
+const AddConstituencyModal = () => {
+  const { formatMessage } = useLocale()
+  const [modalIsOpen, setModalIsOpen] = useState(false)
+
+  return (
+    <Box>
+      <Button
+        variant="utility"
+        icon="add"
+        onClick={() => {
+          setModalIsOpen(true)
+        }}
+      >
+        {formatMessage(m.add)}
+      </Button>
+      <Modal
+        id="addConstituency"
+        isVisible={modalIsOpen}
+        initialVisibility={false}
+        onCloseModal={() => setModalIsOpen(false)}
+        label={''}
+      >
+        <Text marginBottom={2} variant="h2">
+          {formatMessage(m.addConstituency)}
+        </Text>
+        <Text marginBottom={5} variant="default">
+          {formatMessage(m.addConstituencyDescription)}
+        </Text>
+        {constituencies.map((constituency) => (
+          <Box key={constituency} marginBottom={3}>
+            <Checkbox label={constituency} value={constituency} />
+          </Box>
+        ))}
+        <Box display="flex" justifyContent="center" marginTop={7}>
+          <Button>{formatMessage(m.add)}</Button>
+        </Box>
+      </Modal>
+    </Box>
+  )
+}
+
+export default AddConstituencyModal
diff --git a/libs/service-portal/signature-collection/src/screens/CandidateView/CancelCollection/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/CancelCollection/index.tsx
similarity index 92%
rename from libs/service-portal/signature-collection/src/screens/CandidateView/CancelCollection/index.tsx
rename to libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/CancelCollection/index.tsx
index 3a5b525c73b6..d06057f66f6f 100644
--- a/libs/service-portal/signature-collection/src/screens/CandidateView/CancelCollection/index.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/CancelCollection/index.tsx
@@ -1,11 +1,11 @@
 import { Box, Button, Text, toast } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../../lib/messages'
+import { m } from '../../../../../lib/messages'
 import { Modal } from '@island.is/service-portal/core'
 import { useState } from 'react'
-import { useGetListsForUser, useIsOwner } from '../../../hooks'
+import { useGetListsForUser, useIsOwner } from '../../../../../hooks'
 import { useMutation } from '@apollo/client'
-import { cancelCollectionMutation } from '../../../hooks/graphql/mutations'
+import { cancelCollectionMutation } from '../../../../../hooks/graphql/mutations'
 import { SignatureCollectionSuccess } from '@island.is/api/schema'
 
 const CancelCollection = ({ collectionId }: { collectionId: string }) => {
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/DeletePerson/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/DeletePerson/index.tsx
new file mode 100644
index 000000000000..fa5cb31a1ca2
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/DeletePerson/index.tsx
@@ -0,0 +1,42 @@
+import { useState } from 'react'
+import { Box, Button, Text } from '@island.is/island-ui/core'
+import { Modal } from '@island.is/service-portal/core'
+import { useLocale } from '@island.is/localization'
+import { m } from '../../../../../lib/messages'
+
+const DeletePersonModal = () => {
+  const { formatMessage } = useLocale()
+  const [modalIsOpen, setModalIsOpen] = useState(false)
+
+  return (
+    <Box>
+      <Button
+        variant="text"
+        icon="trash"
+        size="small"
+        onClick={() => setModalIsOpen(true)}
+      >
+        {formatMessage(m.delete)}
+      </Button>
+      <Modal
+        id="deletePerson"
+        isVisible={modalIsOpen}
+        initialVisibility={false}
+        onCloseModal={() => setModalIsOpen(false)}
+        label={''}
+      >
+        <Text marginBottom={2} variant="h2">
+          {formatMessage(m.deleteManager)}
+        </Text>
+        <Text marginBottom={5}>
+          {formatMessage(m.deleteManagerDescription)}
+        </Text>
+        <Box display="flex" justifyContent="center" marginY={5}>
+          <Button colorScheme="destructive">{formatMessage(m.delete)}</Button>
+        </Box>
+      </Modal>
+    </Box>
+  )
+}
+
+export default DeletePersonModal
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/LookupPerson/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/LookupPerson/index.tsx
new file mode 100644
index 000000000000..d7a96d4285b0
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/modals/LookupPerson/index.tsx
@@ -0,0 +1,104 @@
+import { useEffect, useState } from 'react'
+import { Box, Stack, Button, Text, Input } from '@island.is/island-ui/core'
+import { Modal } from '@island.is/service-portal/core'
+import { useLocale } from '@island.is/localization'
+import { useIdentityQuery } from '@island.is/service-portal/graphql'
+import { InputController } from '@island.is/shared/form-fields'
+import { useForm } from 'react-hook-form'
+import { m } from '../../../../../lib/messages'
+
+interface LookupPersonProps {
+  collectionId: string
+  title: string
+}
+
+const LookupPerson = ({ collectionId, title }: LookupPersonProps) => {
+  const { formatMessage } = useLocale()
+  const { control } = useForm()
+
+  const [modalIsOpen, setModalIsOpen] = useState(false)
+  const [nationalIdInput, setNationalIdInput] = useState('')
+  const [nationalIdNotFound, setNationalIdNotFound] = useState(false)
+  const [name, setName] = useState('')
+
+  const { data, loading } = useIdentityQuery({
+    variables: {
+      input: {
+        nationalId: nationalIdInput,
+      },
+    },
+    skip: nationalIdInput.length !== 10,
+  })
+
+  useEffect(() => {
+    if (!loading) {
+      if (nationalIdInput.length === 10 && data?.identity?.name) {
+        setName(data.identity.name)
+      } else {
+        setName('')
+        setNationalIdNotFound(nationalIdInput.length === 10)
+        if (nationalIdInput.length !== 10) {
+          setNationalIdInput('')
+        }
+      }
+    }
+  }, [nationalIdInput, loading])
+
+  return (
+    <Box>
+      <Button
+        variant="utility"
+        icon="add"
+        onClick={() => {
+          setModalIsOpen(true)
+        }}
+      >
+        {formatMessage(m.add)}
+      </Button>
+      <Modal
+        id="lookupPerson"
+        isVisible={modalIsOpen}
+        initialVisibility={false}
+        onCloseModal={() => setModalIsOpen(false)}
+        label={''}
+      >
+        <Text marginBottom={5} variant="h2">
+          {title}
+        </Text>
+        <Stack space={3}>
+          <InputController
+            control={control}
+            id="nationalId"
+            label={formatMessage(m.personNationalId)}
+            backgroundColor={'blue'}
+            name="nationalId"
+            format="######-####"
+            type="tel"
+            defaultValue={nationalIdInput}
+            onChange={(e) => {
+              setNationalIdInput(e.target.value.replace(/\W/g, ''))
+            }}
+            error={
+              nationalIdNotFound
+                ? formatMessage(m.nationalIdInvalid)
+                : undefined
+            }
+            loading={loading}
+          />
+          <Input
+            label={formatMessage(m.personName)}
+            backgroundColor="white"
+            name="name"
+            value={name}
+            readOnly
+          />
+        </Stack>
+        <Box display="flex" justifyContent="center" marginY={5}>
+          <Button>{formatMessage(m.add)}</Button>
+        </Box>
+      </Modal>
+    </Box>
+  )
+}
+
+export default LookupPerson
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/SigneeView/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/SigneeView/index.tsx
new file mode 100644
index 000000000000..1701ddf89f7d
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/SigneeView/index.tsx
@@ -0,0 +1,28 @@
+import { ActionCard, Box, Text } from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import { m } from '../../../lib/messages'
+
+const SigneeView = () => {
+  const { formatMessage } = useLocale()
+
+  return (
+    <Box>
+      <Text marginBottom={3} variant="h4">
+        {formatMessage(m.mySigneeListsHeader)}
+      </Text>
+      <ActionCard
+        backgroundColor="white"
+        heading={'Listi A - Reykjavík norður'}
+        eyebrow={'Skrifað undir: 07.04.2024'}
+        text={formatMessage(m.parliamentaryElectionsTitle)}
+        tag={{
+          label: formatMessage(m.collectionClosed),
+          variant: 'red',
+          outlined: true,
+        }}
+      />
+    </Box>
+  )
+}
+
+export default SigneeView
diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx
new file mode 100644
index 000000000000..3ae328e2972a
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx
@@ -0,0 +1,26 @@
+import { Box } from '@island.is/island-ui/core'
+import { useLocale } from '@island.is/localization'
+import { IntroHeader, THJODSKRA_SLUG } from '@island.is/service-portal/core'
+import { m } from '../../lib/messages'
+import OwnerView from './OwnerView'
+import SigneeView from './SigneeView'
+
+const SignatureListsParliamentary = () => {
+  const { formatMessage } = useLocale()
+
+  return (
+    <Box>
+      <Box display={'flex'}>
+        <IntroHeader
+          title={formatMessage(m.pageTitleParliamentary)}
+          intro={formatMessage(m.pageDescriptionParliamentary)}
+          serviceProviderTooltip={formatMessage(m.infoProviderTooltip)}
+          serviceProviderSlug={THJODSKRA_SLUG}
+        />
+      </Box>
+      <OwnerView />
+    </Box>
+  )
+}
+
+export default SignatureListsParliamentary
diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx
new file mode 100644
index 000000000000..3a3611e77ef8
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx
@@ -0,0 +1,86 @@
+import { Box, Button, Text, toast } from '@island.is/island-ui/core'
+import { useLocale, useNamespaces } from '@island.is/localization'
+import { m } from '../../../../lib/messages'
+import { Modal } from '@island.is/service-portal/core'
+import { useState } from 'react'
+import { useGetListsForUser, useIsOwner } from '../../../../hooks'
+import { useMutation } from '@apollo/client'
+import { cancelCollectionMutation } from '../../../../hooks/graphql/mutations'
+import { SignatureCollectionSuccess } from '@island.is/api/schema'
+
+const CancelCollection = ({ collectionId }: { collectionId: string }) => {
+  useNamespaces('sp.signatureCollection')
+  const { formatMessage } = useLocale()
+  const [modalIsOpen, setModalIsOpen] = useState(false)
+  const { refetchIsOwner } = useIsOwner()
+  const { refetchListsForUser } = useGetListsForUser(collectionId)
+  const [cancelCollection, { loading }] =
+    useMutation<SignatureCollectionSuccess>(cancelCollectionMutation, {
+      variables: { input: { collectionId: collectionId } },
+    })
+
+  const onCancelCollection = async () => {
+    await cancelCollection().then(({ data }) => {
+      if (
+        (
+          data as any as {
+            signatureCollectionCancel: SignatureCollectionSuccess
+          }
+        ).signatureCollectionCancel.success
+      ) {
+        toast.success(formatMessage(m.cancelCollectionModalToastSuccess))
+        setModalIsOpen(false)
+        refetchIsOwner()
+        refetchListsForUser()
+      } else {
+        toast.error(formatMessage(m.cancelCollectionModalToastError))
+        setModalIsOpen(false)
+      }
+    })
+  }
+
+  return (
+    <Box marginTop={8} display={'flex'} justifyContent={'center'}>
+      <Modal
+        id="cancelCollection"
+        isVisible={modalIsOpen}
+        toggleClose={false}
+        initialVisibility={false}
+        onCloseModal={() => setModalIsOpen(false)}
+        disclosure={
+          <Button
+            variant="text"
+            size="small"
+            colorScheme="destructive"
+            onClick={() => setModalIsOpen(true)}
+          >
+            {formatMessage(m.cancelCollectionButton)}
+          </Button>
+        }
+      >
+        <Text variant="h2" marginTop={[5, 0]}>
+          {formatMessage(m.cancelCollectionButton)}
+        </Text>
+        <Text variant="default" marginTop={2}>
+          {formatMessage(m.cancelCollectionModalMessage)}
+        </Text>
+        <Box
+          marginTop={[7, 10]}
+          marginBottom={5}
+          display="flex"
+          justifyContent="center"
+        >
+          <Button
+            onClick={() => onCancelCollection()}
+            loading={loading}
+            colorScheme="destructive"
+          >
+            {formatMessage(m.cancelCollectionModalConfirmButton)}
+          </Button>
+        </Box>
+      </Modal>
+    </Box>
+  )
+}
+
+export default CancelCollection
diff --git a/libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/signees.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx
similarity index 96%
rename from libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/signees.tsx
rename to libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx
index ac5de6697886..373949633eb3 100644
--- a/libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/signees.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx
@@ -6,14 +6,14 @@ import {
   FilterInput,
 } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../../lib/messages'
+import { m } from '../../../../lib/messages'
 import format from 'date-fns/format'
 import { useEffect, useState } from 'react'
 import * as styles from '../../styles.css'
-import { useGetListSignees } from '../../../hooks'
+import { useGetListSignees } from '../../../../hooks'
 import { useLocation } from 'react-router-dom'
 import { format as formatNationalId } from 'kennitala'
-import { SkeletonTable } from '../../skeletons'
+import { SkeletonTable } from '../../../../skeletons'
 import { SignatureCollectionSignature as Signature } from '@island.is/api/schema'
 
 const Signees = () => {
diff --git a/libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx
similarity index 93%
rename from libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/index.tsx
rename to libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx
index a31cd269968b..ee9601e8b986 100644
--- a/libs/service-portal/signature-collection/src/screens/CandidateView/ViewList/index.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx
@@ -1,10 +1,10 @@
 import { Box, Stack, Text } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../../lib/messages'
-import Signees from './signees'
+import { m } from '../../../../lib/messages'
 import { useLocation } from 'react-router-dom'
-import { useGetSignatureList } from '../../../hooks'
+import { useGetSignatureList } from '../../../../hooks'
 import format from 'date-fns/format'
+import Signees from './SigneesOverview'
 
 const ViewList = () => {
   useNamespaces('sp.signatureCollection')
diff --git a/libs/service-portal/signature-collection/src/screens/CandidateView/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/index.tsx
similarity index 91%
rename from libs/service-portal/signature-collection/src/screens/CandidateView/index.tsx
rename to libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/index.tsx
index a8bbb9a0471f..197461ab20b4 100644
--- a/libs/service-portal/signature-collection/src/screens/CandidateView/index.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/index.tsx
@@ -7,20 +7,19 @@ import {
   toast,
 } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../lib/messages'
-import { SignatureCollectionPaths } from '../../lib/paths'
-import { IntroHeader } from '@island.is/service-portal/core'
+import { m } from '../../../lib/messages'
+import { SignatureCollectionPaths } from '../../../lib/paths'
 import CancelCollection from './CancelCollection'
-import { useGetListsForOwner } from '../../hooks'
+import { useGetListsForOwner } from '../../../hooks'
 import format from 'date-fns/format'
-import { Skeleton } from '../skeletons'
+import { Skeleton } from '../../../skeletons'
 import { useNavigate } from 'react-router-dom'
 import { useAuth } from '@island.is/auth/react'
 import copyToClipboard from 'copy-to-clipboard'
-import SignedList from '../../components/SignedList'
+import SignedList from '../SignedList'
 import { SignatureCollection } from '@island.is/api/schema'
 
-const CandidateView = ({
+const OwnerView = ({
   currentCollection,
 }: {
   currentCollection: SignatureCollection
@@ -35,10 +34,6 @@ const CandidateView = ({
 
   return (
     <Box>
-      <IntroHeader
-        title={formatMessage(m.pageTitle)}
-        intro={formatMessage(m.pageDescription)}
-      />
       {!loadingOwnerLists && !!currentCollection ? (
         <Box>
           {listsForOwner?.length === 0 && currentCollection.isActive && (
@@ -158,4 +153,4 @@ const CandidateView = ({
   )
 }
 
-export default CandidateView
+export default OwnerView
diff --git a/libs/service-portal/signature-collection/src/components/SignedList/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/SignedList/index.tsx
similarity index 96%
rename from libs/service-portal/signature-collection/src/components/SignedList/index.tsx
rename to libs/service-portal/signature-collection/src/screens/Presidential/SignedList/index.tsx
index cb732907cdca..410d4f148153 100644
--- a/libs/service-portal/signature-collection/src/components/SignedList/index.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/SignedList/index.tsx
@@ -1,12 +1,12 @@
 import { ActionCard, Box, Button, Text, toast } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../lib/messages'
+import { m } from '../../../lib/messages'
 import { Modal } from '@island.is/service-portal/core'
 import { useState } from 'react'
-import { useGetSignedList } from '../../hooks'
+import { useGetSignedList } from '../../../hooks'
 import format from 'date-fns/format'
 import { useMutation } from '@apollo/client'
-import { unSignList } from '../../hooks/graphql/mutations'
+import { unSignList } from '../../../hooks/graphql/mutations'
 import {
   SignatureCollectionSignedList,
   SignatureCollectionSuccess,
diff --git a/libs/service-portal/signature-collection/src/screens/SigneeView/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/SigneeView/index.tsx
similarity index 91%
rename from libs/service-portal/signature-collection/src/screens/SigneeView/index.tsx
rename to libs/service-portal/signature-collection/src/screens/Presidential/SigneeView/index.tsx
index 8ac5c06e46e8..b8e97a633d7d 100644
--- a/libs/service-portal/signature-collection/src/screens/SigneeView/index.tsx
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/SigneeView/index.tsx
@@ -7,15 +7,15 @@ import {
   Text,
 } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
-import { m } from '../../lib/messages'
 import { EmptyState, IntroHeader } from '@island.is/service-portal/core'
-import { useGetListsForUser, useGetSignedList } from '../../hooks'
+import { useGetListsForUser, useGetSignedList } from '../../../hooks'
 import format from 'date-fns/format'
-import { Skeleton } from '../skeletons'
-import SignedList from '../../components/SignedList'
+import { Skeleton } from '../../../skeletons'
 import { useAuth } from '@island.is/auth/react'
-import { SignatureCollection } from '../../types/schema'
 import { sortAlpha } from '@island.is/shared/utils'
+import { m } from '../../../lib/messages'
+import SignedList from '../SignedList'
+import { SignatureCollection } from '../../../types/schema'
 
 const SigneeView = ({
   currentCollection,
@@ -33,10 +33,6 @@ const SigneeView = ({
 
   return (
     <Box>
-      <IntroHeader
-        title={formatMessage(m.pageTitle)}
-        intro={formatMessage(m.pageDescriptionSignee)}
-      />
       {!user?.profile.actor && !loadingSignedLists && !loadingUserLists ? (
         <Box>
           {currentCollection?.isActive && (
diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/index.tsx b/libs/service-portal/signature-collection/src/screens/Presidential/index.tsx
new file mode 100644
index 000000000000..f8e427108044
--- /dev/null
+++ b/libs/service-portal/signature-collection/src/screens/Presidential/index.tsx
@@ -0,0 +1,44 @@
+import { Box } from '@island.is/island-ui/core'
+import { useLocale, useNamespaces } from '@island.is/localization'
+import SigneeView from './SigneeView'
+import OwnerView from './OwnerView'
+import { useGetCurrentCollection, useIsOwner } from '../../hooks'
+import { EmptyState, IntroHeader } from '@island.is/service-portal/core'
+import { m } from '../../lib/messages'
+import { CollectionType } from '../../lib/constants'
+
+const SignatureLists = () => {
+  useNamespaces('sp.signatureCollection')
+  const { formatMessage } = useLocale()
+
+  const { isOwner, loadingIsOwner } = useIsOwner()
+  const { currentCollection, loadingCurrentCollection } =
+    useGetCurrentCollection()
+
+  return (
+    <Box>
+      <IntroHeader
+        title={formatMessage(m.pageTitle)}
+        intro={formatMessage(m.pageDescriptionSignee)}
+      />
+      {currentCollection?.name === CollectionType.Presidential &&
+      !loadingIsOwner &&
+      !loadingCurrentCollection ? (
+        <Box>
+          {isOwner.success ? (
+            <OwnerView currentCollection={currentCollection} />
+          ) : (
+            <SigneeView currentCollection={currentCollection} />
+          )}
+        </Box>
+      ) : (
+        <EmptyState
+          title={m.noCollectionIsActive}
+          description={m.noCollectionIsActiveDescription}
+        />
+      )}
+    </Box>
+  )
+}
+
+export default SignatureLists
diff --git a/libs/service-portal/signature-collection/src/screens/styles.css.ts b/libs/service-portal/signature-collection/src/screens/Presidential/styles.css.ts
similarity index 100%
rename from libs/service-portal/signature-collection/src/screens/styles.css.ts
rename to libs/service-portal/signature-collection/src/screens/Presidential/styles.css.ts
diff --git a/libs/service-portal/signature-collection/src/screens/index.tsx b/libs/service-portal/signature-collection/src/screens/index.tsx
deleted file mode 100644
index ef4a7aa41268..000000000000
--- a/libs/service-portal/signature-collection/src/screens/index.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Box } from '@island.is/island-ui/core'
-import { useNamespaces } from '@island.is/localization'
-import OwnerView from './CandidateView'
-import SigneeView from './SigneeView'
-import { useGetCurrentCollection, useIsOwner } from '../hooks'
-
-const SignatureLists = () => {
-  useNamespaces('sp.signatureCollection')
-
-  const { isOwner, loadingIsOwner } = useIsOwner()
-  const { currentCollection, loadingCurrentCollection } =
-    useGetCurrentCollection()
-
-  return (
-    <div>
-      {!loadingIsOwner && !loadingCurrentCollection && (
-        <Box>
-          {isOwner.success ? (
-            <OwnerView currentCollection={currentCollection} />
-          ) : (
-            <SigneeView currentCollection={currentCollection} />
-          )}
-        </Box>
-      )}
-    </div>
-  )
-}
-
-export default SignatureLists
diff --git a/libs/service-portal/signature-collection/src/screens/skeletons.tsx b/libs/service-portal/signature-collection/src/skeletons.tsx
similarity index 100%
rename from libs/service-portal/signature-collection/src/screens/skeletons.tsx
rename to libs/service-portal/signature-collection/src/skeletons.tsx
diff --git a/libs/service-portal/social-insurance-maintenance/codegen.yml b/libs/service-portal/social-insurance-maintenance/codegen.yml
index 79abfb2b210f..8de3c0bb4cbc 100644
--- a/libs/service-portal/social-insurance-maintenance/codegen.yml
+++ b/libs/service-portal/social-insurance-maintenance/codegen.yml
@@ -10,6 +10,9 @@ generates:
     plugins:
       - typescript-operations
       - typescript-react-apollo
+    config:
+      scalars:
+        DateTime: string
 hooks:
   afterAllFileWrite:
     - prettier --write
diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/messages.ts b/libs/service-portal/social-insurance-maintenance/src/lib/messages.ts
index 792caf1c387b..3cbf39c1838d 100644
--- a/libs/service-portal/social-insurance-maintenance/src/lib/messages.ts
+++ b/libs/service-portal/social-insurance-maintenance/src/lib/messages.ts
@@ -22,6 +22,33 @@ export const m = defineMessages({
     id: 'sp.social-insurance-maintenance:payment-plan',
     defaultMessage: 'Greiðsluáætlun',
   },
+  incomePlan: {
+    id: 'sp.social-insurance-maintenance:income-plan',
+    defaultMessage: 'Tekjuáætlun',
+  },
+  incomePlanDetail: {
+    id: 'sp.social-insurance-maintenance:income-plan-detail',
+    defaultMessage:
+      'Hér fyrir neðan er yfirlit yfir þá tekjuáætlun sem er í gildi. Ef þú óskar eftir því að breyta henni þarftu að velja ‘breyta tekjuáætlun’.',
+  },
+  modifyIncomePlan: {
+    id: 'sp.social-insurance-maintenance:income-plan-modify',
+    defaultMessage: 'Breyta tekjuáætlun',
+  },
+  incomePlanModifyUnavailable: {
+    id: 'sp.social-insurance-maintenance:income-plan-modify-unavailable',
+    defaultMessage:
+      'Ekki er hægt að gera breytingar á tekjuáætlun sem stendur.',
+  },
+  incomePlanModifyUnavailableText: {
+    id: 'sp.social-insurance-maintenance:income-plan-modify-unavailable-text',
+    defaultMessage:
+      'Sorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vulputate libero et velit interdum, ac aliquet odio mattis.',
+  },
+  incomePlanModifyLink: {
+    id: 'sp.social-insurance-maintenance:income-plan-modify-link',
+    defaultMessage: 'umsoknir/tekjuaaetlun',
+  },
   paymentsReasoning: {
     id: 'sp.social-insurance-maintenance:payments-reasoning',
     defaultMessage: 'Forsendur greiðslna',
@@ -58,4 +85,41 @@ export const m = defineMessages({
     id: 'sp.social-insurance-maintenance:no-payment-history-found',
     defaultMessage: 'Engin greiðslusaga fannst',
   },
+  viewIncomePlan: {
+    id: 'sp.social-insurance-maintenance:view-income-plan',
+    defaultMessage: 'Skoða tekjuáætlun',
+  },
+  submitIncomePlan: {
+    id: 'sp.social-insurance-maintenance:submit-income-plan',
+    defaultMessage: 'Senda inn tekjuáætlun',
+  },
+  incomeType: {
+    id: 'sp.social-insurance-maintenance:income-type',
+    defaultMessage: 'Tekjutegund',
+  },
+  annualIncome: {
+    id: 'sp.social-insurance-maintenance:annual-income',
+    defaultMessage: 'Tekjur á ári',
+  },
+  currency: {
+    id: 'sp.social-insurance-maintenance:currency',
+    defaultMessage: 'Gjaldmiðill',
+  },
+  receivedInProgress: {
+    id: 'sp.social-insurance-maintenance:received-in-progress',
+    defaultMessage: 'Móttekið til vinnslu',
+  },
+  noActiveIncomePlan: {
+    id: 'sp.social-insurance-maintenance:no-active-income-plan',
+    defaultMessage: 'Engin gild tekjuáætlun',
+  },
+  incomePlanLink: {
+    id: 'sp.social-insurance-maintenance:income-plan-link',
+    defaultMessage:
+      'https://island.is/tekjuaaetlun-tr-upplysingar-um-tekjur-lifeyristhega',
+  },
+  incomePlanLinkText: {
+    id: 'sp.social-insurance-maintenance:income-plan-link-text',
+    defaultMessage: 'Hvað er tekjuáætlun?',
+  },
 })
diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts b/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts
index 256c616fc391..acb14d6604f3 100644
--- a/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts
+++ b/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts
@@ -27,5 +27,16 @@ export const socialInsuranceMaintenanceNavigation: PortalNavigationItem = {
         },
       ],
     },
+    {
+      name: m.incomePlan,
+      path: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlan,
+      children: [
+        {
+          name: m.latestIncomePlan,
+          path: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlanDetail,
+          navHide: true,
+        },
+      ],
+    },
   ],
 }
diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/paths.ts b/libs/service-portal/social-insurance-maintenance/src/lib/paths.ts
index ab88276c420c..99a837e1d464 100644
--- a/libs/service-portal/social-insurance-maintenance/src/lib/paths.ts
+++ b/libs/service-portal/social-insurance-maintenance/src/lib/paths.ts
@@ -2,4 +2,6 @@ export enum SocialInsuranceMaintenancePaths {
   SocialInsuranceMaintenanceRoot = '/framfaersla',
   SocialInsuranceMaintenancePaymentPlan = '/framfaersla/greidsluaetlun',
   SocialInsuranceMaintenancePaymentsReasoning = '/framfaersla/forsendur-greidslna',
+  SocialInsuranceMaintenanceIncomePlan = '/framfaersla/tekjuaaetlun',
+  SocialInsuranceMaintenanceIncomePlanDetail = '/framfaersla/tekjuaaetlun/nuverandi',
 }
diff --git a/libs/service-portal/social-insurance-maintenance/src/module.tsx b/libs/service-portal/social-insurance-maintenance/src/module.tsx
index b58e7239e6d4..e787c708ee27 100644
--- a/libs/service-portal/social-insurance-maintenance/src/module.tsx
+++ b/libs/service-portal/social-insurance-maintenance/src/module.tsx
@@ -9,6 +9,14 @@ const SocialInsuranceMaintenancePaymentPlan = lazy(() =>
   import('./screens/PaymentPlan/PaymentPlan'),
 )
 
+const SocialInsuranceMaintenanceIncomePlan = lazy(() =>
+  import('./screens/IncomePlan/IncomePlan'),
+)
+
+const SocialInsuranceMaintenanceIncomePlanDetail = lazy(() =>
+  import('./screens/IncomePlanDetail/IncomePlanDetail'),
+)
+
 export const socialInsuranceMaintenanceModule: PortalModule = {
   name: 'Framfærsla',
   enabled: ({ isCompany }) => !isCompany,
@@ -34,5 +42,19 @@ export const socialInsuranceMaintenanceModule: PortalModule = {
       key: 'SocialInsurance',
       element: <SocialInsuranceMaintenancePaymentPlan />,
     },
+    {
+      name: m.incomePlan,
+      path: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlan,
+      enabled: userInfo.scopes.includes(ApiScope.internal),
+      key: 'SocialInsuranceIncomePlan',
+      element: <SocialInsuranceMaintenanceIncomePlan />,
+    },
+    {
+      name: m.incomePlanDetail,
+      path: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlanDetail,
+      enabled: userInfo.scopes.includes(ApiScope.internal),
+      key: 'SocialInsuranceIncomePlan',
+      element: <SocialInsuranceMaintenanceIncomePlanDetail />,
+    },
   ],
 }
diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql
new file mode 100644
index 000000000000..8566f2ac89ea
--- /dev/null
+++ b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql
@@ -0,0 +1,10 @@
+query getIncomePlan {
+  socialInsuranceIncomePlan {
+    isEligibleForChange {
+      isEligible
+      reason
+    }
+    registrationDate
+    status
+  }
+}
diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx
new file mode 100644
index 000000000000..805af9dd9587
--- /dev/null
+++ b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx
@@ -0,0 +1,191 @@
+import { AlertMessage, Box, Inline, Stack } from '@island.is/island-ui/core'
+import {
+  FormatMessage,
+  useLocale,
+  useNamespaces,
+} from '@island.is/localization'
+import {
+  ActionCard,
+  CardLoader,
+  FootNote,
+  IntroHeader,
+  LinkButton,
+  m as coreMessages,
+  formatDate,
+} from '@island.is/service-portal/core'
+import { m } from '../../lib/messages'
+import { Problem } from '@island.is/react-spa/shared'
+import { SocialInsuranceMaintenancePaths } from '../../lib/paths'
+import { useGetIncomePlanQuery } from './IncomePlan.generated'
+import { SocialInsuranceIncomePlanStatus } from '@island.is/api/schema'
+
+const parseSubtext = (
+  tag: SocialInsuranceIncomePlanStatus,
+  date: Date,
+  formatMessage: FormatMessage,
+) => {
+  switch (tag) {
+    case SocialInsuranceIncomePlanStatus.ACCEPTED:
+      return `${formatMessage(coreMessages.approved)}: ${formatDate(date)}`
+    case SocialInsuranceIncomePlanStatus.IN_PROGRESS:
+      return `${formatMessage(m.receivedInProgress)}: ${formatDate(date)}`
+    case SocialInsuranceIncomePlanStatus.CANCELLED:
+      return `${formatMessage(coreMessages.rejected)}: ${formatDate(date)}`
+    default:
+      return
+  }
+}
+
+const parseTag = (
+  tag: SocialInsuranceIncomePlanStatus,
+  formatMessage: FormatMessage,
+) => {
+  switch (tag) {
+    case SocialInsuranceIncomePlanStatus.ACCEPTED:
+      return {
+        label: formatMessage(coreMessages.processed),
+        variant: 'mint' as const,
+        outlined: false,
+      }
+    case SocialInsuranceIncomePlanStatus.IN_PROGRESS:
+      return {
+        label: formatMessage(coreMessages.inProgress),
+        variant: 'purple' as const,
+        outlined: false,
+      }
+    case SocialInsuranceIncomePlanStatus.CANCELLED:
+      return {
+        label: formatMessage(coreMessages.rejected),
+        variant: 'red' as const,
+        outlined: false,
+      }
+    default:
+      return {
+        label: formatMessage(coreMessages.unknown),
+        variant: 'red' as const,
+        outlined: false,
+      }
+  }
+}
+
+const IncomePlan = () => {
+  useNamespaces('sp.social-insurance-maintenance')
+  const { formatMessage } = useLocale()
+
+  const { data, loading, error } = useGetIncomePlanQuery()
+
+  return (
+    <Box>
+      <IntroHeader
+        title={formatMessage(coreMessages.incomePlan)}
+        intro={formatMessage(coreMessages.incomePlanDescription)}
+        serviceProviderSlug={'tryggingastofnun'}
+        serviceProviderTooltip={formatMessage(
+          coreMessages.socialInsuranceTooltip,
+        )}
+      />
+
+      {error && !loading ? (
+        <Problem error={error} noBorder={false} />
+      ) : loading ? (
+        <Box marginBottom={2}>
+          <CardLoader />
+        </Box>
+      ) : (
+        <Stack space={2}>
+          {!error &&
+            !loading &&
+            data?.socialInsuranceIncomePlan &&
+            !data?.socialInsuranceIncomePlan?.isEligibleForChange
+              .isEligible && (
+              <AlertMessage
+                type="info"
+                title={formatMessage(m.incomePlanModifyUnavailable)}
+                message={formatMessage(m.incomePlanModifyUnavailableText)}
+              />
+            )}
+          <Inline space={2}>
+            <LinkButton
+              to={formatMessage(m.incomePlanLink)}
+              text={formatMessage(m.incomePlanLinkText)}
+              icon="open"
+              variant="utility"
+            />
+            {data?.socialInsuranceIncomePlan && (
+              <LinkButton
+                to={`${document.location.origin}/${formatMessage(
+                  m.incomePlanModifyLink,
+                )}`}
+                text={formatMessage(m.modifyIncomePlan)}
+                disabled={
+                  !data?.socialInsuranceIncomePlan?.isEligibleForChange
+                    .isEligible
+                }
+                icon="open"
+                variant="primary"
+                size="small"
+              />
+            )}
+          </Inline>
+          {data?.socialInsuranceIncomePlan ? (
+            <ActionCard
+              image={{
+                type: 'image',
+                url: './assets/images/tr.svg',
+              }}
+              text={
+                data?.socialInsuranceIncomePlan?.status &&
+                data?.socialInsuranceIncomePlan.registrationDate
+                  ? parseSubtext(
+                      data.socialInsuranceIncomePlan?.status,
+                      new Date(data.socialInsuranceIncomePlan.registrationDate),
+                      formatMessage,
+                    )
+                  : undefined
+              }
+              heading={formatMessage(coreMessages.incomePlan)}
+              cta={{
+                label: formatMessage(m.viewIncomePlan),
+                url: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlanDetail,
+                variant: 'text',
+              }}
+              tag={
+                data?.socialInsuranceIncomePlan?.status
+                  ? parseTag(
+                      data.socialInsuranceIncomePlan?.status,
+                      formatMessage,
+                    )
+                  : undefined
+              }
+            />
+          ) : (
+            <ActionCard
+              image={{
+                type: 'image',
+                url: './assets/images/tr.svg',
+              }}
+              text={formatMessage(m.noActiveIncomePlan)}
+              headingColor="currentColor"
+              heading={formatMessage(coreMessages.incomePlan)}
+              backgroundColor="blue"
+              borderColor="blue200"
+              cta={{
+                label: formatMessage(m.submitIncomePlan),
+                url: `${document.location.origin}/${formatMessage(
+                  m.incomePlanModifyLink,
+                )}`,
+                variant: 'primary',
+                size: 'medium',
+                icon: 'open',
+                centered: true,
+              }}
+            />
+          )}
+        </Stack>
+      )}
+      <FootNote serviceProviderSlug="tryggingastofnun" />
+    </Box>
+  )
+}
+
+export default IncomePlan
diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql
new file mode 100644
index 000000000000..ec6c8750b52d
--- /dev/null
+++ b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql
@@ -0,0 +1,13 @@
+query getIncomePlanDetail {
+  socialInsuranceIncomePlan {
+    isEligibleForChange {
+      isEligible
+      reason
+    }
+    incomeCategories {
+      name
+      annualSum
+      currency
+    }
+  }
+}
diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx
new file mode 100644
index 000000000000..815d0ca2a838
--- /dev/null
+++ b/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx
@@ -0,0 +1,127 @@
+import {
+  Box,
+  Inline,
+  Stack,
+  Button,
+  Table as T,
+  Hidden,
+  AlertMessage,
+} from '@island.is/island-ui/core'
+import { useLocale, useNamespaces } from '@island.is/localization'
+import {
+  EmptyTable,
+  FootNote,
+  IntroHeader,
+  LinkButton,
+  amountFormat,
+  m as coreMessages,
+} from '@island.is/service-portal/core'
+import { m } from '../../lib/messages'
+import { useGetIncomePlanDetailQuery } from './IncomePlanDetail.generated'
+import { Problem } from '@island.is/react-spa/shared'
+
+const IncomePlanDetail = () => {
+  useNamespaces('sp.social-insurance-maintenance')
+  const { formatMessage } = useLocale()
+
+  const { data, loading, error } = useGetIncomePlanDetailQuery()
+  return (
+    <Box>
+      <IntroHeader
+        title={formatMessage(coreMessages.latestIncomePlan)}
+        intro={formatMessage(m.incomePlanDetail)}
+        serviceProviderSlug={'tryggingastofnun'}
+        serviceProviderTooltip={formatMessage(
+          coreMessages.socialInsuranceTooltip,
+        )}
+      />
+
+      {error && !loading ? (
+        <Problem error={error} noBorder={false} />
+      ) : !error && !loading && !data?.socialInsuranceIncomePlan ? (
+        <Problem
+          type="no_data"
+          noBorder={false}
+          title={formatMessage(coreMessages.noData)}
+          message={formatMessage(coreMessages.noDataFoundDetail)}
+          imgSrc="./assets/images/sofa.svg"
+        />
+      ) : (
+        <Stack space={2}>
+          <Hidden print>
+            {!loading &&
+              !error &&
+              !data?.socialInsuranceIncomePlan?.isEligibleForChange
+                .isEligible && (
+                <AlertMessage
+                  type="info"
+                  title={formatMessage(m.incomePlanModifyUnavailable)}
+                  message={formatMessage(m.incomePlanModifyUnavailableText)}
+                />
+              )}
+          </Hidden>
+          <Hidden print>
+            <Inline space={2}>
+              <Button
+                variant="utility"
+                size="small"
+                onClick={() => window.print()}
+                icon="print"
+                iconType="filled"
+              >
+                {formatMessage(coreMessages.print)}
+              </Button>
+              <LinkButton
+                to={`${document.location.origin}/${formatMessage(
+                  m.incomePlanModifyLink,
+                )}`}
+                text={formatMessage(m.modifyIncomePlan)}
+                disabled={
+                  !data?.socialInsuranceIncomePlan?.isEligibleForChange
+                    .isEligible
+                }
+                icon="open"
+                variant="primary"
+                size="small"
+              />
+            </Inline>
+          </Hidden>
+          <T.Table>
+            <T.Head>
+              <T.Row>
+                <T.HeadData>{formatMessage(m.incomeType)}</T.HeadData>
+                <T.HeadData>{formatMessage(m.annualIncome)}</T.HeadData>
+                <T.HeadData>{formatMessage(m.currency)}</T.HeadData>
+              </T.Row>
+            </T.Head>
+            <T.Body>
+              {data?.socialInsuranceIncomePlan &&
+                !loading &&
+                !error &&
+                data.socialInsuranceIncomePlan.incomeCategories.map(
+                  (category, index) => (
+                    <T.Row key={index}>
+                      <T.Data>{category.name}</T.Data>
+                      <T.Data>{amountFormat(category.annualSum)}</T.Data>
+                      <T.Data>{category.currency}</T.Data>
+                    </T.Row>
+                  ),
+                )}
+            </T.Body>
+          </T.Table>
+          {!data?.socialInsuranceIncomePlan?.incomeCategories && (
+            <EmptyTable
+              loading={loading}
+              message={formatMessage(m.noPaymentsFound)}
+            />
+          )}
+        </Stack>
+      )}
+      <Hidden print>
+        <FootNote serviceProviderSlug="tryggingastofnun" />
+      </Hidden>
+    </Box>
+  )
+}
+
+export default IncomePlanDetail
diff --git a/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/GeneralPetitionLists.tsx b/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/GeneralPetitionLists.tsx
index 783870340d77..b295d701dc2b 100644
--- a/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/GeneralPetitionLists.tsx
+++ b/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/GeneralPetitionLists.tsx
@@ -1,4 +1,4 @@
-import { Box, Text, Stack, ActionCard, Button } from '@island.is/island-ui/core'
+import { Box, Text, Stack, ActionCard } from '@island.is/island-ui/core'
 import { useRouter } from 'next/router'
 import { useGetPetitionLists } from './useGetPetitionLists'
 import format from 'date-fns/format'
@@ -18,53 +18,22 @@ const formatDate = (date: string) => {
   }
 }
 
-const getBaseUrl = () => {
-  const baseUrl =
-    window.location.origin === 'http://localhost:4200'
-      ? 'http://localhost:4242'
-      : window.location.origin
-
-  return `${baseUrl}/umsoknir/undirskriftalisti`
-}
-
 export const GeneralPetitionLists: FC<
   React.PropsWithChildren<GeneralPetitionProps>
 > = ({ slice }) => {
   const router = useRouter()
-  const {
-    data: petitionLists,
-    loading: petitionLoading,
-    error: petitionError,
-    loadNextPage,
-    loadPreviousPage,
-    pageInfo: petitionPageInfo,
-  } = useGetPetitionLists()
+  const { data: petitionLists, loading } = useGetPetitionLists()
   const t = useLocalization(slice.json)
 
   return (
-    <>
-      <Box marginY={5}>
-        <ActionCard
-          heading={t('createList', 'Stofna undirskriftalista')}
-          backgroundColor="blue"
-          cta={{
-            label: t('logIn', 'Innskráning'),
-            variant: 'primary',
-            icon: 'open',
-            iconType: 'outline',
-            size: 'small',
-            onClick: () => window.open(getBaseUrl(), '_blank'),
-          }}
-        />
-      </Box>
+    <Box>
       {petitionLists?.length > 0 && (
         <Box marginTop={10} marginBottom={3}>
           <Text variant="h4">{t('title', 'Virkir listar')}</Text>
         </Box>
       )}
-      <Stack space={4}>
-        {!petitionLoading &&
-          !petitionError &&
+      <Stack space={3}>
+        {!loading &&
           petitionLists?.map((petition: EndorsementList) => {
             return (
               <ActionCard
@@ -88,23 +57,7 @@ export const GeneralPetitionLists: FC<
             )
           })}
       </Stack>
-      <Box display="flex" justifyContent="center" marginTop={5}>
-        {petitionPageInfo?.hasPreviousPage ? (
-          <Box marginRight={2}>
-            <Button variant="ghost" size="small" onClick={loadPreviousPage}>
-              {t('previous', 'Fyrri síða')}
-            </Button>
-          </Box>
-        ) : undefined}
-        {petitionPageInfo?.hasNextPage ? (
-          <Box marginLeft={2}>
-            <Button variant="ghost" size="small" onClick={loadNextPage}>
-              {t('next', 'Næsta síða')}
-            </Button>
-          </Box>
-        ) : undefined}
-      </Box>
-    </>
+    </Box>
   )
 }
 
diff --git a/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/useGetPetitionLists.ts b/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/useGetPetitionLists.ts
index 58b075179ef7..279449d7e405 100644
--- a/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/useGetPetitionLists.ts
+++ b/libs/shared/connected/src/lib/generalPetition/GeneralPetitionLists/useGetPetitionLists.ts
@@ -1,6 +1,5 @@
 import gql from 'graphql-tag'
 import { useQuery } from '@apollo/client'
-import { useState } from 'react'
 
 const GetGeneralPetitionLists = gql`
   query endorsementSystemGetGeneralPetitionLists(
@@ -30,71 +29,17 @@ const GetGeneralPetitionLists = gql`
 `
 
 export const useGetPetitionLists = () => {
-  const [pagination, setPagination] = useState({ after: '', before: '' })
-  const { data, loading, error, fetchMore } = useQuery(
-    GetGeneralPetitionLists,
-    {
-      variables: {
-        input: {
-          tags: 'generalPetition',
-          after: pagination.after,
-          before: pagination.before,
-          limit: 10,
-        },
+  const { data, loading } = useQuery(GetGeneralPetitionLists, {
+    variables: {
+      input: {
+        tags: 'generalPetition',
+        limit: 1000,
       },
     },
-  )
-
-  const loadNextPage = () => {
-    if (data?.endorsementSystemGetGeneralPetitionLists.pageInfo.hasNextPage) {
-      setPagination({
-        ...pagination,
-        after: data.endorsementSystemGetGeneralPetitionLists.pageInfo.endCursor,
-        before: '',
-      })
-      fetchMore({
-        variables: {
-          input: {
-            tags: 'generalPetition',
-            limit: 10,
-            after:
-              data.endorsementSystemGetGeneralPetitionLists.pageInfo.endCursor,
-          },
-        },
-      })
-    }
-  }
-
-  const loadPreviousPage = () => {
-    if (
-      data?.endorsementSystemGetGeneralPetitionLists.pageInfo.hasPreviousPage
-    ) {
-      setPagination({
-        ...pagination,
-        after: '',
-        before:
-          data.endorsementSystemGetGeneralPetitionLists.pageInfo.startCursor,
-      })
-      fetchMore({
-        variables: {
-          input: {
-            tags: 'generalPetition',
-            limit: 10,
-            before:
-              data.endorsementSystemGetGeneralPetitionLists.pageInfo
-                .startCursor,
-          },
-        },
-      })
-    }
-  }
+  })
 
   return {
     data: data?.endorsementSystemGetGeneralPetitionLists?.data ?? [],
     loading,
-    error,
-    loadNextPage,
-    loadPreviousPage,
-    pageInfo: data?.endorsementSystemGetGeneralPetitionLists.pageInfo,
   }
 }
diff --git a/libs/shared/form-fields/src/lib/InputController/InputController.tsx b/libs/shared/form-fields/src/lib/InputController/InputController.tsx
index b57cc5163b52..05186a5d6be0 100644
--- a/libs/shared/form-fields/src/lib/InputController/InputController.tsx
+++ b/libs/shared/form-fields/src/lib/InputController/InputController.tsx
@@ -40,6 +40,8 @@ interface Props {
   size?: 'xs' | 'sm' | 'md'
   autoComplete?: 'off' | 'on'
   inputMode?: InputProps['inputMode']
+  max?: number
+  min?: number
 }
 
 interface ChildParams {
@@ -84,6 +86,8 @@ export const InputController = forwardRef(
       autoComplete,
       thousandSeparator,
       inputMode,
+      max,
+      min,
     } = props
     const renderChildInput = (c: ChildParams & TestSupport) => {
       const { value, onChange, ...props } = c
@@ -149,6 +153,8 @@ export const InputController = forwardRef(
             autoComplete={autoComplete}
             loading={loading}
             inputMode={inputMode}
+            max={max}
+            min={min}
             onChange={(
               e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
             ) => {
@@ -238,6 +244,8 @@ export const InputController = forwardRef(
             rows={rows}
             size={size}
             ref={ref}
+            min={min}
+            max={max}
             {...props}
           />
         )
diff --git a/libs/shared/types/src/lib/aws-elasticsearch-connector.d.ts b/libs/shared/types/src/lib/aws-elasticsearch-connector.d.ts
new file mode 100644
index 000000000000..982bac1eed8d
--- /dev/null
+++ b/libs/shared/types/src/lib/aws-elasticsearch-connector.d.ts
@@ -0,0 +1,13 @@
+declare module 'aws-elasticsearch-connector' {
+  import { Connection, Transport } from '@elastic/elasticsearch'
+  import AWS from 'aws-sdk'
+
+  export type Connector = {
+    Connection: typeof Connection
+    Transport: typeof Transport
+  }
+
+  export const ConnectorFactory: (awsConfig: AWS.Config) => Connector
+
+  export default ConnectorFactory
+}
diff --git a/libs/testing/containers/src/lib/testing-containers.ts b/libs/testing/containers/src/lib/testing-containers.ts
index 96d1dbdc512d..8423f7a704be 100644
--- a/libs/testing/containers/src/lib/testing-containers.ts
+++ b/libs/testing/containers/src/lib/testing-containers.ts
@@ -1,15 +1,13 @@
 import { GenericContainer, StartedTestContainer, Wait } from 'testcontainers'
 
 let postgresContainer: StartedTestContainer
-let redisClusterContainers: StartedTestContainer[]
+let redisClusterContainer: StartedTestContainer
 let localstackContainer: StartedTestContainer
 
 const portConfig = {
-  AWS: parseInt(process.env.AWS_PORT || '4566', 10),
+  SQS: parseInt(process.env.SQS_PORT || '4566', 10),
   postgres: parseInt(process.env.DB_PORT || '5432', 10),
-  redis: process.env.REDIS_PORT
-    ? [parseInt(process.env.REDIS_PORT, 10)]
-    : [6379],
+  redis: [7000, 7001, 7002, 7003, 7004, 7005],
 }
 
 const uniqueName = (name: string) => {
@@ -34,7 +32,6 @@ export const startPostgres = async () => {
       startPeriod: 1000,
     })
     .withWaitStrategy(Wait.forHealthCheck())
-    .withStartupTimeout(20000)
     .withExposedPorts(portConfig.postgres)
     .start()
 
@@ -43,49 +40,22 @@ export const startPostgres = async () => {
   process.env.DB_HOST = postgresContainer.getHost()
 }
 
-export const stopPostgres = async () => {
+export const stopPostgres = async (): Promise<void> => {
   await postgresContainer.stop()
 }
 
-export const startRedis = async () => {
-  redisClusterContainers = await Promise.all(
-    portConfig.redis.slice(1).map(async (port) => {
-      const node = await new GenericContainer(
-        'public.ecr.aws/bitnami/redis:7.0',
-      )
-        .withName(uniqueName('redis'))
-        .withEnv('REDIS_CLUSTER_CREATOR', 'yes')
-        .withExposedPorts(port)
-        .start()
-      process.env[`REDIS_${port}_PORT`] = node.getMappedPort(port).toString()
-      return node
-    }),
-  )
-
-  redisClusterContainers.push(
-    await new GenericContainer('public.ecr.aws/bitnami/redis:7.0')
-      .withName(uniqueName('redis'))
-      .withEnv('REDIS_CLUSTER_CREATOR', 'yes')
-      .withEnv('REDIS_CLUSTER_REPLICAS', '1')
-      .withEnv(
-        'REDIS_NODES',
-        JSON.stringify(redisClusterContainers.map((n) => n.getHost())),
-      )
-      .withEnv('IP', '0.0.0.0')
-      .withEnv('ALLOW_EMPTY_PASSWORD', 'yes')
-      .withEnv('REDIS_PORT_NUMBER', portConfig.redis[0].toString())
-      .withExposedPorts(...portConfig.redis)
-      .start(),
-  )
-  process.env.REDIS_NODES = JSON.stringify(
-    redisClusterContainers.map(
-      (n) => `${n.getHost()}:${n.getMappedPort(portConfig.redis[0])}`,
-    ),
+export const startRedisCluster = async () => {
+  redisClusterContainer = await new GenericContainer(
+    'public.ecr.aws/bitnami/redis-cluster:5.0.14',
   )
+    .withName(uniqueName('redis'))
+    .withEnv('IP', '0.0.0.0')
+    .withExposedPorts(...portConfig.redis)
+    .start()
 }
 
 export const stopRedis = () => {
-  redisClusterContainers.map((c) => c.stop())
+  redisClusterContainer.stop()
 }
 
 export const startLocalstack = async () => {
@@ -93,15 +63,13 @@ export const startLocalstack = async () => {
     'public.ecr.aws/localstack/localstack:3',
   )
     .withName(uniqueName('localstack'))
-    .withExposedPorts(portConfig.AWS)
+    .withExposedPorts(portConfig.SQS)
     .withWaitStrategy(Wait.forLogMessage('Ready.'))
     .start()
 
-  process.env.AWS_ENDPOINT = `http://${localstackContainer.getHost()}:${localstackContainer.getMappedPort(
-    portConfig.AWS,
+  process.env.SQS_ENDPOINT = `http://${localstackContainer.getHost()}:${localstackContainer.getMappedPort(
+    portConfig.SQS,
   )}`
-  process.env.SQS_ENDPOINT = process.env.AWS_ENDPOINT
-  process.env.AWS_REGION = 'eu-west-1'
 }
 
 export const stopLocalstack = async () => {
diff --git a/libs/university-gateway/src/lib/model/application.ts b/libs/university-gateway/src/lib/model/application.ts
index 3b927eab4870..4fd7058e4c1a 100644
--- a/libs/university-gateway/src/lib/model/application.ts
+++ b/libs/university-gateway/src/lib/model/application.ts
@@ -51,7 +51,7 @@ export interface IApplicationWorkExperience {
 export interface IApplicationAttachment {
   fileName: string
   fileType: string
-  blob: Blob
+  url: string
 }
 
 export interface IApplicationExtraFields {
diff --git a/mocks/README.md b/mocks/README.md
new file mode 100644
index 000000000000..dc1c442dbcf8
--- /dev/null
+++ b/mocks/README.md
@@ -0,0 +1,29 @@
+# Mocking national registry XROAD endpoints
+
+## Prerequisites
+
+Since the mock will be listening on port `8081`, the port forwarding for xroad needs to be listening on port `8082` as that is where the mock server will forward requests it does not have mock responses for.
+
+To set the port forwarding to listen on port `8082` you can pass a port argument to the proxies script like so `yarn proxies xroad --p 8082`. Alternatively if you use kubectl and socat just replace `8081:80` with `8082:80`.
+
+## How to
+
+First you'll want to install [mockoon-cli](https://github.com/mockoon/mockoon/tree/main/packages/cli#installation), then you just call `mockoon-cli start --data <path to capture file>`. The capture file can be one you made yourself (see below) or one that has been checked in such as `national-registryv2.json` Mockoon will now start listening on port `8081` and proxying non-mocked traffic to port `8082`.
+
+For more in-depth instructions, you can check out the [mockoon site](https://mockoon.com/cli/).
+
+## Current mocks
+
+Currently, only a capture file for the accident notification form for Gervimaður Færeyjar on national registry V2 is included.
+
+## What if I need to call an endpoint that isn't mocked
+
+No problem, mockoon will transparently proxy whatever requests it does not have mocks for.
+
+## My calls aren't being mocked
+
+The mocks are currently set up for the Gervimaður Færeyjar fake person. If you need to mock other fake persons, you can download the [mockoon app](https://mockoon.com/download/) and either open the `national-registry.json` collection or start your own with [automocking](https://mockoon.com/docs/latest/logging-and-recording/auto-mocking-and-recording/).
+
+## Does the mocking proxy only respond with mocks when the proxied service is down?
+
+No, one of the benefits of mocking locally is a significantly shorter response time, and to achieve that, it's necessary to use mocks even if the underlying service is operational.
diff --git a/mocks/national-registry/v2/accident-notification.json b/mocks/national-registry/v2/accident-notification.json
new file mode 100644
index 000000000000..3525705097a9
--- /dev/null
+++ b/mocks/national-registry/v2/accident-notification.json
@@ -0,0 +1,705 @@
+{
+  "uuid": "0e9cf5cd-5e69-4dc2-bc91-e525de6d7503",
+  "lastMigration": 32,
+  "name": "Accident Notification Mock",
+  "endpointPrefix": "",
+  "latency": 0,
+  "port": 8081,
+  "hostname": "",
+  "folders": [],
+  "routes": [
+    {
+      "uuid": "42d7f07c-46e8-4493-89e6-4816d2d9fdd8",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399",
+      "responses": [
+        {
+          "uuid": "6133acb8-d9b3-435f-b4da-ac94678af423",
+          "body": "{\n  \"kennitala\": \"0101302399\",\n  \"nafn\": \"Gervimaður Færeyjar\",\n  \"eiginnafn\": \"Gervimaður\",\n  \"millinafn\": null,\n  \"kenninafn\": \"Færeyjar\",\n  \"fulltNafn\": \"Gervimaður Færeyjar\",\n  \"kynkodi\": \"2\",\n  \"bannmerking\": false,\n  \"faedingardagur\": \"1930-01-01T00:00:00\",\n  \"logheimili\": {\n    \"heiti\": \"Hvassaleiti 5\",\n    \"postnumer\": \"103\",\n    \"stadur\": \"Reykjavík\",\n    \"sveitarfelagsnumer\": \"0000\"\n  },\n  \"adsetur\": null\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:08:35 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-0f8b9f04-d4a7-4972-ae1a-77cbf02fe0d1"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "D8lJ3C5w1uh2VqhD9VHvEKKYewOuGCbTB+IywUjB2IAwkkLtQBGn0cQKP00GYqkM/Vipl2/vCpliWkmdydzY7g=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "a19c8d73-dc63-430d-946a-79631b13f57f"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "420"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "fe102e29-9a5b-4d45-832e-b38f0ad6edd0",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/rikisfang",
+      "responses": [
+        {
+          "uuid": "50f3665d-7a2c-4ad7-a037-ddb2e4f86246",
+          "body": "{\n  \"kodi\": \"IS\",\n  \"land\": \"Ísland\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:08:36 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-e24a23de-7f4f-4e19-a1e1-c3c25f5f48ce"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "sQUVOHfOFTVtX0taRWUS66aufTy1kbelhIz0ex8ROlPehBop5ArfGZ55gzrRVKygvHjV+77e9mDBy7NcI9REvA=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "fe288053-efff-4089-a868-0c643d7a2978"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "38"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "601df49a-d91b-456b-8aef-5a213fb5cbc7",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/einstaklingar/0101302399/hjuskapur",
+      "responses": [
+        {
+          "uuid": "eb329673-6a49-40b5-9575-be05ea1569e5",
+          "body": "{\n  \"kennitalaMaka\": \"0101302989\",\n  \"nafnMaka\": \"Gervimaður Ameríku \",\n  \"hjuskaparkodi\": \"3\",\n  \"breytt\": \"1992-09-02T00:00:00\",\n  \"sambud\": false,\n  \"sambudBreytt\": \"0001-01-01T00:00:00\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:08:36 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-e27d0558-2ccd-438d-b240-a505b92f4cdf"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "6fJVsD7a1BqVSGO6BfrXTxayXIoUEGrr5JQKID8z7WcAAsFz7z++bsfqv8AtwH3l/hgFQ5C7ipBVcdo/+UxIFw=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "72ddff81-318a-4f36-a923-baff9f5aa413"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "191"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "0ac7bb26-0434-44a7-81ad-31d9fb9aa75a",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1/api/v1/lyklar/hjuskaparkodar/3/2",
+      "responses": [
+        {
+          "uuid": "ed6235bb-5bc2-4dd1-ab1d-2e0ce7f1cba9",
+          "body": "{\n  \"kodi\": \"3\",\n  \"lysing\": \"Gift\"\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:08:36 GMT"
+            },
+            {
+              "key": "x-powered-by",
+              "value": "ASP.NET"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-9535774a-6010-4edd-be1b-5d6f3e34bc8e"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "wTaxncneXwWyhtkqpkcC/qNgwsGck/YGNr6L/YUMvLoTj3d+tuNLevNcTqK0op3IK3Lkr7bWjI1Ew1qFW3j8hQ=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "e49084ae-a103-4846-b638-458cd6125bdc"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1"
+            },
+            {
+              "key": "content-length",
+              "value": "37"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "5fdce260-0de1-4d0b-a182-eafbc5b8c417",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/islandis/v1/person/0101302399/ishealthinsured/2024-07-09",
+      "responses": [
+        {
+          "uuid": "5187ef52-870f-4619-8b54-794424addb1a",
+          "body": "{\n  \"numberIHI\": 245507092,\n  \"isHealthInsured\": 0,\n  \"date\": null,\n  \"isOnWaitPeriod\": 0\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:20:44 GMT"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=2592000, max-age=31536000;"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "devapp03"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-2b8b9f90-f49c-4644-abca-4092ab0f1597"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "jZpJFopL2TBVmuCWDPJKO8c5CjaVXI+8TGhYD25AHMxnhsSCH4bs/xpzadnuhqNxAadbdzvm+rdjl1+D7nwIvg=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "19e44d01-0be8-4d61-8041-63eb63a32fa6"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/islandis"
+            },
+            {
+              "key": "content-length",
+              "value": "91"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "1b8aa531-be1a-4aef-a15e-6d90d3b17fb5",
+      "type": "http",
+      "documentation": "",
+      "method": "post",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/islandis/v1/document",
+      "responses": [
+        {
+          "uuid": "14fe67f5-c00d-436d-9c15-be2cf8c1ac2c",
+          "body": "{\n  \"success\": 1,\n  \"errorDesc\": \"null\",\n  \"numberIHI\": 245507093,\n  \"ihiDocumentID\": 156842415,\n  \"errorList\": []\n}",
+          "latency": 0,
+          "statusCode": 201,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:22:27 GMT"
+            },
+            {
+              "key": "location",
+              "value": "https://trstws.sjukra.is/internal/islandrg/v1/document"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=2592000, max-age=31536000;"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "devapp03"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-83f0ab64-a830-44d6-9c1f-24bec8e70d14"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "ODSwXlqCq/6MeKfCuPvdQIym0SjkB3Dyy0216yKpP4/Z9WanvmIFGbqzXh7F/dZGC7lhXRiUd9gJjZ+XLqyi9w=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "31255d63-b7fa-457a-953c-48563bf2598e"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/islandis"
+            },
+            {
+              "key": "content-length",
+              "value": "116"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
+    {
+      "uuid": "422c1a7f-46dd-4d7a-ae4f-a1ee43d680db",
+      "type": "http",
+      "documentation": "",
+      "method": "get",
+      "endpoint": "r1/IS-DEV/GOV/10007/SJUKRA-Protected/islandis/v1/document/156842415/getaccidentstatus",
+      "responses": [
+        {
+          "uuid": "70797e7b-39c6-4444-bb63-a281f40ba900",
+          "body": "{\n  \"numberIHI\": 245507094,\n  \"status\": 2,\n  \"attachments\": [\n    {\n      \"isReceived\": 0,\n      \"attachmentType\": 1\n    },\n    {\n      \"isReceived\": 1,\n      \"attachmentType\": 2\n    },\n    {\n      \"isReceived\": 1,\n      \"attachmentType\": 3\n    }\n  ],\n  \"confirmations\": [\n    {\n      \"isReceived\": 1,\n      \"confirmationType\": 1\n    },\n    {\n      \"isReceived\": 1,\n      \"confirmationType\": 2\n    }\n  ]\n}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "",
+          "headers": [
+            {
+              "key": "access-control-allow-headers",
+              "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+            },
+            {
+              "key": "access-control-allow-methods",
+              "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "*"
+            },
+            {
+              "key": "api-supported-versions",
+              "value": "1.0"
+            },
+            {
+              "key": "connection",
+              "value": "close"
+            },
+            {
+              "key": "content-type",
+              "value": "application/json;charset=utf-8"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 10 Jul 2024 13:24:56 GMT"
+            },
+            {
+              "key": "strict-transport-security",
+              "value": "max-age=2592000, max-age=31536000;"
+            },
+            {
+              "key": "x-instanceid",
+              "value": "devapp03"
+            },
+            {
+              "key": "x-road-client",
+              "value": "IS-DEV/GOV/10000/island-is-client"
+            },
+            {
+              "key": "x-road-id",
+              "value": "IS-DEV-79961606-b875-4f28-a0a9-dd2e448c8772"
+            },
+            {
+              "key": "x-road-request-hash",
+              "value": "bDHRkLXiPS/sYDf9LkHhXqPGG+QCUG7nPp3XMcM0TzvgwcLVAKPlAzu2VW2r6XbIqB+iTXbsOYkQfc5A3/HNtA=="
+            },
+            {
+              "key": "x-road-request-id",
+              "value": "1863c9c2-37bb-4f37-a2b3-422c101cc0da"
+            },
+            {
+              "key": "x-road-service",
+              "value": "IS-DEV/GOV/10007/SJUKRA-Protected/islandis"
+            },
+            {
+              "key": "content-length",
+              "value": "405"
+            }
+          ],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": false,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    }
+  ],
+  "rootChildren": [
+    {
+      "type": "route",
+      "uuid": "42d7f07c-46e8-4493-89e6-4816d2d9fdd8"
+    },
+    {
+      "type": "route",
+      "uuid": "fe102e29-9a5b-4d45-832e-b38f0ad6edd0"
+    },
+    {
+      "type": "route",
+      "uuid": "601df49a-d91b-456b-8aef-5a213fb5cbc7"
+    },
+    {
+      "type": "route",
+      "uuid": "0ac7bb26-0434-44a7-81ad-31d9fb9aa75a"
+    },
+    {
+      "type": "route",
+      "uuid": "5fdce260-0de1-4d0b-a182-eafbc5b8c417"
+    },
+    {
+      "type": "route",
+      "uuid": "1b8aa531-be1a-4aef-a15e-6d90d3b17fb5"
+    },
+    {
+      "type": "route",
+      "uuid": "422c1a7f-46dd-4d7a-ae4f-a1ee43d680db"
+    }
+  ],
+  "proxyMode": true,
+  "proxyHost": "http://localhost:8082",
+  "proxyRemovePrefix": false,
+  "tlsOptions": {
+    "enabled": false,
+    "type": "CERT",
+    "pfxPath": "",
+    "certPath": "",
+    "keyPath": "",
+    "caPath": "",
+    "passphrase": ""
+  },
+  "cors": true,
+  "headers": [
+    {
+      "key": "Content-Type",
+      "value": "application/json"
+    },
+    {
+      "key": "Access-Control-Allow-Origin",
+      "value": "*"
+    },
+    {
+      "key": "Access-Control-Allow-Methods",
+      "value": "GET,POST,PUT,PATCH,DELETE,HEAD,OPTIONS"
+    },
+    {
+      "key": "Access-Control-Allow-Headers",
+      "value": "Content-Type, Origin, Accept, Authorization, Content-Length, X-Requested-With"
+    }
+  ],
+  "proxyReqHeaders": [
+    {
+      "key": "",
+      "value": ""
+    }
+  ],
+  "proxyResHeaders": [
+    {
+      "key": "",
+      "value": ""
+    }
+  ],
+  "data": [],
+  "callbacks": []
+}
diff --git a/package.json b/package.json
index ef88538c915d..2cfe86b20cac 100644
--- a/package.json
+++ b/package.json
@@ -65,24 +65,12 @@
     "hmr-benchmark": "node -r esbuild-register scripts/hmr-benchmark.ts"
   },
   "dependencies": {
-    "@acuris/aws-es-connection": "2.3.0",
     "@apollo/client": "3.7.15",
     "@apollo/gateway": "2.1.1",
     "@apollo/subgraph": "2.1.1",
     "@apollo/utils.keyvadapter": "3.0.0",
-    "@aws-sdk/abort-controller": "3.374.0",
-    "@aws-sdk/client-elasticsearch-service": "3.609.0",
-    "@aws-sdk/client-s3": "3.609.0",
-    "@aws-sdk/client-ses": "3.609.0",
-    "@aws-sdk/client-sns": "3.609.0",
-    "@aws-sdk/client-sqs": "3.598.0",
-    "@aws-sdk/client-ssm": "3.598.0",
-    "@aws-sdk/cloudfront-signer": "3.609.0",
-    "@aws-sdk/credential-provider-node": "3.598.0",
-    "@aws-sdk/lib-storage": "3.609.0",
-    "@aws-sdk/s3-presigned-post": "3.609.0",
-    "@aws-sdk/s3-request-presigner": "3.609.0",
-    "@aws-sdk/types": "3.598.0",
+    "@aws-sdk/client-sqs": "3.145.0",
+    "@aws-sdk/credential-provider-node": "3.145.0",
     "@azure/msal-node": "1.14.4",
     "@contentful/app-sdk": "4.16.0",
     "@contentful/default-field-editors": "1.6.34",
@@ -107,7 +95,7 @@
     "@formatjs/intl-locale": "2.4.33",
     "@formatjs/intl-numberformat": "7.1.5",
     "@hookform/error-message": "2.0.1",
-    "@island.is/regulations-tools": "0.9.1",
+    "@island.is/regulations-tools": "0.9.2",
     "@keyv/redis": "2.6.1",
     "@livechat/widget-core": "1.3.2",
     "@nestjs/apollo": "10.1.0",
@@ -128,12 +116,11 @@
     "@rehooks/component-size": "1.0.3",
     "@simplewebauthn/server": "10.0.0",
     "@sindresorhus/slugify": "1.0.0",
-    "@smithy/abort-controller": "3.1.1",
     "@statoscope/webpack-plugin": "5.20.1",
     "@storybook/core-server": "7.6.9",
     "@types/archiver": "6.0.2",
     "@types/faker": "5.5.3",
-    "@types/nodemailer": "6.4.15",
+    "@types/nodemailer": "6.4.1",
     "@types/pdfkit": "0.11.2",
     "@types/pubsub-js": "1.8.1",
     "@types/react-csv": "1.1.1",
@@ -153,9 +140,9 @@
     "apollo-server-express": "3.10.2",
     "apollo-server-plugin-response-cache": "3.8.2",
     "archiver": "6.0.1",
-    "aws-elasticsearch-connector": "9.2.0",
-    "aws-sdk": "2.1651.0",
-    "aws4": "1.13.0",
+    "aws-elasticsearch-connector": "9.0.0",
+    "aws-sdk": "2.814.0",
+    "aws4": "1.11.0",
     "axios": "1.7.2",
     "bottleneck": "2.19.5",
     "bull": "4.10.4",
@@ -240,7 +227,7 @@
     "node-fetch": "2.6.7",
     "node-gyp": "9.1.0",
     "node-html-markdown": "1.3.0",
-    "nodemailer": "6.9.14",
+    "nodemailer": "6.7.2",
     "oidc-client-ts": "2.4.0",
     "openapi3-ts": "2.0.0",
     "opossum": "6.1.0",
@@ -300,7 +287,7 @@
     "slate-react": "0.70.0",
     "smoothscroll-polyfill": "0.4.4",
     "soap": "1.0.0",
-    "sqs-consumer": "10.3.0",
+    "sqs-consumer": "5.4.0",
     "stream-browserify": "3.0.0",
     "styled-components": "5.3.6",
     "supertest": "4.0.2",
@@ -329,6 +316,8 @@
     "@anatine/esbuild-decorators": "0.2.4",
     "@anatine/esbuildnx": "0.2.0",
     "@anev/ts-mountebank": "^1.6.0",
+    "@aws-sdk/client-ses": "3.145.0",
+    "@aws-sdk/client-ssm": "3.145.0",
     "@babel/core": "7.22.5",
     "@babel/plugin-proposal-decorators": "7.22.5",
     "@babel/plugin-transform-class-properties": "7.22.5",
@@ -348,6 +337,7 @@
     "@graphql-codegen/typescript-operations": "2.5.3",
     "@graphql-codegen/typescript-react-apollo": "3.3.3",
     "@graphql-codegen/typescript-resolvers": "2.7.3",
+    "@mockoon/cli": "8.4.0",
     "@nestjs/schematics": "10.0.1",
     "@nestjs/testing": "10.0.5",
     "@nx/cypress": "19.4.0",
@@ -381,6 +371,7 @@
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "15.0.6",
     "@testing-library/user-event": "14.4.3",
+    "@types/aws-sdk": "2.7.0",
     "@types/aws4": "1.5.1",
     "@types/classnames": "2.2.10",
     "@types/cookie-parser": "1.4.2",
diff --git a/scripts/build-graphql-schema.ts b/scripts/build-graphql-schema.ts
index 30c8ed161e48..c7ca8ce30444 100644
--- a/scripts/build-graphql-schema.ts
+++ b/scripts/build-graphql-schema.ts
@@ -1,9 +1,10 @@
 import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
 
 import { createApp } from '@island.is/infra-nest-server'
 
 const main = async () => {
-  const args = await yargs(process.argv.slice(2)).string('_').argv
+  const args = await yargs(hideBin(process.argv)).string('_').argv
 
   const { AppModule } = require('../' + args._[0])
 
diff --git a/scripts/drop-postgres-schema.ts b/scripts/drop-postgres-schema.ts
index fc3b0517ffa2..4a4faffd9c9c 100755
--- a/scripts/drop-postgres-schema.ts
+++ b/scripts/drop-postgres-schema.ts
@@ -1,13 +1,13 @@
 import yargs from 'yargs'
 import { Charts, Deployments } from '../infra/src/uber-charts/all-charts'
 import { Client } from 'pg'
-import { SSM } from '@aws-sdk/client-ssm'
+import { SSM } from 'aws-sdk'
 import { branchNameToFeatureName } from './_common'
 import { prepareServicesForEnv } from '../infra/src/dsl/processing/rendering-pipeline'
 import { Envs } from '../infra/src/environments'
 import { renderers } from '../infra/src/dsl/upstream-dependencies'
 
-const argvUnawaited = yargs(process.argv.slice(2))
+const argv = yargs(process.argv.slice(2))
   .options({
     'feature-branch-name': {
       type: 'string',
@@ -29,10 +29,9 @@ const argvUnawaited = yargs(process.argv.slice(2))
   )
 
 void (async function () {
-  const argv = await argvUnawaited.argv
-  const featureName = branchNameToFeatureName(argv['feature-branch-name'])
-  const serviceName = argv['service-name']
-  const chart = argv.chart as keyof typeof Charts
+  const featureName = branchNameToFeatureName(argv.argv['feature-branch-name'])
+  const serviceName = argv.argv['service-name']
+  const chart = argv.argv.chart as keyof typeof Charts
   const env = 'dev' as const
   const habitat = Charts[chart][env]
   const target = habitat.filter(
@@ -50,6 +49,7 @@ void (async function () {
   const targetService = out[0]
 
   const ssmClient = new SSM({
+    apiVersion: '2014-11-06',
     region: 'eu-west-1',
   })
   if (targetService.postgres) {
@@ -59,6 +59,7 @@ void (async function () {
         Name: targetService.postgres.passwordSecret!,
         WithDecryption: true,
       })
+      .promise()
       .catch((r) => {
         console.error(`No DB password secret found. Wrong feature name?`)
         throw r
diff --git a/scripts/infra-cmds.js b/scripts/infra-cmds.js
index 1e2f376e19b9..be0fd7dd3d12 100644
--- a/scripts/infra-cmds.js
+++ b/scripts/infra-cmds.js
@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const { spawn } = require('child_process')
 const yargs = require('yargs/yargs')
+const { hideBin } = require('yargs/helpers')
 const winston = require('winston')
 const { combine, printf, colorize } = winston.format
 const { Console } = winston.transports
@@ -34,7 +35,7 @@ const logger = winston.createLogger({
   transports: [new Console()],
 })
 
-yargs(process.argv.slice(2))
+yargs(hideBin(process.argv))
   .command({
     command: 'install',
     describe: 'Install infra dependencies',
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 7a4b67804e9c..82b52bbfc428 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -501,6 +501,9 @@
       "@island.is/application/templates/social-insurance-administration/household-supplement": [
         "libs/application/templates/social-insurance-administration/household-supplement/src/index.ts"
       ],
+      "@island.is/application/templates/social-insurance-administration/income-plan": [
+        "libs/application/templates/social-insurance-administration/income-plan/src/index.ts"
+      ],
       "@island.is/application/templates/social-insurance-administration/old-age-pension": [
         "libs/application/templates/social-insurance-administration/old-age-pension/src/index.ts"
       ],
@@ -699,6 +702,7 @@
       ],
       "@island.is/clients/mms": ["libs/clients/mms/general/src/index.ts"],
       "@island.is/clients/mms/frigg": ["libs/clients/mms/frigg/src/index.ts"],
+      "@island.is/clients/mms/grade": ["libs/clients/mms/grade/src/index.ts"],
       "@island.is/clients/municipalities-financial-aid": [
         "libs/clients/municipalities-financial-aid/src/index.ts"
       ],
@@ -741,6 +745,9 @@
       "@island.is/clients/signature-collection": [
         "libs/clients/signature-collection/src/index.ts"
       ],
+      "@island.is/clients/smart-solutions-v2": [
+        "libs/clients/smart-solutions-v2/src/index.ts"
+      ],
       "@island.is/clients/smartsolutions": [
         "libs/clients/smartsolutions/src/index.ts"
       ],
diff --git a/yarn.lock b/yarn.lock
index 1f21de761bcb..474666f89dde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,18 +24,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@acuris/aws-es-connection@npm:2.3.0":
-  version: 2.3.0
-  resolution: "@acuris/aws-es-connection@npm:2.3.0"
-  dependencies:
-    aws4: ^1.11.0
-  peerDependencies:
-    "@elastic/elasticsearch": ">=5.6.16"
-    aws-sdk: ">=2"
-  checksum: fba56bdf9aedd4cfc11ccf3d50fbd5ce8eebd00c59519f1a8664df645c07cf0abd0cca1595f4a71d6ebd374fefa0a65e7565dcba12105fc6d13d30d3675a827b
-  languageName: node
-  linkType: hard
-
 "@adobe/css-tools@npm:^4.0.1":
   version: 4.0.1
   resolution: "@adobe/css-tools@npm:4.0.1"
@@ -212,6 +200,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@apidevtools/json-schema-ref-parser@npm:9.0.6":
+  version: 9.0.6
+  resolution: "@apidevtools/json-schema-ref-parser@npm:9.0.6"
+  dependencies:
+    "@jsdevtools/ono": ^7.1.3
+    call-me-maybe: ^1.0.1
+    js-yaml: ^3.13.1
+  checksum: c7ff53623ab8a9dd221772a5757fa0b9e5167a5ac3a71c23596634bae6efc85d8efcdebbe17f73ee5c027ea5afc48c705e8a720f02c4909f9a357d8027040b7b
+  languageName: node
+  linkType: hard
+
+"@apidevtools/openapi-schemas@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@apidevtools/openapi-schemas@npm:2.1.0"
+  checksum: 4a8f64935b9049ef21e41fa4b188f39f6bc3f5291cebd451701db1115451ccb246a739e46cc5ce9ecdec781671431db40db7851acdac84a990a45756e0f32de3
+  languageName: node
+  linkType: hard
+
+"@apidevtools/swagger-methods@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@apidevtools/swagger-methods@npm:3.0.2"
+  checksum: d06b1ac5c1956613c4c6be695612ef860cd4e962b93a509ca551735a328a856cae1e33399cac1dcbf8333ba22b231746f3586074769ef0e172cf549ec9e7eaae
+  languageName: node
+  linkType: hard
+
+"@apidevtools/swagger-parser@npm:10.1.0":
+  version: 10.1.0
+  resolution: "@apidevtools/swagger-parser@npm:10.1.0"
+  dependencies:
+    "@apidevtools/json-schema-ref-parser": 9.0.6
+    "@apidevtools/openapi-schemas": ^2.1.0
+    "@apidevtools/swagger-methods": ^3.0.2
+    "@jsdevtools/ono": ^7.1.3
+    ajv: ^8.6.3
+    ajv-draft-04: ^1.0.0
+    call-me-maybe: ^1.0.1
+  peerDependencies:
+    openapi-types: ">=7"
+  checksum: c7c923755bd025ee2cae97e1cfd525538523ba74c341a0ac814c023ffe5e63fc2d997539a8ccf9a0fcec41a2d6337d40cc5735acb991ddcbb415853a241908d1
+  languageName: node
+  linkType: hard
+
 "@apollo/cache-control-types@npm:^1.0.2":
   version: 1.0.2
   resolution: "@apollo/cache-control-types@npm:1.0.2"
@@ -631,1770 +661,790 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-crypto/crc32@npm:5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/crc32@npm:5.2.0"
-  dependencies:
-    "@aws-crypto/util": ^5.2.0
-    "@aws-sdk/types": ^3.222.0
-    tslib: ^2.6.2
-  checksum: 1ddf7ec3fccf106205ff2476d90ae1d6625eabd47752f689c761b71e41fe451962b7a1c9ed25fe54e17dd747a62fbf4de06030fe56fe625f95285f6f70b96c57
-  languageName: node
-  linkType: hard
-
-"@aws-crypto/crc32c@npm:5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/crc32c@npm:5.2.0"
-  dependencies:
-    "@aws-crypto/util": ^5.2.0
-    "@aws-sdk/types": ^3.222.0
-    tslib: ^2.6.2
-  checksum: 0b399de8607c59e1e46c05d2b24a16b56d507944fdac925c611f0ba7302f5555c098139806d7da1ebef1f89bf4e4b5d4dec74d4809ce0f18238b72072065effe
-  languageName: node
-  linkType: hard
-
-"@aws-crypto/sha1-browser@npm:5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/sha1-browser@npm:5.2.0"
+"@aws-crypto/ie11-detection@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@aws-crypto/ie11-detection@npm:2.0.0"
   dependencies:
-    "@aws-crypto/supports-web-crypto": ^5.2.0
-    "@aws-crypto/util": ^5.2.0
-    "@aws-sdk/types": ^3.222.0
-    "@aws-sdk/util-locate-window": ^3.0.0
-    "@smithy/util-utf8": ^2.0.0
-    tslib: ^2.6.2
-  checksum: 8b04af601d945c5ef0f5f733b55681edc95b81c02ce5067b57f1eb4ee718e45485cf9aeeb7a84da9131656d09e1c4bc78040ec759f557a46703422d8df098d59
+    tslib: ^1.11.1
+  checksum: dd15daa1160ecdf28b9c930dcbd7f8bc96e74d7f791134974b672f5d36182274c76db4fff414385cdb8997a8b7ade991988a571aaac3184e226e2ed6428d895f
   languageName: node
   linkType: hard
 
-"@aws-crypto/sha256-browser@npm:5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/sha256-browser@npm:5.2.0"
+"@aws-crypto/sha256-browser@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@aws-crypto/sha256-browser@npm:2.0.0"
   dependencies:
-    "@aws-crypto/sha256-js": ^5.2.0
-    "@aws-crypto/supports-web-crypto": ^5.2.0
-    "@aws-crypto/util": ^5.2.0
-    "@aws-sdk/types": ^3.222.0
+    "@aws-crypto/ie11-detection": ^2.0.0
+    "@aws-crypto/sha256-js": ^2.0.0
+    "@aws-crypto/supports-web-crypto": ^2.0.0
+    "@aws-crypto/util": ^2.0.0
+    "@aws-sdk/types": ^3.1.0
     "@aws-sdk/util-locate-window": ^3.0.0
-    "@smithy/util-utf8": ^2.0.0
-    tslib: ^2.6.2
-  checksum: 773f12f2026d82a6bb4a23a8f491894a6d32525bd9b8bfbc12896526cf11882a7607a671c478c45f9cd7d6ba1caaed48a62b67c6f725244bd83a1275108f46c7
-  languageName: node
-  linkType: hard
-
-"@aws-crypto/sha256-js@npm:5.2.0, @aws-crypto/sha256-js@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/sha256-js@npm:5.2.0"
-  dependencies:
-    "@aws-crypto/util": ^5.2.0
-    "@aws-sdk/types": ^3.222.0
-    tslib: ^2.6.2
-  checksum: 007fbe0436d714d0d0d282e2b61c90e45adcb9ad75eac9ac7ba03d32b56624afd09b2a9ceb4d659661cf17c51d74d1900ab6b00eacafc002da1101664955ca53
-  languageName: node
-  linkType: hard
-
-"@aws-crypto/supports-web-crypto@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/supports-web-crypto@npm:5.2.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: 6ffc21de48b2b2c3e918193101d7e8fe949d47b37688892e1c39eaedaa938be80c0f404fe1c874c30cce16781026777a53bf47d5d90143ca91d0feb7c4a6f830
-  languageName: node
-  linkType: hard
-
-"@aws-crypto/util@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "@aws-crypto/util@npm:5.2.0"
-  dependencies:
-    "@aws-sdk/types": ^3.222.0
-    "@smithy/util-utf8": ^2.0.0
-    tslib: ^2.6.2
-  checksum: f0f81d9d2771c59946cfec48b86cb23d39f78a966c4a1f89d4753abdc3cb38de06f907d1e6450059b121d48ac65d612ab88bdb70014553a077fc3dabddfbf8d6
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/abort-controller@npm:3.374.0":
-  version: 3.374.0
-  resolution: "@aws-sdk/abort-controller@npm:3.374.0"
-  dependencies:
-    "@smithy/abort-controller": ^1.0.1
-    tslib: ^2.5.0
-  checksum: 0cd46e1da1e553568b863fe9b821bb853e9de3c74bbdbe9c03fba3cd864a5b9f4d340b4c69625ef665751b9ac8035fe229d23bb8322d418b48525a27ff6fa31d
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-elasticsearch-service@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-elasticsearch-service@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.609.0
-    "@aws-sdk/client-sts": 3.609.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: b3fb289c2d5322389e067068e145cd05c1b3ae193277f9f9e2ca0727464ad873f62e6a4dc028d15cae119a3a33a1468a634499681636f01cb2e10ea92a8802a6
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-s3@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-s3@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha1-browser": 5.2.0
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.609.0
-    "@aws-sdk/client-sts": 3.609.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-bucket-endpoint": 3.609.0
-    "@aws-sdk/middleware-expect-continue": 3.609.0
-    "@aws-sdk/middleware-flexible-checksums": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-location-constraint": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-sdk-s3": 3.609.0
-    "@aws-sdk/middleware-signing": 3.609.0
-    "@aws-sdk/middleware-ssec": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/signature-v4-multi-region": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@aws-sdk/xml-builder": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/eventstream-serde-browser": ^3.0.4
-    "@smithy/eventstream-serde-config-resolver": ^3.0.3
-    "@smithy/eventstream-serde-node": ^3.0.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-blob-browser": ^3.1.2
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/hash-stream-node": ^3.1.2
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/md5-js": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-stream": ^3.0.5
-    "@smithy/util-utf8": ^3.0.0
-    "@smithy/util-waiter": ^3.1.2
-    tslib: ^2.6.2
-  checksum: 23f5203e44b3998e60834b1726716e695937f5e88f1ad3ef4e42de60db17b2cad4cb0342538d0b7832cdbe72845e8f0aa46aec09f82564f5925c6c3ea4d4c792
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-ses@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-ses@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.609.0
-    "@aws-sdk/client-sts": 3.609.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    "@smithy/util-waiter": ^3.1.2
-    tslib: ^2.6.2
-  checksum: 042f53e221a7edf5eb70dd9706453d29865a0952d49d3e08f7f683dac586bdc9e57f9d3d2b1a1ee636571c165cd643afe6be04907d554cfe1b723a7d466825d3
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sns@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-sns@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.609.0
-    "@aws-sdk/client-sts": 3.609.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 520f7d45cf22e8aab7f9d7086dd350f4b93e808bf1deaafd46c86e50636fac2d0983f4c19f2f00c3f3eb3830279b119c35355690b09bf290131f961da8cdce7e
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sqs@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/client-sqs@npm:3.598.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.598.0
-    "@aws-sdk/client-sts": 3.598.0
-    "@aws-sdk/core": 3.598.0
-    "@aws-sdk/credential-provider-node": 3.598.0
-    "@aws-sdk/middleware-host-header": 3.598.0
-    "@aws-sdk/middleware-logger": 3.598.0
-    "@aws-sdk/middleware-recursion-detection": 3.598.0
-    "@aws-sdk/middleware-sdk-sqs": 3.598.0
-    "@aws-sdk/middleware-user-agent": 3.598.0
-    "@aws-sdk/region-config-resolver": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@aws-sdk/util-user-agent-browser": 3.598.0
-    "@aws-sdk/util-user-agent-node": 3.598.0
-    "@smithy/config-resolver": ^3.0.2
-    "@smithy/core": ^2.2.1
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/hash-node": ^3.0.1
-    "@smithy/invalid-dependency": ^3.0.1
-    "@smithy/md5-js": ^3.0.1
-    "@smithy/middleware-content-length": ^3.0.1
-    "@smithy/middleware-endpoint": ^3.0.2
-    "@smithy/middleware-retry": ^3.0.4
-    "@smithy/middleware-serde": ^3.0.1
-    "@smithy/middleware-stack": ^3.0.1
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/url-parser": ^3.0.1
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.4
-    "@smithy/util-defaults-mode-node": ^3.0.4
-    "@smithy/util-endpoints": ^2.0.2
-    "@smithy/util-middleware": ^3.0.1
-    "@smithy/util-retry": ^3.0.1
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 3acdc43d3867cdb97209b139e095d14a01fa0b64f28294a8c17238da14e47708ba0857a235a491be8dcd6e1a9bfe5f25d2ecd75bfba5d0f463f224a8a37151f7
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sqs@npm:^3.529.1":
-  version: 3.629.0
-  resolution: "@aws-sdk/client-sqs@npm:3.629.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.629.0
-    "@aws-sdk/client-sts": 3.629.0
-    "@aws-sdk/core": 3.629.0
-    "@aws-sdk/credential-provider-node": 3.629.0
-    "@aws-sdk/middleware-host-header": 3.620.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.620.0
-    "@aws-sdk/middleware-sdk-sqs": 3.622.0
-    "@aws-sdk/middleware-user-agent": 3.620.0
-    "@aws-sdk/region-config-resolver": 3.614.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.614.0
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/core": ^2.3.2
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/md5-js": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.5
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.14
-    "@smithy/util-defaults-mode-node": ^3.0.14
-    "@smithy/util-endpoints": ^2.0.5
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: dba480522b14e5fb565d0380c5fcedf71eff027055ae826c4fbc4f7002cebe05073d65a923af9f0f1cfd691782b23f8a0caa1cc46ef74fcc71e1eb883318ef28
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-ssm@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/client-ssm@npm:3.598.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.598.0
-    "@aws-sdk/client-sts": 3.598.0
-    "@aws-sdk/core": 3.598.0
-    "@aws-sdk/credential-provider-node": 3.598.0
-    "@aws-sdk/middleware-host-header": 3.598.0
-    "@aws-sdk/middleware-logger": 3.598.0
-    "@aws-sdk/middleware-recursion-detection": 3.598.0
-    "@aws-sdk/middleware-user-agent": 3.598.0
-    "@aws-sdk/region-config-resolver": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@aws-sdk/util-user-agent-browser": 3.598.0
-    "@aws-sdk/util-user-agent-node": 3.598.0
-    "@smithy/config-resolver": ^3.0.2
-    "@smithy/core": ^2.2.1
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/hash-node": ^3.0.1
-    "@smithy/invalid-dependency": ^3.0.1
-    "@smithy/middleware-content-length": ^3.0.1
-    "@smithy/middleware-endpoint": ^3.0.2
-    "@smithy/middleware-retry": ^3.0.4
-    "@smithy/middleware-serde": ^3.0.1
-    "@smithy/middleware-stack": ^3.0.1
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/url-parser": ^3.0.1
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.4
-    "@smithy/util-defaults-mode-node": ^3.0.4
-    "@smithy/util-endpoints": ^2.0.2
-    "@smithy/util-middleware": ^3.0.1
-    "@smithy/util-retry": ^3.0.1
-    "@smithy/util-utf8": ^3.0.0
-    "@smithy/util-waiter": ^3.0.1
-    tslib: ^2.6.2
-    uuid: ^9.0.1
-  checksum: 2b7e00a01aef3ae917955caa39552359965445a74320b8cbaa78ddc23d9320f20dd1fb962916c38ed24db700e1a0bbb523c8ed08cebe19f1825d51e62e8c2c89
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso-oidc@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.598.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sts": 3.598.0
-    "@aws-sdk/core": 3.598.0
-    "@aws-sdk/credential-provider-node": 3.598.0
-    "@aws-sdk/middleware-host-header": 3.598.0
-    "@aws-sdk/middleware-logger": 3.598.0
-    "@aws-sdk/middleware-recursion-detection": 3.598.0
-    "@aws-sdk/middleware-user-agent": 3.598.0
-    "@aws-sdk/region-config-resolver": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@aws-sdk/util-user-agent-browser": 3.598.0
-    "@aws-sdk/util-user-agent-node": 3.598.0
-    "@smithy/config-resolver": ^3.0.2
-    "@smithy/core": ^2.2.1
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/hash-node": ^3.0.1
-    "@smithy/invalid-dependency": ^3.0.1
-    "@smithy/middleware-content-length": ^3.0.1
-    "@smithy/middleware-endpoint": ^3.0.2
-    "@smithy/middleware-retry": ^3.0.4
-    "@smithy/middleware-serde": ^3.0.1
-    "@smithy/middleware-stack": ^3.0.1
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/url-parser": ^3.0.1
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.4
-    "@smithy/util-defaults-mode-node": ^3.0.4
-    "@smithy/util-endpoints": ^2.0.2
-    "@smithy/util-middleware": ^3.0.1
-    "@smithy/util-retry": ^3.0.1
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: cd651a7595b9739acf7063f1c1556960013ce351e42bc1d839ac16669517ea60262e16a8eea1eb6a7b2b4346e5035d55489bba4e602bbf096fe4dbe6d76bcf90
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso-oidc@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.609.0
-  checksum: 3058098b5723d45c7a830cd041dd847359278fbb72e3f4501aeae3b5c188fedf3d928ab727b9b5f17b2e311ac419c481ebb78df1742d1b5b543c5dc64234b2a1
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso-oidc@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.629.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/core": 3.629.0
-    "@aws-sdk/credential-provider-node": 3.629.0
-    "@aws-sdk/middleware-host-header": 3.620.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.620.0
-    "@aws-sdk/middleware-user-agent": 3.620.0
-    "@aws-sdk/region-config-resolver": 3.614.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.614.0
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/core": ^2.3.2
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.5
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.14
-    "@smithy/util-defaults-mode-node": ^3.0.14
-    "@smithy/util-endpoints": ^2.0.5
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.629.0
-  checksum: 381bbac83ace8be42b8b339efcc48c53401bfd5eca4a6c7b7a3b76ee4df02ca8e32cbaad93108f7396a153646c65bb3d7cb1777c6690a6c4e544668e3aa9c8d7
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/client-sso@npm:3.598.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/core": 3.598.0
-    "@aws-sdk/middleware-host-header": 3.598.0
-    "@aws-sdk/middleware-logger": 3.598.0
-    "@aws-sdk/middleware-recursion-detection": 3.598.0
-    "@aws-sdk/middleware-user-agent": 3.598.0
-    "@aws-sdk/region-config-resolver": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@aws-sdk/util-user-agent-browser": 3.598.0
-    "@aws-sdk/util-user-agent-node": 3.598.0
-    "@smithy/config-resolver": ^3.0.2
-    "@smithy/core": ^2.2.1
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/hash-node": ^3.0.1
-    "@smithy/invalid-dependency": ^3.0.1
-    "@smithy/middleware-content-length": ^3.0.1
-    "@smithy/middleware-endpoint": ^3.0.2
-    "@smithy/middleware-retry": ^3.0.4
-    "@smithy/middleware-serde": ^3.0.1
-    "@smithy/middleware-stack": ^3.0.1
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/url-parser": ^3.0.1
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.4
-    "@smithy/util-defaults-mode-node": ^3.0.4
-    "@smithy/util-endpoints": ^2.0.2
-    "@smithy/util-middleware": ^3.0.1
-    "@smithy/util-retry": ^3.0.1
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: b570f54643ac0ab0f300bf074e77c2fbba70206a11d2aed1f6ecd361027f2f6a1d62719627e905bcb44dd73d481a29ef5a70878c676386afe2a133f479a445d4
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-sso@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 0c023a286c8e4e8cf6a97bd2132f405ac88f513f3d2c8d48784cd3873bd349abeeda2bb5f1c548d567924d7d64058e8fec89182c626713d1b83d580454e2c9d6
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sso@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/client-sso@npm:3.629.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/core": 3.629.0
-    "@aws-sdk/middleware-host-header": 3.620.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.620.0
-    "@aws-sdk/middleware-user-agent": 3.620.0
-    "@aws-sdk/region-config-resolver": 3.614.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.614.0
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/core": ^2.3.2
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.5
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.14
-    "@smithy/util-defaults-mode-node": ^3.0.14
-    "@smithy/util-endpoints": ^2.0.5
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: dc757220212e094e1226fcf1ecc97a57bcde78d9d82be4bf8c51b18c21dc564762ef174e25a3376bb9364c1ffdfdd209b737a6439b5240d66bcff7411ece1e99
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sts@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/client-sts@npm:3.598.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.598.0
-    "@aws-sdk/core": 3.598.0
-    "@aws-sdk/credential-provider-node": 3.598.0
-    "@aws-sdk/middleware-host-header": 3.598.0
-    "@aws-sdk/middleware-logger": 3.598.0
-    "@aws-sdk/middleware-recursion-detection": 3.598.0
-    "@aws-sdk/middleware-user-agent": 3.598.0
-    "@aws-sdk/region-config-resolver": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@aws-sdk/util-user-agent-browser": 3.598.0
-    "@aws-sdk/util-user-agent-node": 3.598.0
-    "@smithy/config-resolver": ^3.0.2
-    "@smithy/core": ^2.2.1
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/hash-node": ^3.0.1
-    "@smithy/invalid-dependency": ^3.0.1
-    "@smithy/middleware-content-length": ^3.0.1
-    "@smithy/middleware-endpoint": ^3.0.2
-    "@smithy/middleware-retry": ^3.0.4
-    "@smithy/middleware-serde": ^3.0.1
-    "@smithy/middleware-stack": ^3.0.1
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/url-parser": ^3.0.1
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.4
-    "@smithy/util-defaults-mode-node": ^3.0.4
-    "@smithy/util-endpoints": ^2.0.2
-    "@smithy/util-middleware": ^3.0.1
-    "@smithy/util-retry": ^3.0.1
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 288379398def285173ec0855bdfb530ce622d20810a70ccdc464d8e49617571d15d97d41093543c707f06c3b57e6ef65a7cef30b4d66200a944d54b813da821d
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sts@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/client-sts@npm:3.609.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.609.0
-    "@aws-sdk/core": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.609.0
-    "@aws-sdk/middleware-host-header": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.609.0
-    "@aws-sdk/region-config-resolver": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.609.0
-    "@smithy/config-resolver": ^3.0.4
-    "@smithy/core": ^2.2.4
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.3
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/middleware-retry": ^3.0.7
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.7
-    "@smithy/util-defaults-mode-node": ^3.0.7
-    "@smithy/util-endpoints": ^2.0.4
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: aff496a5746732c35a094119127310970b554f27dfbd1b2e3ec4d2aa3a2b2fdc17953b40c163ef503d060346860c14045e683b1a282ecaab07cc56e045da77b1
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/client-sts@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/client-sts@npm:3.629.0"
-  dependencies:
-    "@aws-crypto/sha256-browser": 5.2.0
-    "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.629.0
-    "@aws-sdk/core": 3.629.0
-    "@aws-sdk/credential-provider-node": 3.629.0
-    "@aws-sdk/middleware-host-header": 3.620.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.620.0
-    "@aws-sdk/middleware-user-agent": 3.620.0
-    "@aws-sdk/region-config-resolver": 3.614.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.614.0
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/core": ^2.3.2
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.5
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-body-length-browser": ^3.0.0
-    "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.14
-    "@smithy/util-defaults-mode-node": ^3.0.14
-    "@smithy/util-endpoints": ^2.0.5
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: ca979662feb4860e60e796264d27fe83f03eb14471d7446e3b9625f3a00c4c0702cb42a46ebf73dadf025e8963f0c477b99c2416b474148340d55e8a1dc526d0
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/cloudfront-signer@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/cloudfront-signer@npm:3.609.0"
-  dependencies:
-    "@smithy/url-parser": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 5c12846c7b3c55e3474f76c6ef8ae1c1e7245f0328d419ed11ab00bff67e313d2e84be767c9d0ea11d765bf716c5523603c05ca6dce4deb44b1b62da440ff4ea
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/core@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/core@npm:3.598.0"
-  dependencies:
-    "@smithy/core": ^2.2.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/signature-v4": ^3.1.0
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    fast-xml-parser: 4.2.5
-    tslib: ^2.6.2
-  checksum: e58944a6571808b53d21f012b9671ffec597d2a826a9c0f1fbcbe160189a3c47f5b4671ac92b7437c349f19b8a8df7e12255c57795ab0224c318ed69a0d23229
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/core@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/core@npm:3.609.0"
-  dependencies:
-    "@smithy/core": ^2.2.4
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/signature-v4": ^3.1.2
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    fast-xml-parser: 4.2.5
-    tslib: ^2.6.2
-  checksum: 1d896dd1b47be9a43d863b3bc4e7ab1853f6e885c26106b924ea55feba5895e25d508988ae6335caf59f0bdca7b31f575dceb4fed35cc60194b4bd952682b45c
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/core@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/core@npm:3.629.0"
-  dependencies:
-    "@smithy/core": ^2.3.2
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/signature-v4": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/util-middleware": ^3.0.3
-    fast-xml-parser: 4.4.1
-    tslib: ^2.6.2
-  checksum: 4e569eb23c955775267c7b8b0236743f0e2ae49be4a9390735691b8ad5a2013146c497a51e16767f7ceaf01e7911510bffed71f4ab182f2a8ba3cd515ce56acc
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-env@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-env@npm:3.598.0"
-  dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 517f06dd47b7aa4c8d5a9fe82698150237c28c46ed9f82cd1d92d1453690b9d6139b65519d92dea611d319c4418fe4540e7d52c03d3897e7e471731fb0156afb
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-env@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-env@npm:3.609.0"
-  dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: eda20122740481d04f5110fb9349df339562da1e1d5217e6c47e5f80ed0cce1b3bea01081272487bf04e402fcecc2734a352b0b57ae80b090dd8a0b3547ad185
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-env@npm:3.620.1":
-  version: 3.620.1
-  resolution: "@aws-sdk/credential-provider-env@npm:3.620.1"
-  dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 3e05eeb6c6490e7759d03b7b688ef321d5e6c97929f21226e912b01aa926815312043febd505e8b43b54010b5ae2717559aba6deeea93bda7d6cf0d8a0b9fc76
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-http@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-http@npm:3.598.0"
-  dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/fetch-http-handler": ^3.0.2
-    "@smithy/node-http-handler": ^3.0.1
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/util-stream": ^3.0.2
-    tslib: ^2.6.2
-  checksum: e2f6208491a6e58b7ac7368c2247dee55080be740511ded01cc3454920ef29d0b7712930571651a8d0ec2aea4e0a107c7d5dd6ecd01bd4de3c264c54e32959b3
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-http@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-http@npm:3.609.0"
-  dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/fetch-http-handler": ^3.2.0
-    "@smithy/node-http-handler": ^3.1.1
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/util-stream": ^3.0.5
-    tslib: ^2.6.2
-  checksum: 76b63f157d168ace5006524331ef48342585eb16c9906144c30dd5e77379c312e5d4803254a1a0629e9ccb8b016c2ea3d331a2851de968a09dedcce399993d9a
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-http@npm:3.622.0":
-  version: 3.622.0
-  resolution: "@aws-sdk/credential-provider-http@npm:3.622.0"
-  dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/util-stream": ^3.1.3
-    tslib: ^2.6.2
-  checksum: 0df31c8f484492ca9e1925569064a374f6b882fc0fbd9666c180413413594f16cb413f7f6d121b5dd81598f5f7a8a0084d4a2526249be7083d069b9313ba2815
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-ini@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.598.0"
-  dependencies:
-    "@aws-sdk/credential-provider-env": 3.598.0
-    "@aws-sdk/credential-provider-http": 3.598.0
-    "@aws-sdk/credential-provider-process": 3.598.0
-    "@aws-sdk/credential-provider-sso": 3.598.0
-    "@aws-sdk/credential-provider-web-identity": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@smithy/credential-provider-imds": ^3.1.1
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/shared-ini-file-loader": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.598.0
-  checksum: 9fab1e9c312e20150c96daf15e0347b79f0589cc44eb299c15e80c7d5380e8966805fa8893d3c906f99b7eb3c0f872f0795415f75921204580a30d869dd87f54
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-ini@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.609.0"
-  dependencies:
-    "@aws-sdk/credential-provider-env": 3.609.0
-    "@aws-sdk/credential-provider-http": 3.609.0
-    "@aws-sdk/credential-provider-process": 3.609.0
-    "@aws-sdk/credential-provider-sso": 3.609.0
-    "@aws-sdk/credential-provider-web-identity": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/credential-provider-imds": ^3.1.3
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.609.0
-  checksum: c8a2e83ff85d6b771ad52646b8945c4ca538c5d23c30880824a0e8aecbf5dc1413da166efc50517d449f56666fbc7c629b801a38b93503e5045565069ee1bfa5
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-ini@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.629.0"
-  dependencies:
-    "@aws-sdk/credential-provider-env": 3.620.1
-    "@aws-sdk/credential-provider-http": 3.622.0
-    "@aws-sdk/credential-provider-process": 3.620.1
-    "@aws-sdk/credential-provider-sso": 3.629.0
-    "@aws-sdk/credential-provider-web-identity": 3.621.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/credential-provider-imds": ^3.2.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.629.0
-  checksum: 60c883f0b3b2b57b9beb6e8bfec7089bcdc90722a507e593bcb3a9aecd5faff95701e5bd272e0e5c5a56feac579b2d2edcc00e1674a5bed20b98f3e1c2657452
+    "@aws-sdk/util-utf8-browser": ^3.0.0
+    tslib: ^1.11.1
+  checksum: 7bc1ff042d0c53a46c0fc3824bd97fb3ed1df7dc030b8a995889471052860b8c8ade469c97866fafd8249a3144d0f48b0f1054f357e2b403606009381c4b8f0e
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.598.0"
+"@aws-crypto/sha256-js@npm:2.0.0, @aws-crypto/sha256-js@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@aws-crypto/sha256-js@npm:2.0.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.598.0
-    "@aws-sdk/credential-provider-http": 3.598.0
-    "@aws-sdk/credential-provider-ini": 3.598.0
-    "@aws-sdk/credential-provider-process": 3.598.0
-    "@aws-sdk/credential-provider-sso": 3.598.0
-    "@aws-sdk/credential-provider-web-identity": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@smithy/credential-provider-imds": ^3.1.1
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/shared-ini-file-loader": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 524abdfe19587ee30a7f8bc58aca4a27d6131710ee2c3910ccbb392e1db8a5433162b0995387d7cddf64725d7ed69920c3c98c028b4eec5540cc3dfa2a2cfa03
+    "@aws-crypto/util": ^2.0.0
+    "@aws-sdk/types": ^3.1.0
+    tslib: ^1.11.1
+  checksum: e4abf9baec6bed19d380f92a999a41ac5bdd8890dfd45971d29054c298854c5b7087e7de633413f2e64618ef8238ccf4c0b75797c73063c74bbba3cb5d8b2581
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.609.0"
+"@aws-crypto/supports-web-crypto@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@aws-crypto/supports-web-crypto@npm:2.0.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.609.0
-    "@aws-sdk/credential-provider-http": 3.609.0
-    "@aws-sdk/credential-provider-ini": 3.609.0
-    "@aws-sdk/credential-provider-process": 3.609.0
-    "@aws-sdk/credential-provider-sso": 3.609.0
-    "@aws-sdk/credential-provider-web-identity": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/credential-provider-imds": ^3.1.3
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: edbb7202cdc55550d2b068fb9f81df4d1582010c0eb514c37f264ba7b016cbe86ab223c2ddc464aca0399870517621924e8fb1841705b601211af84db2fd1ef6
+    tslib: ^1.11.1
+  checksum: 77fad3813a5d3c495296fb836293184d32aeddacd436bf7d1b59b93d87de4cf7c0dbf862d4eaf915259edfb7b424ea05e2ceeddbaa1588a154d0c19df455c475
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.629.0"
+"@aws-crypto/util@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@aws-crypto/util@npm:2.0.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.620.1
-    "@aws-sdk/credential-provider-http": 3.622.0
-    "@aws-sdk/credential-provider-ini": 3.629.0
-    "@aws-sdk/credential-provider-process": 3.620.1
-    "@aws-sdk/credential-provider-sso": 3.629.0
-    "@aws-sdk/credential-provider-web-identity": 3.621.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/credential-provider-imds": ^3.2.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: d2f25ff51620ec3faad27771f3c4f95d45aab691e2680a978ccf46339365a8e7f1b46efbe8037d2d7f54ccf89f08d0fa17238dacbf41c1b3d68e27bf996904dd
+    "@aws-sdk/types": ^3.1.0
+    "@aws-sdk/util-utf8-browser": ^3.0.0
+    tslib: ^1.11.1
+  checksum: afff771bf8023218df3b224f0ad6b8f1a4cded4bdc0a4f9ff7234e7089311034b2046f8ba29d2e94810a46d5c38a2103d4828b60325cb0c49aea4d6cbb741c6a
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-process@npm:3.598.0"
+"@aws-sdk/abort-controller@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/abort-controller@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/shared-ini-file-loader": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: cd1f0dbbc38b137a0e9c2cfa9bb9e55eed1da5166e13576295205d276ab313e9d4a2f97a566d576abc85c6f4e9e84ad676ca5c32f90de17e027d6a1372fb00e6
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 9768573f8788db6fbed2a72a431860f6edb70a0795b78f2400993f91f471ad543e61eaca7503be949052af4ca953b23cc9b11e8bed5a3735198b65701349d759
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/client-ses@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/client-ses@npm:3.145.0"
+  dependencies:
+    "@aws-crypto/sha256-browser": 2.0.0
+    "@aws-crypto/sha256-js": 2.0.0
+    "@aws-sdk/client-sts": 3.145.0
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/credential-provider-node": 3.145.0
+    "@aws-sdk/fetch-http-handler": 3.131.0
+    "@aws-sdk/hash-node": 3.127.0
+    "@aws-sdk/invalid-dependency": 3.127.0
+    "@aws-sdk/middleware-content-length": 3.127.0
+    "@aws-sdk/middleware-host-header": 3.127.0
+    "@aws-sdk/middleware-logger": 3.127.0
+    "@aws-sdk/middleware-recursion-detection": 3.127.0
+    "@aws-sdk/middleware-retry": 3.127.0
+    "@aws-sdk/middleware-serde": 3.127.0
+    "@aws-sdk/middleware-signing": 3.130.0
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/middleware-user-agent": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/node-http-handler": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/smithy-client": 3.142.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    "@aws-sdk/util-base64-node": 3.55.0
+    "@aws-sdk/util-body-length-browser": 3.55.0
+    "@aws-sdk/util-body-length-node": 3.55.0
+    "@aws-sdk/util-defaults-mode-browser": 3.142.0
+    "@aws-sdk/util-defaults-mode-node": 3.142.0
+    "@aws-sdk/util-user-agent-browser": 3.127.0
+    "@aws-sdk/util-user-agent-node": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    "@aws-sdk/util-waiter": 3.127.0
+    entities: 2.2.0
+    fast-xml-parser: 3.19.0
+    tslib: ^2.3.1
+  checksum: f8239e413c13566d6dc87816cc7263a4d60725f4a69138b9327d32f5c31174805b47f904bcfa6d6e50ad400924a34769c8742821631f8da7fa87733990fc74cb
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/client-sqs@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/client-sqs@npm:3.145.0"
+  dependencies:
+    "@aws-crypto/sha256-browser": 2.0.0
+    "@aws-crypto/sha256-js": 2.0.0
+    "@aws-sdk/client-sts": 3.145.0
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/credential-provider-node": 3.145.0
+    "@aws-sdk/fetch-http-handler": 3.131.0
+    "@aws-sdk/hash-node": 3.127.0
+    "@aws-sdk/invalid-dependency": 3.127.0
+    "@aws-sdk/md5-js": 3.127.0
+    "@aws-sdk/middleware-content-length": 3.127.0
+    "@aws-sdk/middleware-host-header": 3.127.0
+    "@aws-sdk/middleware-logger": 3.127.0
+    "@aws-sdk/middleware-recursion-detection": 3.127.0
+    "@aws-sdk/middleware-retry": 3.127.0
+    "@aws-sdk/middleware-sdk-sqs": 3.127.0
+    "@aws-sdk/middleware-serde": 3.127.0
+    "@aws-sdk/middleware-signing": 3.130.0
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/middleware-user-agent": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/node-http-handler": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/smithy-client": 3.142.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    "@aws-sdk/util-base64-node": 3.55.0
+    "@aws-sdk/util-body-length-browser": 3.55.0
+    "@aws-sdk/util-body-length-node": 3.55.0
+    "@aws-sdk/util-defaults-mode-browser": 3.142.0
+    "@aws-sdk/util-defaults-mode-node": 3.142.0
+    "@aws-sdk/util-user-agent-browser": 3.127.0
+    "@aws-sdk/util-user-agent-node": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    entities: 2.2.0
+    fast-xml-parser: 3.19.0
+    tslib: ^2.3.1
+  checksum: d8bcaee4d84090fd842980cbe864f954f8e0dab1d4215e716c31baf62c14f5297cb18fb3ddc842ff4104c2d58045c67c9f7c63293c980c1d1407c6dc31598e39
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/client-ssm@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/client-ssm@npm:3.145.0"
+  dependencies:
+    "@aws-crypto/sha256-browser": 2.0.0
+    "@aws-crypto/sha256-js": 2.0.0
+    "@aws-sdk/client-sts": 3.145.0
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/credential-provider-node": 3.145.0
+    "@aws-sdk/fetch-http-handler": 3.131.0
+    "@aws-sdk/hash-node": 3.127.0
+    "@aws-sdk/invalid-dependency": 3.127.0
+    "@aws-sdk/middleware-content-length": 3.127.0
+    "@aws-sdk/middleware-host-header": 3.127.0
+    "@aws-sdk/middleware-logger": 3.127.0
+    "@aws-sdk/middleware-recursion-detection": 3.127.0
+    "@aws-sdk/middleware-retry": 3.127.0
+    "@aws-sdk/middleware-serde": 3.127.0
+    "@aws-sdk/middleware-signing": 3.130.0
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/middleware-user-agent": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/node-http-handler": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/smithy-client": 3.142.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    "@aws-sdk/util-base64-node": 3.55.0
+    "@aws-sdk/util-body-length-browser": 3.55.0
+    "@aws-sdk/util-body-length-node": 3.55.0
+    "@aws-sdk/util-defaults-mode-browser": 3.142.0
+    "@aws-sdk/util-defaults-mode-node": 3.142.0
+    "@aws-sdk/util-user-agent-browser": 3.127.0
+    "@aws-sdk/util-user-agent-node": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    "@aws-sdk/util-waiter": 3.127.0
+    tslib: ^2.3.1
+    uuid: ^8.3.2
+  checksum: 695fcad3f61fecffaf3f45f79e9e732bb3f219b1ce1aaf222ccbfc6c55ff9ff2cf3e323be03560dc3628a61748af7f7be51dde178e23e4ac4040de6117145ecb
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/client-sso@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/client-sso@npm:3.145.0"
+  dependencies:
+    "@aws-crypto/sha256-browser": 2.0.0
+    "@aws-crypto/sha256-js": 2.0.0
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/fetch-http-handler": 3.131.0
+    "@aws-sdk/hash-node": 3.127.0
+    "@aws-sdk/invalid-dependency": 3.127.0
+    "@aws-sdk/middleware-content-length": 3.127.0
+    "@aws-sdk/middleware-host-header": 3.127.0
+    "@aws-sdk/middleware-logger": 3.127.0
+    "@aws-sdk/middleware-recursion-detection": 3.127.0
+    "@aws-sdk/middleware-retry": 3.127.0
+    "@aws-sdk/middleware-serde": 3.127.0
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/middleware-user-agent": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/node-http-handler": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/smithy-client": 3.142.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    "@aws-sdk/util-base64-node": 3.55.0
+    "@aws-sdk/util-body-length-browser": 3.55.0
+    "@aws-sdk/util-body-length-node": 3.55.0
+    "@aws-sdk/util-defaults-mode-browser": 3.142.0
+    "@aws-sdk/util-defaults-mode-node": 3.142.0
+    "@aws-sdk/util-user-agent-browser": 3.127.0
+    "@aws-sdk/util-user-agent-node": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    tslib: ^2.3.1
+  checksum: c50b9ad2a096633d471161744de4a8940326c5357983f68602f8ebbdfe4b47e4b707050a99633b7e2ea0bb2438ce17d19bf22b2abc198e7385518e01d4cf5ca8
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/client-sts@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/client-sts@npm:3.145.0"
+  dependencies:
+    "@aws-crypto/sha256-browser": 2.0.0
+    "@aws-crypto/sha256-js": 2.0.0
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/credential-provider-node": 3.145.0
+    "@aws-sdk/fetch-http-handler": 3.131.0
+    "@aws-sdk/hash-node": 3.127.0
+    "@aws-sdk/invalid-dependency": 3.127.0
+    "@aws-sdk/middleware-content-length": 3.127.0
+    "@aws-sdk/middleware-host-header": 3.127.0
+    "@aws-sdk/middleware-logger": 3.127.0
+    "@aws-sdk/middleware-recursion-detection": 3.127.0
+    "@aws-sdk/middleware-retry": 3.127.0
+    "@aws-sdk/middleware-sdk-sts": 3.130.0
+    "@aws-sdk/middleware-serde": 3.127.0
+    "@aws-sdk/middleware-signing": 3.130.0
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/middleware-user-agent": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/node-http-handler": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/smithy-client": 3.142.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    "@aws-sdk/util-base64-node": 3.55.0
+    "@aws-sdk/util-body-length-browser": 3.55.0
+    "@aws-sdk/util-body-length-node": 3.55.0
+    "@aws-sdk/util-defaults-mode-browser": 3.142.0
+    "@aws-sdk/util-defaults-mode-node": 3.142.0
+    "@aws-sdk/util-user-agent-browser": 3.127.0
+    "@aws-sdk/util-user-agent-node": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    entities: 2.2.0
+    fast-xml-parser: 3.19.0
+    tslib: ^2.3.1
+  checksum: 4645c4902e0f32bd1e758ae7868150fd59000bc945979a9224a942c72cbc3418bbada9c21aa7162f7d42a232c0ba89faff948fa3efdbaff863fc89046d90c29d
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-process@npm:3.609.0"
+"@aws-sdk/config-resolver@npm:3.130.0":
+  version: 3.130.0
+  resolution: "@aws-sdk/config-resolver@npm:3.130.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 7f3d1dfb4dd016d0c2651a3d529b8a95a6e4e05ac455eee239284db5114a46722860cafe029eb3b4ca23206b1bd15e27eb74c980ecab21ead95c5c75c9c65fb2
+    "@aws-sdk/signature-v4": 3.130.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-config-provider": 3.109.0
+    "@aws-sdk/util-middleware": 3.127.0
+    tslib: ^2.3.1
+  checksum: 33fa2be1c94fffa2a053a53a2db3402f02493cacade3aff65d70474d404d71c1825c35dd78a3d87f9434b0f4212437bc82f83f10ae7cebdcfcfb0891145ce1ce
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.620.1":
-  version: 3.620.1
-  resolution: "@aws-sdk/credential-provider-process@npm:3.620.1"
+"@aws-sdk/credential-provider-env@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/credential-provider-env@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 1fd6d3abf35ccfaed0882ee74e4d876e8c6cfe8d8b23c574dfe98364b2a2f3226d97fe35e2d48b88dd514906595cbb5fa1e0066d989a9582f73f92117796168f
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: e4cc8bd53b67d07f9ff0b1eae9193e8a1bffdc167a49f09d96334476f6d165652a6ff68ba306c044d4ceeb84be4181104f1452d59ff75c7a284a6fde1516556b
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.598.0"
+"@aws-sdk/credential-provider-imds@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/credential-provider-imds@npm:3.127.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.598.0
-    "@aws-sdk/token-providers": 3.598.0
-    "@aws-sdk/types": 3.598.0
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/shared-ini-file-loader": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 16828609b9ac17772eecd89deb9ac9b98a1decad42ca1f8cf6a57e6873eeb3563db00bfb67684cbb08108d5ee6b8f98ec23047d7f6750cb67c1342cd8b96ac1c
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/url-parser": 3.127.0
+    tslib: ^2.3.1
+  checksum: f117bd18114cfee7f9a0201cc53244957f489b780ab5f57ef1c9896a9838688ffb9c7d3a4a6db366629aff2f7a99dab95a6b149130ccb0deab25f6fc04cd9edd
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.609.0"
+"@aws-sdk/credential-provider-ini@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.145.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.609.0
-    "@aws-sdk/token-providers": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: d893eba07e6f646a1fda8c9efa70757f4583c2e7588dd00b5d700c7a41dc6cd84c7a997f5e06ebef1d469be7f488908e9b6236f1007f599bae14c05176460a9a
+    "@aws-sdk/credential-provider-env": 3.127.0
+    "@aws-sdk/credential-provider-imds": 3.127.0
+    "@aws-sdk/credential-provider-sso": 3.145.0
+    "@aws-sdk/credential-provider-web-identity": 3.127.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/shared-ini-file-loader": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 1899ecf98373a60e4360873fab5ffd7b3f920f4762ff13e1f85ea2efa11e6201d13bd6f649b1090a0a57afbdba87fa3f35f66533bf3b34f8a6629363a6f86a76
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.629.0":
-  version: 3.629.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.629.0"
+"@aws-sdk/credential-provider-node@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.145.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.629.0
-    "@aws-sdk/token-providers": 3.614.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 940e6adc66f19b302440cff6bc6f48a98daf282809e4163437ed65baa035ca3e57cb4b14280c97dcad6914e45cf803baf49ea595c86a45f407437e820797d5db
+    "@aws-sdk/credential-provider-env": 3.127.0
+    "@aws-sdk/credential-provider-imds": 3.127.0
+    "@aws-sdk/credential-provider-ini": 3.145.0
+    "@aws-sdk/credential-provider-process": 3.127.0
+    "@aws-sdk/credential-provider-sso": 3.145.0
+    "@aws-sdk/credential-provider-web-identity": 3.127.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/shared-ini-file-loader": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 3795e31ab3717140df38712d18e1f3fd9ef66dc92943131c0a4cc2b640372463769005e2a943b6ffdac4052773ac77dd45f7fb86d8256e9630936b6536ee3f93
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.598.0"
+"@aws-sdk/credential-provider-process@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/credential-provider-process@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.598.0
-  checksum: e62352ae7f408ae8969d22fd42a502ec078536952be1253f184bf96c57f3c88589fd431762b2300b494159df4eb4af975358645772ac36f2cc722c86a88ff85e
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/shared-ini-file-loader": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 60becf9f7d939c11a7b8aa8b6116c37f7d8069d1049a39404ca1f839771c6da4226e58a0acea3830ec591df3949fe5c703b9cd11e42a4f0b6d4cc54c8b4127dd
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.609.0"
+"@aws-sdk/credential-provider-sso@npm:3.145.0":
+  version: 3.145.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.145.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.609.0
-  checksum: 7a95a6c4792491122677fab6f01a9a46c8aa2f94d95255430bbd3fdcd514ab05ecf92c0ab169c8b30215b6b9181165f8d009774ba5a39cdd633162ef30879e56
+    "@aws-sdk/client-sso": 3.145.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/shared-ini-file-loader": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 3c59745d1ce896481bcef875e330b0629e70e952398174227eb3d73ff41c6921f0552a7fdfee2a2b1f609dac5d7ec26bfb648af1899dd56b4d8c6c2f90347c22
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.621.0":
-  version: 3.621.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.621.0"
+"@aws-sdk/credential-provider-web-identity@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sts": ^3.621.0
-  checksum: b1157e83b81c21f384ad95d29c646149124136c38e6395265ff8d9f5f6afec1e3e2b70c1f0be165c440058802c3871f3766c5e7ba44705ced447de221f4d04df
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 359bc73eff0593e77e969a5e6506fedd93bd9e32f01043e044a5813dc445f7a5886bfac2676cabfc5c8a913dfc9c71e77fc68dfdd86ec5f1c293a342b42a13ee
   languageName: node
   linkType: hard
 
-"@aws-sdk/lib-storage@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/lib-storage@npm:3.609.0"
+"@aws-sdk/fetch-http-handler@npm:3.131.0":
+  version: 3.131.0
+  resolution: "@aws-sdk/fetch-http-handler@npm:3.131.0"
   dependencies:
-    "@smithy/abort-controller": ^3.1.1
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/smithy-client": ^3.1.5
-    buffer: 5.6.0
-    events: 3.3.0
-    stream-browserify: 3.0.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-s3": ^3.609.0
-  checksum: 780f4ad3397396f25b7d8960499a0b771131a6206473be5b63cbe388b454b7e6e5f325b900614f62903b6ab3f491b650bae71f6c3059033e170b7718b73c4ccb
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/querystring-builder": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-base64-browser": 3.109.0
+    tslib: ^2.3.1
+  checksum: 7bd5a83b929e59b86058c7a834daa8eedc7eab7a6bdb2016ff8898637c28bf7062830b108a45d70890062aa0f15271501290c18b06926a8af1bcb8d181817600
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.609.0"
+"@aws-sdk/hash-node@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/hash-node@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-arn-parser": 3.568.0
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    "@smithy/util-config-provider": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 85da5a4e08664163398fc8827b8d7fc1a3df67f73e85a898397e12091247fb4ffb7416ae74266161aa70dd2d4ad62add418c8e2617cf4c30e507da4a9e618c5c
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-buffer-from": 3.55.0
+    tslib: ^2.3.1
+  checksum: fb07d9cd29cae316a1a4c0cd448489d6e14bd386fa49b08832d015c8bbcc59cad94e21fdd2f74f8dab08e0c01e1e0cddeac47f48d89dc766d10e95a0a62e7a23
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.609.0"
+"@aws-sdk/invalid-dependency@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/invalid-dependency@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: cd4a153cb6a3307324b2081f6489e0f705ca1439b5325cceed5134294ace2a0ea09edbc8edf1948bb6549a1612b4378f802d3196ddea55a4629a1e7530fba149
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 456b675fd05716050d2dfc325f92918cbd5bbd11c90096673eb7bc66f61ef55021459e893839b8b62ac09ee320ef77924c30cb25530fa1c74b848f3989695fbd
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.609.0"
+"@aws-sdk/is-array-buffer@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/is-array-buffer@npm:3.55.0"
   dependencies:
-    "@aws-crypto/crc32": 5.2.0
-    "@aws-crypto/crc32c": 5.2.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/is-array-buffer": ^3.0.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 11c131300a0381e6da8f89ca345be70982440bfefa6577e5e93490ef83343b7b348e483e607e9cafae3c2aa953653ce00880d05f1e4ce7bd3671299cc8d06edd
+    tslib: ^2.3.1
+  checksum: 527481f024166197b84a2b4859b51df9b6da4396255c19832e8fdb2f6dfc914dab8ad89433602f8d797f3f8dacc312ab8a0073b2c8e20dc85a28ad9d27aceaa7
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/middleware-host-header@npm:3.598.0"
+"@aws-sdk/md5-js@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/md5-js@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: c505de5bf4f39051a55011b9b2da0b673bda668def00a9b3b4696a3146bfbf0e5509d3bde28ef238648158b863816ce85fbf5829228bb97450c826b7d24d40d0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-utf8-browser": 3.109.0
+    "@aws-sdk/util-utf8-node": 3.109.0
+    tslib: ^2.3.1
+  checksum: 101a4e1cca3308bf7cac5534b70f13a114e8250584d454afd59f34127be1259bc6b2489551b9da43561ab223015d6386a1025b10b4ba578e73c1b6a6a2673033
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-host-header@npm:3.609.0"
+"@aws-sdk/middleware-content-length@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-content-length@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 19eda952c9d1a8ab34e820d26306034bd98ea4e4330cda39b881cb9d71bd64064a75eef27a51c2c38ba4beef18c53b4f21619ce1598c10cc7fe7831ab5dd4698
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 817f74342e862bb10e871d09cf937d7bb7eb5189b2ec4b8ce7b0657c38c74b5d0b6be8143f6618e037c5a29bef624446dfd5fe0cc0ce8114d87d5eded4778074
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-host-header@npm:3.620.0"
+"@aws-sdk/middleware-host-header@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-host-header@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 829c2d230e5051704f45c5283c42bec657607f4e4b2dd251fda8a716be90f8c9dfd6e7d45892a9a558c35cb64711628b3d0f88b90fe8cd061382c70b473991ef
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 8ec8a7f7b260c6f3608ba6500586aefd024ac859baaccca9cbea73dfa43fc95cf3a123e369798c6bbd36ed7f3eb36482b5b2a41f46b0eb1416f94d6829e92e9f
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.609.0"
+"@aws-sdk/middleware-logger@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-logger@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: f7962cf0b382efdf56cd07f8c0279efead02365edd7a2c124be39551b51a8359ee0d6f0399fcbf679ead3d235e24d1765f79712cf88e06c0a5432bf2d0c317d8
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: edc37f262bdab27bd0d1e26ed1ec1656d8257e9b9db58f45ccd0eb9ff9a39f71deb43955a843d440adce73a608a499ce7478780b774b5fb057bc4769dd7ee27d
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/middleware-logger@npm:3.598.0"
+"@aws-sdk/middleware-recursion-detection@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 8c90bf68b65fe82ae08bf0c665bfea335fef757f8be7ddac6f9059f9f149c9bebc68e034bc225d131d168a61d61a409936d4f4d260c4b2aa2251385238df765a
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: dd04f307c4501bc35fef048a748a5d668061725b10d7cc39143404773049687957fa046b406677ce625279c1d2161cba17b0c639cb59579fc091abd06b91a719
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-logger@npm:3.609.0"
+"@aws-sdk/middleware-retry@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-retry@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: b6f67a2e9ba082c8aec9d45905ae45ea5a95896f1beecb0c2d7fecfe17dd8fad99513f43b11ed7fd6ca9ff7764a0fc1ce63af91b1baed92b36f7b4b5390be5c6
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/service-error-classification": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-middleware": 3.127.0
+    tslib: ^2.3.1
+    uuid: ^8.3.2
+  checksum: 314800be7d2cc1f20314ae413c029f31ef47ffc35a0a555944c87ea278ab61dafdf63cdf339effae9de66cbde542f0e25c8c8b3acf2c0d6a9cfbe59b09f646af
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.598.0"
+"@aws-sdk/middleware-sdk-sqs@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 161247dbbc8aa31d77c8d4c9c55264c775b5f9996e58451574605435c4a0ff6b9fce28be6f133ddce9f93a24f08c7af6fde59ef93ecb2cc4cd170a4db72b4833
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-hex-encoding": 3.109.0
+    tslib: ^2.3.1
+  checksum: 2e174046608bde60774abe93e0e29650411935d8bb6eae94d8f0de933cb00178e9fdc5da0b12572a47845c856cae89a4d278f286b20ef976755f5ef0cad254b5
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.609.0"
+"@aws-sdk/middleware-sdk-sts@npm:3.130.0":
+  version: 3.130.0
+  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.130.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: ec16809a501bd2182d87411fa96c409a91c166566370281c14c023ae169542c27f75f3e8e4167e538b4ce3a3e0e30cd082a3f9df24fdb6a2fb09c78c7824eda8
+    "@aws-sdk/middleware-signing": 3.130.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/signature-v4": 3.130.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 4c83eb02d9b8f0b18d9d24704e660463d9d15cc7881c231a1ad315681e5bdd67f70d413f00ddedbcd8c5ed337df317fa6ce366e5314b4a440269bd44c0fad514
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.620.0"
+"@aws-sdk/middleware-serde@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-serde@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 1dedbbab2f79d4c0b214ca183a45daf89e98f9a33b2a08dcd7d30e059c1bcc04a74499b49870300d5f0b827d660512582f96f857624d3feaaf194a7a92703cea
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: ff31988f06ef1b1d006ec4231d7dd8e72d60ba43d599952c504a9657308a7a0a7ef0d5610a5e73c58f66b8b168db1235c61d9276a1ef59b7ce9227d3e9eff026
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.609.0"
+"@aws-sdk/middleware-signing@npm:3.130.0":
+  version: 3.130.0
+  resolution: "@aws-sdk/middleware-signing@npm:3.130.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-arn-parser": 3.568.0
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/signature-v4": ^3.1.2
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    "@smithy/util-config-provider": ^3.0.0
-    tslib: ^2.6.2
-  checksum: b58b3387791a7a13c3474f845d84b3acfd1ac918e5e8837449404b124262de227f4c6a01a5b83ef443f819b67374cb613adc36cd852a6d304422314ca4f66a43
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/signature-v4": 3.130.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 74e4e480a027967cb9b0e060246e98b5d134bcc5509619b57247196337e19ae31273086a9c00bedfcab22982d5d583568b99343e7f3ea7cb5b99a8dbb89c2cde
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sqs@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.598.0"
+"@aws-sdk/middleware-stack@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-stack@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/smithy-client": ^3.1.2
-    "@smithy/types": ^3.1.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 5b31bc50ffb2973a1a5108ca0a9a2fbf3cc96a403fd06e58994eb9e98e5804cb8fd2d2db977214d92ce30a5a256b54df156b285f7a89e286e7d0ceb3d9f69414
+    tslib: ^2.3.1
+  checksum: 145a44b74681590edc328bb128a8f17af2b13b3e3a0c3bd8803636bafee4370db385fdc132d20ec2b0b331f849a367cb9b8b5ec37b4a705b70156c184ca9f84c
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sqs@npm:3.622.0":
-  version: 3.622.0
-  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.622.0"
+"@aws-sdk/middleware-user-agent@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/middleware-user-agent@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 6e187eda432d1a27ea4f23139895f6c9f5b22aea6fb7e5f67d88ec792627151e8fb0732f5296c9d9e80e258eb4a487fc3a2f14351153f8c2bcc6ab34804e85b8
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 2967bc7fce3f4e2ec35ee650c4fad897a4bc454884ada00031a302bfdf6d53153332e5171cc760defad2bcd7acadf6549a398bf606674f642573f2786c3741e0
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-signing@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-signing@npm:3.609.0"
+"@aws-sdk/node-config-provider@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/node-config-provider@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/signature-v4": ^3.1.2
-    "@smithy/types": ^3.3.0
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 10f9fb345cac0202680f18419b79991e4c95ef5b2d7f744b991f51e07b6084b1f82b3a14fa80ac6bef5090217a4dd6b35d3165f44a4760a368a7a6c56ee9d2ee
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/shared-ini-file-loader": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 733a40d93a45258c8c94702c0c5fcd829c2fcc6e3ec4c3e4d63b77ee1b01ee6591b49216b9acd80388de238603ab0a92dd0e7a09b09c654997873e574e95e4d2
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-ssec@npm:3.609.0"
+"@aws-sdk/node-http-handler@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/node-http-handler@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 4b40627ed103159ef0db4cc6bdc2148d1a65b786f3d1c643d34bccc79b9d265495613dc9bb34d18d5ab9b21b5d31110e495ec2b077e6e2f7603a0493254180a2
+    "@aws-sdk/abort-controller": 3.127.0
+    "@aws-sdk/protocol-http": 3.127.0
+    "@aws-sdk/querystring-builder": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 55629edb90766ab5e62db4cd3a57751d719ddf79a1ebd9a8221fc9289509589535859337726b8ea942b96bcb356881ac1fc59707b9873270bde36da870092fab
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.598.0"
+"@aws-sdk/property-provider@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/property-provider@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@aws-sdk/util-endpoints": 3.598.0
-    "@smithy/protocol-http": ^4.0.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 11dcf64badadf8c6b3283b3cec4cb684467eaf57206782c68a9b758e6f7a4f1b632d5ed89bb6ffbc855bf6d3fb855f0a56858bda640a67c0812ced08cd19959f
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: e78770762fb0d5d904c0d270266cb9ef580184c0aee25d1df389bff3e66f6c4cfa2c99104488539d22fa642c6102027772b85b42a07c2a90306b0c4751a81698
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.609.0"
+"@aws-sdk/protocol-http@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/protocol-http@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.609.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: f507c439e0001dc5c4ef90455c3ba4926c905f825678ddb0c133b32620f9d60188553cbb848cdb813c0cf70ff26cd0cb418ec6088615e73a1943041e82f238bc
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 2d34deb09bd1ba4316945f441f75600aa621d8fa9021c92a91582ac299d857a64572eeb87f7306e3a06c899635dccc717e1353aa290d38665be97487b13038ee
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.620.0"
+"@aws-sdk/querystring-builder@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/querystring-builder@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 137a969b5c17ebf172aa1f5a393812c443425dd9833fdf786a3039af5b3197e7d17139659891858b268ff723d9f2c5fbc840e8ac6a7af4b1cb566a3d54746a51
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-uri-escape": 3.55.0
+    tslib: ^2.3.1
+  checksum: ac84867b038c530821987db9fac8aaab20dd4b0d0c9fe78caee2f5dd4e8d5b6a99b8cb7ea7816476b9b13149305aea46a2c176130b586882243a82478de35473
   languageName: node
   linkType: hard
 
-"@aws-sdk/region-config-resolver@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/region-config-resolver@npm:3.598.0"
+"@aws-sdk/querystring-parser@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/querystring-parser@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/types": ^3.1.0
-    "@smithy/util-config-provider": ^3.0.0
-    "@smithy/util-middleware": ^3.0.1
-    tslib: ^2.6.2
-  checksum: 649115771cb6b77e793088f3ee6eec346c1379f9f5d0e925f71103ad55c5f4a1132fca7e859a6b75ff46ecd1cc165a4eb260227596e4a2871118e6918602a726
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 1dcb87be1586e21cc4d98653211ab1d4f484c9a8d62be0acfbd8dde3629559e079e3ca67eb20ce6bc17a53262d5d3462eb3d701573380ea216a2dd77088cd2a5
   languageName: node
   linkType: hard
 
-"@aws-sdk/region-config-resolver@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/region-config-resolver@npm:3.609.0"
-  dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    "@smithy/util-config-provider": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 778620f97e7c67bff7ef0aae66bf49f23f98b26aaa9c3244b1f311cb41dda8efed496ab344abb492c1a85caf8a364c3566fe29329af192b8aff896edeb2f7cc3
+"@aws-sdk/service-error-classification@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/service-error-classification@npm:3.127.0"
+  checksum: dcc743ac7a480edf56eac3861d575819edd5f181f67e603c4f6cc2291ae1f88c116dc2cab19da172a1f7dc5f62195875483c5105ac2f4076ba6caf518ab3867d
   languageName: node
   linkType: hard
 
-"@aws-sdk/region-config-resolver@npm:3.614.0":
-  version: 3.614.0
-  resolution: "@aws-sdk/region-config-resolver@npm:3.614.0"
+"@aws-sdk/shared-ini-file-loader@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/shared-ini-file-loader@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/types": ^3.3.0
-    "@smithy/util-config-provider": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: dbaca50792c99685845b21dd4a53228613e0458ee517a21db941890ee521d91eff80704f08e9ee71b6f04e70fb86362c4823750bb0b3727240af68d78d8fa4be
+    tslib: ^2.3.1
+  checksum: fa0c8ffa5d42940778b14e8f1d8998605b5d7ea43f3c19cc9dbb02f2d552c35dabc5850a5e6d3f6af68978b2171aaec435c05c648a1ecf1c2fb81fe9a60d9702
   languageName: node
   linkType: hard
 
-"@aws-sdk/s3-presigned-post@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/s3-presigned-post@npm:3.609.0"
+"@aws-sdk/signature-v4@npm:3.130.0":
+  version: 3.130.0
+  resolution: "@aws-sdk/signature-v4@npm:3.130.0"
   dependencies:
-    "@aws-sdk/client-s3": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-format-url": 3.609.0
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/signature-v4": ^3.1.2
-    "@smithy/types": ^3.3.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 56f0824dddcf1102532682b113d1f358860334e4210971b4201b3c5f58192d826ccdddc6ed48f79ca89c9f2ef5d3814df3fea509f67af39c346c97c3ec176674
+    "@aws-sdk/is-array-buffer": 3.55.0
+    "@aws-sdk/types": 3.127.0
+    "@aws-sdk/util-hex-encoding": 3.109.0
+    "@aws-sdk/util-middleware": 3.127.0
+    "@aws-sdk/util-uri-escape": 3.55.0
+    tslib: ^2.3.1
+  checksum: 10c63fa18db144eda63727006e812b1cd504b49e5c345c94ce45a0b4b072b82f1e5ca964468868a5351b0e795f1b2945bc2f4ef81a9fa2bad26485226958c33d
   languageName: node
   linkType: hard
 
-"@aws-sdk/s3-request-presigner@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/s3-request-presigner@npm:3.609.0"
+"@aws-sdk/smithy-client@npm:3.142.0":
+  version: 3.142.0
+  resolution: "@aws-sdk/smithy-client@npm:3.142.0"
   dependencies:
-    "@aws-sdk/signature-v4-multi-region": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-format-url": 3.609.0
-    "@smithy/middleware-endpoint": ^3.0.4
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/smithy-client": ^3.1.5
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: c9ac49f8badcc2d059a9d696bcb41f755e5701097449663d559d1180f867c51befc316482b3cca4f862cf77af379c1d84bb816bb299ecf43e342e8a7c9a19a4d
+    "@aws-sdk/middleware-stack": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: e87b04dc11b935ba6ae30d894f28cfb93894d96f19bfaa9f8656cdad85d6daf68f8067493a228e9dc4eee4fc91672254287ce2f37740d895d89806c151785280
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.609.0"
-  dependencies:
-    "@aws-sdk/middleware-sdk-s3": 3.609.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.0.3
-    "@smithy/signature-v4": ^3.1.2
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: c132d10d2f10d1ae66429b770e9aee233041a88ac7e24384be6f24805b86120d2f834d08b9d252a6ccb75adbd3d95bd16cdeb1b0de03617a728ed58e30527efb
+"@aws-sdk/types@npm:3.127.0, @aws-sdk/types@npm:^3.1.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/types@npm:3.127.0"
+  checksum: 35467177421fb180ca73eb85a327c814e3aaee11a8eabbf9f048d58ec4133d7205400ce2e3c3ef70d78a64a2359f1df2926e1a0e6f169a415c2896ff6dfb66d9
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/token-providers@npm:3.598.0"
+"@aws-sdk/url-parser@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/url-parser@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/property-provider": ^3.1.1
-    "@smithy/shared-ini-file-loader": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sso-oidc": ^3.598.0
-  checksum: 24197672226e1e953fa57ca10c6adae9c3f6b571fbf40f517609e028d8ea6ab45c3afd285bd999bc35c0690b3427be04d4af3f677ced6778b0a716e0dd4e5280
+    "@aws-sdk/querystring-parser": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 5732f51d6fef2d26599cb186e230cd8e99c567f6efd7b3f27dc0ecdb660510a20a3384f00c5edb08d0e8e59fe3bcb5b8e368558aefbff2cf5201eaeb7caefa4a
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/token-providers@npm:3.609.0"
+"@aws-sdk/util-base64-browser@npm:3.109.0":
+  version: 3.109.0
+  resolution: "@aws-sdk/util-base64-browser@npm:3.109.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sso-oidc": ^3.609.0
-  checksum: e9cff1b94991cc0847fdb757e65325fc1af48f445c100a85e82c044f97ead6b9e516c122a2842b35e1e1b38e0f9792ef5e65c22cac240b6fe8e90fb0ee3c248a
+    tslib: ^2.3.1
+  checksum: e4fb1dc0e5ac60320d4ba05dcf03b8e641c7a304f918df3134bf46c8ccf5b09d07ee283924a4cc4e9250fef582a2636bb4dac6ba71ee36662b2678dfe49d46b2
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.614.0":
-  version: 3.614.0
-  resolution: "@aws-sdk/token-providers@npm:3.614.0"
+"@aws-sdk/util-base64-node@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/util-base64-node@npm:3.55.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    "@aws-sdk/client-sso-oidc": ^3.614.0
-  checksum: 2901b8428afc3b76ff1df9ac29a2698db6bf65d1d2afcd8424b9bf187313d2a3ca747c3b205afeb5c132068b5a5a94d84ce82710f775fa0cbb79499d7fea2d64
+    "@aws-sdk/util-buffer-from": 3.55.0
+    tslib: ^2.3.1
+  checksum: 4a2a58ae2e5d2d904271dd0433b9c15ca9a8e9d62e979c82159420ab8e1b573e96c8f223c951be2139cdfe49a09c478d165eff9468978883c4c5bcdfa7d9fd4b
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/types@npm:3.598.0"
+"@aws-sdk/util-body-length-browser@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/util-body-length-browser@npm:3.55.0"
   dependencies:
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
-  checksum: 9b2bd50d6935422dd1046e6eaa48c4c774d06aa1374bf4600a3af2c7a52432b5e25ec111cf49976b07b03d7cb5f4fa6fd44b7ce8a67dd0b3a4cee4abaf9e6fa5
+    tslib: ^2.3.1
+  checksum: f10c9e1f052da751e762e807f23b768052e5d375d7e048d596ee1d607065ff0c0ef7004bd4fd136848b6a5646c1c69e43860aa7a3da80d90023b749530faad59
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.609.0, @aws-sdk/types@npm:^3.222.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/types@npm:3.609.0"
+"@aws-sdk/util-body-length-node@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/util-body-length-node@npm:3.55.0"
   dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 522768d08f104065b0ff6a37eddaa7803186014acee1c0011b3dbd3ef841e47ae694e58f608aeec8a39d22d644d759ade996fe51d18b880617778dc2dbbe1ede
+    tslib: ^2.3.1
+  checksum: 35ae66271b7160c53b344a2bd933b5882e9fcef4a47c579a2a9e313657da8b896ca6c674489767f75d148ea5ffb8cbde2127eae55f5f39aaa4823a7c1d98ec69
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-arn-parser@npm:3.568.0":
-  version: 3.568.0
-  resolution: "@aws-sdk/util-arn-parser@npm:3.568.0"
+"@aws-sdk/util-buffer-from@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/util-buffer-from@npm:3.55.0"
   dependencies:
-    tslib: ^2.6.2
-  checksum: e3c45e5d524a772954d0a33614d397414185b9eb635423d01253cad1c1b9add625798ed9cf23343d156fae89c701f484bc062ab673f67e2e2edfe362fde6d170
+    "@aws-sdk/is-array-buffer": 3.55.0
+    tslib: ^2.3.1
+  checksum: 0c1d72cf2369c13a8bff7d990f8e8da7f5584dcbdf1965cf50674d531b42d80661eebdbbaf968d6932760fc3f5708374a676d05485a1d02347655ea5f2423f57
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.598.0"
+"@aws-sdk/util-config-provider@npm:3.109.0":
+  version: 3.109.0
+  resolution: "@aws-sdk/util-config-provider@npm:3.109.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/types": ^3.1.0
-    "@smithy/util-endpoints": ^2.0.2
-    tslib: ^2.6.2
-  checksum: 6fb92e8c99b6ce96cda21c9d1744a290c683bae8d82394c1b1fe7ed7d3cb0a18d4025b8863532680db3f550ad130e54d528c64a0a32f398f3c00c5ce2e043ecd
+    tslib: ^2.3.1
+  checksum: 99c9ef24faa555a317b46b782e211474dd9d666611e1aa76b963e93a6e7c54e32d5c20b87d9a601b9de68dfa1c7310d72667a74c335b31edb776e8494e2541af
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.609.0"
+"@aws-sdk/util-defaults-mode-browser@npm:3.142.0":
+  version: 3.142.0
+  resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.142.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-endpoints": ^2.0.4
-    tslib: ^2.6.2
-  checksum: c296c223c4f7cead8284cc0704eb045320bc1c21d4a18bbe735c42076f358cc50371d1c45a2c0d553bd127055861ded1b3ce48b9e220aeb136a233836fe2da3a
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    bowser: ^2.11.0
+    tslib: ^2.3.1
+  checksum: 6ead8f767c2dcc0e21be180784a9ca5b57daa905a426fac0d0aa12f79f026d2da55d83c8b29cbec5c6e7adaccad8219b300dc30913808770ff7a20f2aa45be15
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.614.0":
-  version: 3.614.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.614.0"
+"@aws-sdk/util-defaults-mode-node@npm:3.142.0":
+  version: 3.142.0
+  resolution: "@aws-sdk/util-defaults-mode-node@npm:3.142.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-endpoints": ^2.0.5
-    tslib: ^2.6.2
-  checksum: 9d9973ceee59bf30af85c7f4328083daea033a987ec396dcb89eb7649f470ceb19c6b96635e121f3557e726f7ec7453236c956cf43f22128883c277f17d2a13f
+    "@aws-sdk/config-resolver": 3.130.0
+    "@aws-sdk/credential-provider-imds": 3.127.0
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/property-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 6025ea3359a16a312d1b9bdedc761f4eabd59d274bc96290514c3d8107e89da8c365db6bc23b4fb5143de5faa89ac082d435cbc655ca4457a6d9384a4bd5b643
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-format-url@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/util-format-url@npm:3.609.0"
+"@aws-sdk/util-hex-encoding@npm:3.109.0":
+  version: 3.109.0
+  resolution: "@aws-sdk/util-hex-encoding@npm:3.109.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/querystring-builder": ^3.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 487a666cc4f6a3a8bcd27839fda7b79a3dccc81a7bd694a9903c6ea3695e1cc7cb2e538421335db5fb59460a148cc1a4a0a6e4796c5241a0ab406c4190f781d9
+    tslib: ^2.3.1
+  checksum: 1c166b53d7f84c0271cb71da8ac0ef4a9bfd78f2d2d70e4a903921dd3c355a79a446fa66ff64522d87aa9c738f445fdfd527043980bea642ae3acbc7dd758edf
   languageName: node
   linkType: hard
 
@@ -2407,88 +1457,78 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.598.0"
+"@aws-sdk/util-middleware@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/util-middleware@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/types": ^3.1.0
-    bowser: ^2.11.0
-    tslib: ^2.6.2
-  checksum: c53afc0fe7a07838ad22ae1e9ed6834d56a69cb0ad623d4912deeaa715af479b64266965fce30e7210e576118f80ceb525f79f504dc459fe0294fd15e694752e
+    tslib: ^2.3.1
+  checksum: c845b1bf6339cdee9762f41c3578fafb780bf5341037d3381c4dc799ac31626031de2a80735a5edaf260da655b1ef054a950dda552aedeed4188dfe42c717e83
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.609.0"
+"@aws-sdk/util-uri-escape@npm:3.55.0":
+  version: 3.55.0
+  resolution: "@aws-sdk/util-uri-escape@npm:3.55.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
+    tslib: ^2.3.1
+  checksum: fad6780856f2b42a11ce7bb1e2ea5b7a966a8f564f3d09e83dca024291ae589a0cb2a1d294812cd626346addeb292c178f84867e40f8fab6fca067bc42ad360a
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/util-user-agent-browser@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/util-user-agent-browser@npm:3.127.0"
+  dependencies:
+    "@aws-sdk/types": 3.127.0
     bowser: ^2.11.0
-    tslib: ^2.6.2
-  checksum: 75ba1ae74dd1001f47870766d92b66ac02a0a488efcf42c1a368962a7978a778d99536e880f07f7db1c2ca66cc9b1863fd3342957a22dcf78bf2f4398265a7a5
+    tslib: ^2.3.1
+  checksum: 42f08784b3f6f535516467e60897330e23b853e9ce134e9095170ef36c715aa04017b066fddf2b4830438bb00b630e7895dfcfbfaaa4d8de63d9983d9f205e25
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.598.0":
-  version: 3.598.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.598.0"
+"@aws-sdk/util-user-agent-node@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/util-user-agent-node@npm:3.127.0"
   dependencies:
-    "@aws-sdk/types": 3.598.0
-    "@smithy/node-config-provider": ^3.1.1
-    "@smithy/types": ^3.1.0
-    tslib: ^2.6.2
+    "@aws-sdk/node-config-provider": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
   peerDependencies:
     aws-crt: ">=1.0.0"
   peerDependenciesMeta:
     aws-crt:
       optional: true
-  checksum: 1560fabf19b236cfbce42769e1ef7e46bdad881b8a4b0ce069401d9a6edd5e1b195f45cb2847abf9ef1453d2e69447e7a3dabc92b037d9a41fe58960538db1ae
+  checksum: bba9cce7a775a3985b97960d64990d1b18ee39f0fdebcebd8d63f3eb951fe41f6808b9272ddafde2a4366f9e041bd10aec74aa8dba33d70101458dc8ce086ccf
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.609.0"
+"@aws-sdk/util-utf8-browser@npm:3.109.0, @aws-sdk/util-utf8-browser@npm:^3.0.0":
+  version: 3.109.0
+  resolution: "@aws-sdk/util-utf8-browser@npm:3.109.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/node-config-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    aws-crt: ">=1.0.0"
-  peerDependenciesMeta:
-    aws-crt:
-      optional: true
-  checksum: 971a9b546a3290ab116129872876dca4d5e68aed8b00d19a656dc2c02b96f04fd466f88719b9c7194140916d6fd49733f9b506ffda59d4a26e696f7b9062e743
+    tslib: ^2.3.1
+  checksum: 8311763b04261dab5995ec67abf31795f41e9c4b1ad635ed305735e14c7e3bc48e9ae349a06aab485390358a6a58e97190144ea51190983cec4ae665887b219b
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.614.0":
-  version: 3.614.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.614.0"
+"@aws-sdk/util-utf8-node@npm:3.109.0":
+  version: 3.109.0
+  resolution: "@aws-sdk/util-utf8-node@npm:3.109.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  peerDependencies:
-    aws-crt: ">=1.0.0"
-  peerDependenciesMeta:
-    aws-crt:
-      optional: true
-  checksum: 1f010080c2301fd836908963a235ef39e597d959e27461d15d4958fa582ab20795022f8cb7429c183c386f558a5c125cb254a0c4e844dbc6422169f4884be34a
+    "@aws-sdk/util-buffer-from": 3.55.0
+    tslib: ^2.3.1
+  checksum: ef706db8c0ceb014bc2fb9e5045b54369160648a9e919836132f98c5537eda82193f400fab607783ecf98a5df11b66c32256c4f2780bc689d7507ddaf2a0977b
   languageName: node
   linkType: hard
 
-"@aws-sdk/xml-builder@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/xml-builder@npm:3.609.0"
+"@aws-sdk/util-waiter@npm:3.127.0":
+  version: 3.127.0
+  resolution: "@aws-sdk/util-waiter@npm:3.127.0"
   dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 0e9c8b7786737ff50a6cf39f7ca9a758897c2db364718364b5dad45f50a33e65bd7801348fd033af60768a5be64b454c3a7e65222e13c70d145e8df6211ca33c
+    "@aws-sdk/abort-controller": 3.127.0
+    "@aws-sdk/types": 3.127.0
+    tslib: ^2.3.1
+  checksum: 3c27de00e943409a1fb927e450ecb7bd83cd6eb6329e0fbf51f20bd657a35571f181074f2ca1b612f87c07844be53129bf868c4acd4c734e22313197e6c70b1e
   languageName: node
   linkType: hard
 
@@ -8561,6 +7601,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@colors/colors@npm:1.6.0, @colors/colors@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@colors/colors@npm:1.6.0"
+  checksum: aa209963e0c3218e80a4a20553ba8c0fbb6fa13140540b4e5f97923790be06801fc90172c1114fc8b7e888b3d012b67298cde6b9e81521361becfaee400c662f
+  languageName: node
+  linkType: hard
+
 "@contentful/app-sdk@npm:4.16.0":
   version: 4.16.0
   resolution: "@contentful/app-sdk@npm:4.16.0"
@@ -11858,6 +10905,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@faker-js/faker@npm:8.4.1":
+  version: 8.4.1
+  resolution: "@faker-js/faker@npm:8.4.1"
+  checksum: d802d531f8929562715adc279cfec763c9a4bc596ec67b0ce43fd0ae61b285d2b0eec6f1f4aa852452a63721a842fe7e81926dce7bd92acca94b01e2a1f55f5a
+  languageName: node
+  linkType: hard
+
 "@fal-works/esbuild-plugin-global-externals@npm:^2.1.2":
   version: 2.1.2
   resolution: "@fal-works/esbuild-plugin-global-externals@npm:2.1.2"
@@ -13318,14 +12372,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hapi/hoek@npm:^9.0.0":
+"@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0":
   version: 9.3.0
   resolution: "@hapi/hoek@npm:9.3.0"
   checksum: 4771c7a776242c3c022b168046af4e324d116a9d2e1d60631ee64f474c6e38d1bb07092d898bf95c7bc5d334c5582798a1456321b2e53ca817d4e7c88bc25b43
   languageName: node
   linkType: hard
 
-"@hapi/topo@npm:^5.0.0":
+"@hapi/topo@npm:^5.0.0, @hapi/topo@npm:^5.1.0":
   version: 5.1.0
   resolution: "@hapi/topo@npm:5.1.0"
   dependencies:
@@ -13502,6 +12556,7 @@ __metadata:
     react-native-app-auth: 7.2.0
     react-native-blob-util: 0.19.9
     react-native-code-push: 8.2.2
+    react-native-date-picker: 5.0.4
     react-native-device-info: 10.3.0
     react-native-dialogs: 1.1.2
     react-native-gesture-handler: 2.17.1
@@ -13530,9 +12585,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@island.is/regulations-tools@npm:0.9.1":
-  version: 0.9.1
-  resolution: "@island.is/regulations-tools@npm:0.9.1"
+"@island.is/regulations-tools@npm:0.9.2":
+  version: 0.9.2
+  resolution: "@island.is/regulations-tools@npm:0.9.2"
   dependencies:
     "@hugsmidjan/htmldiff-js": ^1.3.0
     "@hugsmidjan/qj": ^4.10.2
@@ -13541,12 +12596,13 @@ __metadata:
     cleanup-prettier: "npm:prettier@2.2.0"
     date-fns: ^2.29.3
     jsdom: ^16.4.0
+    mammoth: ^1.8.0
     tinymce: ^5.10.2
     translate.js: ^1.3.2
   peerDependencies:
     react: ">=16.8 <20"
     react-dom: ">=16.8 <20"
-  checksum: e141dc6511c7e6e454389f44219a3784d8aa5072c2731020236b1c7964be524471644a0b3917296bb2a3505d451239639ab59f9e68960a25abef939360645c6f
+  checksum: ff68844989ec461e69e79c1206da8ed20f044225e87907b1b513732ea2708a6d9e8f2949ba5622f52af8e5659dfde4887e6719837ec41681f04c273aa6d43fae
   languageName: node
   linkType: hard
 
@@ -14246,6 +13302,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jsdevtools/ono@npm:^7.1.3":
+  version: 7.1.3
+  resolution: "@jsdevtools/ono@npm:7.1.3"
+  checksum: 2297fcd472ba810bffe8519d2249171132844c7174f3a16634f9260761c8c78bc0428a4190b5b6d72d45673c13918ab9844d706c3ed4ef8f62ab11a2627a08ad
+  languageName: node
+  linkType: hard
+
 "@juggle/resize-observer@npm:^3.3.1, @juggle/resize-observer@npm:^3.4.0":
   version: 3.4.0
   resolution: "@juggle/resize-observer@npm:3.4.0"
@@ -14379,6 +13442,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mockoon/cli@npm:8.4.0":
+  version: 8.4.0
+  resolution: "@mockoon/cli@npm:8.4.0"
+  dependencies:
+    "@mockoon/commons": 8.4.0
+    "@mockoon/commons-server": 8.4.0
+    "@oclif/core": 3.27.0
+    "@oclif/plugin-help": 6.2.7
+    jsonfile: 6.1.0
+    mkdirp: 3.0.1
+    mustache: 4.2.0
+    tslib: 2.6.3
+  bin:
+    mockoon-cli: bin/run.js
+  checksum: 54e37c3c1077817521846f29df45c8426663490432fe803a7305460a7587f727d8ce5246ca298c4187532f32cec0360eb1e5078f7dba625724eee8d8f1ced995
+  languageName: node
+  linkType: hard
+
+"@mockoon/commons-server@npm:8.4.0":
+  version: 8.4.0
+  resolution: "@mockoon/commons-server@npm:8.4.0"
+  dependencies:
+    "@apidevtools/swagger-parser": 10.1.0
+    "@faker-js/faker": 8.4.1
+    "@mockoon/commons": 8.4.0
+    append-field: 1.0.0
+    busboy: 1.6.0
+    cookie-parser: 1.4.6
+    date-fns: 3.6.0
+    express: 4.19.2
+    handlebars: 4.7.8
+    http-proxy-middleware: 2.0.6
+    jsonpath-plus: 8.1.0
+    killable: 1.0.1
+    mime-types: 2.1.35
+    object-path: 0.11.8
+    qs: 6.12.3
+    range-parser: 1.2.1
+    typed-emitter: 2.1.0
+    winston: 3.13.1
+    xml-js: 1.6.11
+  checksum: a4390d6dd93fe2f35e62cd14f9e3b4a174a6a57e9db4bfa1bd26866f2c07a008da9711189a37757b462e375e26df81102ebe284210a61736e8325ce3a4d3d0e5
+  languageName: node
+  linkType: hard
+
+"@mockoon/commons@npm:8.4.0":
+  version: 8.4.0
+  resolution: "@mockoon/commons@npm:8.4.0"
+  dependencies:
+    joi: 17.13.3
+  checksum: 0a448574fb4d89f126d8de66d323275fc70551f003bbd9a091be41f2bce4fd3f0222f2f9095226adc8749edb23f4c9a0f7738564f343d031a1aa6b24cc13af96
+  languageName: node
+  linkType: hard
+
 "@motionone/animation@npm:^10.18.0":
   version: 10.18.0
   resolution: "@motionone/animation@npm:10.18.0"
@@ -15881,6 +14998,76 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@oclif/core@npm:3.27.0":
+  version: 3.27.0
+  resolution: "@oclif/core@npm:3.27.0"
+  dependencies:
+    "@types/cli-progress": ^3.11.5
+    ansi-escapes: ^4.3.2
+    ansi-styles: ^4.3.0
+    cardinal: ^2.1.1
+    chalk: ^4.1.2
+    clean-stack: ^3.0.1
+    cli-progress: ^3.12.0
+    color: ^4.2.3
+    debug: ^4.3.5
+    ejs: ^3.1.10
+    get-package-type: ^0.1.0
+    globby: ^11.1.0
+    hyperlinker: ^1.0.0
+    indent-string: ^4.0.0
+    is-wsl: ^2.2.0
+    js-yaml: ^3.14.1
+    minimatch: ^9.0.4
+    natural-orderby: ^2.0.3
+    object-treeify: ^1.1.33
+    password-prompt: ^1.1.3
+    slice-ansi: ^4.0.0
+    string-width: ^4.2.3
+    strip-ansi: ^6.0.1
+    supports-color: ^8.1.1
+    supports-hyperlinks: ^2.2.0
+    widest-line: ^3.1.0
+    wordwrap: ^1.0.0
+    wrap-ansi: ^7.0.0
+  checksum: 4d16ecf4810cf591099276c3068ef0703be3f85f4704265d37c5cb8bae5934027c22c6c0481a6173c7bfc2fdd304328c5db675e52358770da6e041c47f7e071a
+  languageName: node
+  linkType: hard
+
+"@oclif/core@npm:^4":
+  version: 4.0.17
+  resolution: "@oclif/core@npm:4.0.17"
+  dependencies:
+    ansi-escapes: ^4.3.2
+    ansis: ^3.3.2
+    clean-stack: ^3.0.1
+    cli-spinners: ^2.9.2
+    debug: ^4.3.5
+    ejs: ^3.1.10
+    get-package-type: ^0.1.0
+    globby: ^11.1.0
+    indent-string: ^4.0.0
+    is-wsl: ^2.2.0
+    lilconfig: ^3.1.2
+    minimatch: ^9.0.5
+    string-width: ^4.2.3
+    supports-color: ^8
+    widest-line: ^3.1.0
+    wordwrap: ^1.0.0
+    wrap-ansi: ^7.0.0
+  checksum: 6ea9df6710f0109c2d8285d979cea32f62b16928f4eea1a1a1d7b323183c547a15876ba35def64ac9bd5e8569a5740713e4be5ec751e62bdd6fe3f18c9f199a7
+  languageName: node
+  linkType: hard
+
+"@oclif/plugin-help@npm:6.2.7":
+  version: 6.2.7
+  resolution: "@oclif/plugin-help@npm:6.2.7"
+  dependencies:
+    "@oclif/core": ^4
+  checksum: d296e8cdb042effe2971ec4948d24457d012390f72fcce76bcad0789e2759460ac7caa7c838f057ae1a85ff56f25c83885b544e60038ef6a8737beeece39a253
+  languageName: node
+  linkType: hard
+
 "@open-draft/until@npm:^1.0.3":
   version: 1.0.3
   resolution: "@open-draft/until@npm:1.0.3"
@@ -17842,6 +17029,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sideway/address@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "@sideway/address@npm:4.1.5"
+  dependencies:
+    "@hapi/hoek": ^9.0.0
+  checksum: 3e3ea0f00b4765d86509282290368a4a5fd39a7995fdc6de42116ca19a96120858e56c2c995081def06e1c53e1f8bccc7d013f6326602bec9d56b72ee2772b9d
+  languageName: node
+  linkType: hard
+
 "@sideway/formula@npm:^3.0.1":
   version: 3.0.1
   resolution: "@sideway/formula@npm:3.0.1"
@@ -17946,634 +17142,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/abort-controller@npm:3.1.1, @smithy/abort-controller@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@smithy/abort-controller@npm:3.1.1"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 7b7497f49d58787cad858f8c5ea9931ccd44d39536db4abdd531a5abf37784469522e41d9ad1d541892caa0ed3bea750447809a0a18f4689a9543d672aa61d48
-  languageName: node
-  linkType: hard
-
-"@smithy/abort-controller@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "@smithy/abort-controller@npm:1.1.0"
-  dependencies:
-    "@smithy/types": ^1.2.0
-    tslib: ^2.5.0
-  checksum: 4299368f0b7dbeb8ffba00632b191ec39113fa9b9d29c3ff33c54d5a8663d42d769aa5d79ecd656fe8d09ccb23a7351095305524c27c5650ec7f96a312e5e522
-  languageName: node
-  linkType: hard
-
-"@smithy/chunked-blob-reader-native@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/chunked-blob-reader-native@npm:3.0.0"
-  dependencies:
-    "@smithy/util-base64": ^3.0.0
-    tslib: ^2.6.2
-  checksum: f97c0c0ce5e9bd2350883df3c232311aa82eb87eb387125f685900326f86fc3aca208e9004291f742f6978abf91a0c1112cc9a803cd0caf0dffbcfa9b6d0239e
-  languageName: node
-  linkType: hard
-
-"@smithy/chunked-blob-reader@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/chunked-blob-reader@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: 6f520884ade14f1073adb640db2f03eb22a9920f342f37958df3e98327890b741cd909b16cbbc6f70c6c8dd250d6b3a8d76841b685d4871b0403f309267def4f
-  languageName: node
-  linkType: hard
-
-"@smithy/config-resolver@npm:^3.0.2, @smithy/config-resolver@npm:^3.0.4, @smithy/config-resolver@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@smithy/config-resolver@npm:3.0.5"
-  dependencies:
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/types": ^3.3.0
-    "@smithy/util-config-provider": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 96895ae0622a229655fa08f009d29a20157043020125014e84cb5ca33a10171c9724c309491214c2422d9c4c6681e7f5ec5f7faa8f45e11250449cf07f3552ec
-  languageName: node
-  linkType: hard
-
-"@smithy/core@npm:^2.2.1, @smithy/core@npm:^2.2.4, @smithy/core@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "@smithy/core@npm:2.3.2"
-  dependencies:
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 4f8a886dc7433676a95bf1cae4c05c2027dd3baeb96d611d166a863e368756e2fbbcc58fcb56a318d69bbc5999a9b1467f7513674e4cca8bb0e7e2969f7babba
-  languageName: node
-  linkType: hard
-
-"@smithy/credential-provider-imds@npm:^3.1.1, @smithy/credential-provider-imds@npm:^3.1.3, @smithy/credential-provider-imds@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@smithy/credential-provider-imds@npm:3.2.0"
-  dependencies:
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    tslib: ^2.6.2
-  checksum: fc79919133008db91a83f2caf6eba11d704f34af5fa3dd1f7b8cc048214e805d9f20a3f302f5ed4862ee6b6c3bb28ff3a5d8c77d2f497d10f3be14915e59debe
-  languageName: node
-  linkType: hard
-
-"@smithy/eventstream-codec@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/eventstream-codec@npm:3.1.2"
-  dependencies:
-    "@aws-crypto/crc32": 5.2.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    tslib: ^2.6.2
-  checksum: b0c836acbf59b57a7e2ef948a54bd441d11b75d70f1c334723c27fce1ab0ff93ea9f936976b754272b5e90413b5a169c60b1df7ecfd7d061ebaae8d5cc067d94
-  languageName: node
-  linkType: hard
-
-"@smithy/eventstream-serde-browser@npm:^3.0.4":
-  version: 3.0.6
-  resolution: "@smithy/eventstream-serde-browser@npm:3.0.6"
-  dependencies:
-    "@smithy/eventstream-serde-universal": ^3.0.5
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 0d0f77fc7d277f1e8d29cfd7d745adac6ed627af8b8812dc5d821064f6d98a40e4e8c4ea0f1b67efe1070454fe19879b5edb8a892451a4b12cfa23d3bb9bcd50
-  languageName: node
-  linkType: hard
-
-"@smithy/eventstream-serde-config-resolver@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/eventstream-serde-config-resolver@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: c61780aa0ad8c479618d0b3fcb2b42f1f9a74dcf814dba08305107ed1f088f56aa1c346db9c72439ff18617f31b9c59c6895060e4c9765c81d759150a22674af
-  languageName: node
-  linkType: hard
-
-"@smithy/eventstream-serde-node@npm:^3.0.4":
-  version: 3.0.5
-  resolution: "@smithy/eventstream-serde-node@npm:3.0.5"
-  dependencies:
-    "@smithy/eventstream-serde-universal": ^3.0.5
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: ba0117495e2b9fc6b116620b1e15ade6c0aff72561d6db70c18ff4d6671a579fc6616f762918ba28b8146786aef1ba758969ac75dde80ee0099903408b2788ff
-  languageName: node
-  linkType: hard
-
-"@smithy/eventstream-serde-universal@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@smithy/eventstream-serde-universal@npm:3.0.5"
-  dependencies:
-    "@smithy/eventstream-codec": ^3.1.2
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 8394e27de4caf49076ec664f6e1c934ce4e9cb25ab4936f47fb1cb4da8ba5b027d46da363c77210c73845cd6841e3286115789d179bb2c45c567e3d4227dac73
-  languageName: node
-  linkType: hard
-
-"@smithy/fetch-http-handler@npm:^3.0.2, @smithy/fetch-http-handler@npm:^3.2.0, @smithy/fetch-http-handler@npm:^3.2.4":
-  version: 3.2.4
-  resolution: "@smithy/fetch-http-handler@npm:3.2.4"
-  dependencies:
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/querystring-builder": ^3.0.3
-    "@smithy/types": ^3.3.0
-    "@smithy/util-base64": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 73df885c637c14353f449678a4e109aeb19945c5370a615793ca2a54a29746a78e725e324b01cfd86fc71f4afd6386da2758fccc49d247a623ecbe70f607cb74
-  languageName: node
-  linkType: hard
-
-"@smithy/hash-blob-browser@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/hash-blob-browser@npm:3.1.2"
-  dependencies:
-    "@smithy/chunked-blob-reader": ^3.0.0
-    "@smithy/chunked-blob-reader-native": ^3.0.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 959ec975cd4b3d86e3d0288e24b460343795bc305ef38fc43f8485cd1440da4068d375c5d1dab73ae875f02e861f194512a7adf5afcd7395bbeb97897d8a809b
-  languageName: node
-  linkType: hard
-
-"@smithy/hash-node@npm:^3.0.1, @smithy/hash-node@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/hash-node@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    "@smithy/util-buffer-from": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 203a3581bec5373e63d42e03f62129022f03d17390e9358a4e25fc1d44c43962ea80ab5bcbb91605e3025e22136bed059665a3b16835f66316f43ed391df9548
-  languageName: node
-  linkType: hard
-
-"@smithy/hash-stream-node@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/hash-stream-node@npm:3.1.2"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: e5284ef06548e301aa50bd06fe06bf3e2ed11ecd57f73d2d85c98cf26119c2cc0084b5b8be49d4127cb798c6011651d5361958eb6546c19b45fd6c94ea11ef47
-  languageName: node
-  linkType: hard
-
-"@smithy/invalid-dependency@npm:^3.0.1, @smithy/invalid-dependency@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/invalid-dependency@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 459b4ae4e47595e8a675ff2e8bfea7f58a41f77138416ea310c89e29312e08963a701cdc354324da9dd578a7995158b4421695365070d74b0276ddff7f701bba
-  languageName: node
-  linkType: hard
-
-"@smithy/is-array-buffer@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@smithy/is-array-buffer@npm:2.2.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: cd12c2e27884fec89ca8966d33c9dc34d3234efe89b33a9b309c61ebcde463e6f15f6a02d31d4fddbfd6e5904743524ca5b95021b517b98fe10957c2da0cd5fc
-  languageName: node
-  linkType: hard
-
-"@smithy/is-array-buffer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/is-array-buffer@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: ce7440fcb1ce3c46722cff11c33e2f62a9df86d74fa2054a8e6b540302a91211cf6e4e3b1b7aac7030c6c8909158c1b6867c394201fa8afc6b631979956610e5
-  languageName: node
-  linkType: hard
-
-"@smithy/md5-js@npm:^3.0.1, @smithy/md5-js@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/md5-js@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 52ef56439be4187cc65391f4252173ffad0ce5a2ce5f636d78e9cdfb517844889340156ddbdbbe86f63e7f7e0fc924fe6905749a1c833910784015133a467406
-  languageName: node
-  linkType: hard
-
-"@smithy/middleware-content-length@npm:^3.0.1, @smithy/middleware-content-length@npm:^3.0.3, @smithy/middleware-content-length@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@smithy/middleware-content-length@npm:3.0.5"
-  dependencies:
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 21c667530f5e64db300827dfe8aa5b18396d151ac489a3e634f882179fae5c0f84940e1f831f0bf7b4b6b9623283f4a516da92d89c13ba395aede8788b523cd3
-  languageName: node
-  linkType: hard
-
-"@smithy/middleware-endpoint@npm:^3.0.2, @smithy/middleware-endpoint@npm:^3.0.4, @smithy/middleware-endpoint@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@smithy/middleware-endpoint@npm:3.1.0"
-  dependencies:
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
-    "@smithy/util-middleware": ^3.0.3
-    tslib: ^2.6.2
-  checksum: 3271b7c1ec5d01db63439757d198e921618a2f1d4827c64fc425163e7d1bc969049d8c8ce74f3a8c0b0dac5ea3466c154f38805c8d62fe19fb9bd6af72ca2d3c
-  languageName: node
-  linkType: hard
-
-"@smithy/middleware-retry@npm:^3.0.14, @smithy/middleware-retry@npm:^3.0.4, @smithy/middleware-retry@npm:^3.0.7":
-  version: 3.0.14
-  resolution: "@smithy/middleware-retry@npm:3.0.14"
-  dependencies:
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/service-error-classification": ^3.0.3
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    tslib: ^2.6.2
-    uuid: ^9.0.1
-  checksum: ff426baa613446787968c66ff04d4f513fbe3cbe3fd4832cc05843aa70cda136493248dea7940c03e562c0566e9bba7aa4d324d0eb87acfb1486b35562618479
-  languageName: node
-  linkType: hard
-
-"@smithy/middleware-serde@npm:^3.0.1, @smithy/middleware-serde@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/middleware-serde@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 6c633bb8957e078d480888bd33d5a8c269a483a1358c2b28c62daecfd442c711c509d9e69302e6b19fc298139ee67cdda63a604e7da0e4ef9005117d8e0897cc
-  languageName: node
-  linkType: hard
-
-"@smithy/middleware-stack@npm:^3.0.1, @smithy/middleware-stack@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/middleware-stack@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: f4a450e2ebca0a8a3b4e1bbfad7d7e9c45edccbe1c984a22f2228092a526120748365e8964b478357249675d8bbc28fdaa8a4a19643a3c1d86bd74e1499327c5
-  languageName: node
-  linkType: hard
-
-"@smithy/node-config-provider@npm:^3.1.1, @smithy/node-config-provider@npm:^3.1.3, @smithy/node-config-provider@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "@smithy/node-config-provider@npm:3.1.4"
-  dependencies:
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/shared-ini-file-loader": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 7ea4e7cea93ab154ab89a9d6b2453c8f96b96db18883070d287bc5fa9cfd10091bb00006a15bb7e6ed25810fd1a133d458e45310a8eaa1727a55d4ce2be3ba09
-  languageName: node
-  linkType: hard
-
-"@smithy/node-http-handler@npm:^3.0.1, @smithy/node-http-handler@npm:^3.1.1, @smithy/node-http-handler@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "@smithy/node-http-handler@npm:3.1.4"
-  dependencies:
-    "@smithy/abort-controller": ^3.1.1
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/querystring-builder": ^3.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 8f2f611bef99800b122b852103c3d1ff391b91077df191ca06676bd8c4e50d7e335bf2a311f90ff6a9fa0639a812216492e5e0ecee703e89eb05a4b253c8273c
-  languageName: node
-  linkType: hard
-
-"@smithy/property-provider@npm:^3.1.1, @smithy/property-provider@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "@smithy/property-provider@npm:3.1.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 37a3d92267a2a32c2cc17fd1f0ab2b336f75fb7807db88f6194efede9d6a66068658a7effb7773451404fca990924393dbbf3d57e2aca67ef2e489a85666e225
-  languageName: node
-  linkType: hard
-
-"@smithy/protocol-http@npm:^4.0.1, @smithy/protocol-http@npm:^4.0.3, @smithy/protocol-http@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@smithy/protocol-http@npm:4.1.0"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: fe4f97bc35075c6e6669c12ff90a4ab3dbe620b375298795d0c1104b30d04536cf002ea81f29983895c6042c7a30eecd1d2306d3ac90bf7910ec02929233f5ad
-  languageName: node
-  linkType: hard
-
-"@smithy/querystring-builder@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/querystring-builder@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    "@smithy/util-uri-escape": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 5c46c620d87f9b4e67b8eb543667b0160fb05bbec01d62d45adb94305369dca9e82daba47d81e840fdc399fa47f9b5930ce668d65fe83ee278a1b27d59d0b5d3
-  languageName: node
-  linkType: hard
-
-"@smithy/querystring-parser@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/querystring-parser@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 1de11cbc4325578b243a0e3e89b46371f4705d3df41ea51b37e8efa655d3b75253180b0fca9ceed8b3955a2d458689f551cd24fd904d0f65647c62c6b08795bf
-  languageName: node
-  linkType: hard
-
-"@smithy/service-error-classification@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/service-error-classification@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-  checksum: 5bef710f5698c929c97865cba41f36b0c59100b9a1c4478a2d47caeb5e3a1a18077b870b365efaa45c94666f2075bc8978f7a6e8b964afbba3a4e490eb6c13eb
-  languageName: node
-  linkType: hard
-
-"@smithy/shared-ini-file-loader@npm:^3.1.1, @smithy/shared-ini-file-loader@npm:^3.1.3, @smithy/shared-ini-file-loader@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "@smithy/shared-ini-file-loader@npm:3.1.4"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: c5321635f3be34e424009fc9045454a9ceec543ec20b3b9719bf3a48bbfc03b794f4545546e9c2dcb0a987de2ca5ff8999df9bf7c166c6fc7685c1fa1f068bc1
-  languageName: node
-  linkType: hard
-
-"@smithy/signature-v4@npm:^3.1.0, @smithy/signature-v4@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/signature-v4@npm:3.1.2"
-  dependencies:
-    "@smithy/is-array-buffer": ^3.0.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-uri-escape": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 5d10bfe89116a79ea13fe159b05d7fc10f7f67f11333cad6b96990b862cae9ed6c7c7a466d0bf296368610a43e34730feab0ec62f214019f18c61115d4dc8923
-  languageName: node
-  linkType: hard
-
-"@smithy/signature-v4@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@smithy/signature-v4@npm:4.1.0"
-  dependencies:
-    "@smithy/is-array-buffer": ^3.0.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-uri-escape": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 8c58bbc5b3f9eed092351f36dc0193ed2e43f916856dc95eadc65b42460a0c5f662016156034ef8a25419f95be8f6a15a7e85469358b77db236445919f66c77e
-  languageName: node
-  linkType: hard
-
-"@smithy/smithy-client@npm:^3.1.12, @smithy/smithy-client@npm:^3.1.2, @smithy/smithy-client@npm:^3.1.5":
-  version: 3.1.12
-  resolution: "@smithy/smithy-client@npm:3.1.12"
-  dependencies:
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
-    "@smithy/util-stream": ^3.1.3
-    tslib: ^2.6.2
-  checksum: 6f08dfb60a8d826d6853f290d8fee083610dbc8656ba71e7d28107acd861a8b52a819a20d29bea05b6fd7ef482b39dd5c53fb654015d242ed437d7a22d8c8619
-  languageName: node
-  linkType: hard
-
-"@smithy/types@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@smithy/types@npm:1.2.0"
-  dependencies:
-    tslib: ^2.5.0
-  checksum: 376a1402d356a8dddd804af66ff2d273e57e332a3e9537a98039b47572684aae044d5fcd879ac6eee5cc08640ea00fbef0725a6a16026db5fb8d189473d44fe6
-  languageName: node
-  linkType: hard
-
-"@smithy/types@npm:^3.1.0, @smithy/types@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "@smithy/types@npm:3.3.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: 29bb5f83c41e32f8d4094a2aba2d3dfbd763ab5943784a700f3fa22df0dcf0ccac1b1907f7a87fbb9f6f2269fcd4750524bcb48f892249e200ffe397c0981309
-  languageName: node
-  linkType: hard
-
-"@smithy/url-parser@npm:^3.0.1, @smithy/url-parser@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/url-parser@npm:3.0.3"
-  dependencies:
-    "@smithy/querystring-parser": ^3.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 86b4bc8e6c176b56076c30233ca4cfeb98d162fe27a348ddfda5f163ce7d173b8e684aa26202bbf4e0b5695b0ad43c0cb40170ca6793652d0ea6edb00443c036
-  languageName: node
-  linkType: hard
-
-"@smithy/util-base64@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-base64@npm:3.0.0"
-  dependencies:
-    "@smithy/util-buffer-from": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 413f26046a7e98b2661a078f218a8d040c820fc5a02f5e364aff58c3957e28fde1ac4048c2ebbad5d87b9da4b9aa98a8d4a7fb0d2ce97def33738bd7d8d79aa0
-  languageName: node
-  linkType: hard
-
-"@smithy/util-body-length-browser@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-body-length-browser@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: b01d8258b9a25b262734fc49cefefe48583ba193c3eefd49a6f7fd5922c3015d23dda88b52f3dd9a16827cad16b5b9425eef01e91bd0c71bb5abc469d2952c07
-  languageName: node
-  linkType: hard
-
-"@smithy/util-body-length-node@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-body-length-node@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: da1baf4790609d3dc28c88385c7274fdf9b91a641fe3c5af22b78e18156df17bd470181348f43b2c739680936b1dafb1526158dfd817c3d9ecb71e653b4cbe3f
-  languageName: node
-  linkType: hard
-
-"@smithy/util-buffer-from@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@smithy/util-buffer-from@npm:2.2.0"
-  dependencies:
-    "@smithy/is-array-buffer": ^2.2.0
-    tslib: ^2.6.2
-  checksum: 424c5b7368ae5880a8f2732e298d17879a19ca925f24ca45e1c6c005f717bb15b76eb28174d308d81631ad457ea0088aab0fd3255dd42f45a535c81944ad64d3
-  languageName: node
-  linkType: hard
-
-"@smithy/util-buffer-from@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-buffer-from@npm:3.0.0"
-  dependencies:
-    "@smithy/is-array-buffer": ^3.0.0
-    tslib: ^2.6.2
-  checksum: 1bfc4ab093fe98132bbc1ccd36a0b9ad75a31ed26bac4b7e9350205513a2481eb190ae44679ab4fecc5e10d367b5e6592bbfbf792671579d17d17bd7f7f233f5
-  languageName: node
-  linkType: hard
-
-"@smithy/util-config-provider@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-config-provider@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: fc0f5f57d30261cf3a6693d8e338b9d269332c478ee18d905309a769844188190caf0564855d7e84f6c61e56aa556195dda89f65e8c30791951cf4999e4a70e7
-  languageName: node
-  linkType: hard
-
-"@smithy/util-defaults-mode-browser@npm:^3.0.14, @smithy/util-defaults-mode-browser@npm:^3.0.4, @smithy/util-defaults-mode-browser@npm:^3.0.7":
-  version: 3.0.14
-  resolution: "@smithy/util-defaults-mode-browser@npm:3.0.14"
-  dependencies:
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    bowser: ^2.11.0
-    tslib: ^2.6.2
-  checksum: e297d7b2602cac71eb1d752d5ee8f9ce1e7fe8314479e0c7c08e1a73c84a7fa4fb70e8faa6680f5d37f9ae15d8a9f244ef0bbceed92bc6e52e33a5d80d2fdd28
-  languageName: node
-  linkType: hard
-
-"@smithy/util-defaults-mode-node@npm:^3.0.14, @smithy/util-defaults-mode-node@npm:^3.0.4, @smithy/util-defaults-mode-node@npm:^3.0.7":
-  version: 3.0.14
-  resolution: "@smithy/util-defaults-mode-node@npm:3.0.14"
-  dependencies:
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/credential-provider-imds": ^3.2.0
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/property-provider": ^3.1.3
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 009ececcc6fc9ea4dce7cb1090ca4e421e44b2a5b6f22975cf88106665e05524895cd662bf5d9880ed69143edf95e3bf683738846fe20a44a6f22e5f126ad9c1
-  languageName: node
-  linkType: hard
-
-"@smithy/util-endpoints@npm:^2.0.2, @smithy/util-endpoints@npm:^2.0.4, @smithy/util-endpoints@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "@smithy/util-endpoints@npm:2.0.5"
-  dependencies:
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: bb2a96323f52beaf2820f4e5764c865cff3ac5bca0c0df6923bb4582b0f87faf1606110cd4e36005ac43f41e9673ebdca4bbb8b913880fc2a4e0ff3301250da8
-  languageName: node
-  linkType: hard
-
-"@smithy/util-hex-encoding@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-hex-encoding@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: dd32fd71e915825987a18bf7c0f8f0c4956d0b17a0ee71592b5563bb20e04f24dbf81d36161aac07caab3bb5e535cc609fce20aa4a38f66b457c4c6f5c7748d9
-  languageName: node
-  linkType: hard
-
-"@smithy/util-middleware@npm:^3.0.1, @smithy/util-middleware@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/util-middleware@npm:3.0.3"
-  dependencies:
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: f37f25d65595af5ff4c3f69fa7e66545ac1651f77979e15ffbc9047e18fc668dae90458ee76add85a49ea3729c49d317e40542d5430e81e2eafe8dcae2ddb3bc
-  languageName: node
-  linkType: hard
-
-"@smithy/util-retry@npm:^3.0.1, @smithy/util-retry@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/util-retry@npm:3.0.3"
-  dependencies:
-    "@smithy/service-error-classification": ^3.0.3
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: c760595376154be67414083aa6f76094022df72987521469b124ef3ef5848c0536757dcd2006520580380db6a4d7b597a05569470c3151f71d5e678df63f4c13
-  languageName: node
-  linkType: hard
-
-"@smithy/util-stream@npm:^3.0.2, @smithy/util-stream@npm:^3.0.5, @smithy/util-stream@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "@smithy/util-stream@npm:3.1.3"
-  dependencies:
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/types": ^3.3.0
-    "@smithy/util-base64": ^3.0.0
-    "@smithy/util-buffer-from": ^3.0.0
-    "@smithy/util-hex-encoding": ^3.0.0
-    "@smithy/util-utf8": ^3.0.0
-    tslib: ^2.6.2
-  checksum: b663124c3b857b7744a0f2db47d091c570ff4fe4e8a8d254a7e1b8fed1d57fa4dc8fb12e496f7f607666ac5bc36d6f44a57ef3132bc882ff1d869b9bfdb5fc6e
-  languageName: node
-  linkType: hard
-
-"@smithy/util-uri-escape@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-uri-escape@npm:3.0.0"
-  dependencies:
-    tslib: ^2.6.2
-  checksum: d7ee01c978e2b08d0a89a3b678f5d5e5d5bb4ab4ab85567a238b1a6195dff1bdaf9ae62497e7f32ff5121b3dc007c370bcb6e8ef79b01fe5acdec5bbce8c7ce4
-  languageName: node
-  linkType: hard
-
-"@smithy/util-utf8@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "@smithy/util-utf8@npm:2.3.0"
-  dependencies:
-    "@smithy/util-buffer-from": ^2.2.0
-    tslib: ^2.6.2
-  checksum: 00e55d4b4e37d48be0eef3599082402b933c52a1407fed7e8e8ad76d94d81a0b30b8bfaf2047c59d9c3af31e5f20e7a8c959cb7ae270f894255e05a2229964f0
-  languageName: node
-  linkType: hard
-
-"@smithy/util-utf8@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@smithy/util-utf8@npm:3.0.0"
-  dependencies:
-    "@smithy/util-buffer-from": ^3.0.0
-    tslib: ^2.6.2
-  checksum: d97be1748963263a1161ba80417d82318b977b38542f3fdf0379b0162461188be680e5bfb66a89d65652f0fad6ecf2ab23a43205979216e50602488f73434da3
-  languageName: node
-  linkType: hard
-
-"@smithy/util-waiter@npm:^3.0.1, @smithy/util-waiter@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/util-waiter@npm:3.1.2"
-  dependencies:
-    "@smithy/abort-controller": ^3.1.1
-    "@smithy/types": ^3.3.0
-    tslib: ^2.6.2
-  checksum: 35773b1bbbb215102555a55ce4de57cbd3e38f37546ca3e6748ce3856119019a613946b399c6d97981a0bad447ce9c41f87c276325ff4c0e5a2276ee4e9e384e
-  languageName: node
-  linkType: hard
-
 "@sqltools/formatter@npm:1.2.2":
   version: 1.2.2
   resolution: "@sqltools/formatter@npm:1.2.2"
@@ -20938,6 +19506,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/aws-sdk@npm:2.7.0":
+  version: 2.7.0
+  resolution: "@types/aws-sdk@npm:2.7.0"
+  dependencies:
+    aws-sdk: "*"
+  checksum: 0ede5d854ebed5caddc33a1b7a856f31aa022f8887635851fd13a7dc69046774bbfb864891a0106d4be84fc7c3ab8c2a96bd5c10e99ccc3661fb12019ce47f7c
+  languageName: node
+  linkType: hard
+
 "@types/aws4@npm:1.5.1":
   version: 1.5.1
   resolution: "@types/aws4@npm:1.5.1"
@@ -21085,6 +19662,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/cli-progress@npm:^3.11.5":
+  version: 3.11.6
+  resolution: "@types/cli-progress@npm:3.11.6"
+  dependencies:
+    "@types/node": "*"
+  checksum: 2df9d4788089564c8eb01e6d05b084bd030b7ce3f1a3698c57a998f2b329c5c7a3ea2d20e3756579a385945c70875df3c798b7740f6bf679eb1b1937e91f5eca
+  languageName: node
+  linkType: hard
+
 "@types/codemirror@npm:*":
   version: 5.60.7
   resolution: "@types/codemirror@npm:5.60.7"
@@ -22024,12 +20610,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/nodemailer@npm:6.4.15":
-  version: 6.4.15
-  resolution: "@types/nodemailer@npm:6.4.15"
+"@types/nodemailer@npm:6.4.1":
+  version: 6.4.1
+  resolution: "@types/nodemailer@npm:6.4.1"
   dependencies:
     "@types/node": "*"
-  checksum: f6f9a2f8a669703ecc3ca6359c12345b16f6b2e5691b93c406b9af7de639c02092ec00133526e6fecd8c60d884890a7cd0f967d8e64bedab46d5c3d8be0882d7
+  checksum: 58239d1996c0f7f5f7a9373e575e1889c7757af30064803efc2032f87d4be7a62cb87df401b8ed060f919af9606bbb7470450a44b46a53ff12041e7fac8acb8a
   languageName: node
   linkType: hard
 
@@ -22545,6 +21131,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/triple-beam@npm:^1.3.2":
+  version: 1.3.5
+  resolution: "@types/triple-beam@npm:1.3.5"
+  checksum: 519b6a1b30d4571965c9706ad5400a200b94e4050feca3e7856e3ea7ac00ec9903e32e9a10e2762d0f7e472d5d03e5f4b29c16c0bd8c1f77c8876c683b2231f1
+  languageName: node
+  linkType: hard
+
 "@types/trusted-types@npm:^2.0.2":
   version: 2.0.2
   resolution: "@types/trusted-types@npm:2.0.2"
@@ -24058,7 +22651,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@xmldom/xmldom@npm:^0.8.8":
+"@xmldom/xmldom@npm:^0.8.6, @xmldom/xmldom@npm:^0.8.8":
   version: 0.8.10
   resolution: "@xmldom/xmldom@npm:0.8.10"
   checksum: 4c136aec31fb3b49aaa53b6fcbfe524d02a1dc0d8e17ee35bd3bf35e9ce1344560481cd1efd086ad1a4821541482528672306d5e37cdbd187f33d7fadd3e2cf0
@@ -24407,6 +23000,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ajv-draft-04@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "ajv-draft-04@npm:1.0.0"
+  peerDependencies:
+    ajv: ^8.5.0
+  peerDependenciesMeta:
+    ajv:
+      optional: true
+  checksum: 3f11fa0e7f7359bef6608657f02ab78e9cc62b1fb7bdd860db0d00351b3863a1189c1a23b72466d2d82726cab4eb20725c76f5e7c134a89865e2bfd0e6828137
+  languageName: node
+  linkType: hard
+
 "ajv-formats@npm:2.1.1, ajv-formats@npm:^2.1.1":
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
@@ -24533,7 +23138,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.1":
+"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.1, ansi-escapes@npm:^4.3.2":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
@@ -24622,7 +23227,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
+"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0, ansi-styles@npm:^4.3.0":
   version: 4.3.0
   resolution: "ansi-styles@npm:4.3.0"
   dependencies:
@@ -24652,6 +23257,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansis@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "ansis@npm:3.3.2"
+  checksum: 6d3e8a68a93b03a1e7166cbe63cb6831780a7a9b0bc6c3bf0a33c7237d528d00558af84a54827322a85667d4b52d21f796b884f6120ec203b5ed3f9404ec0d05
+  languageName: node
+  linkType: hard
+
 "any-observable@npm:^0.3.0":
   version: 0.3.0
   resolution: "any-observable@npm:0.3.0"
@@ -24941,7 +23553,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"append-field@npm:^1.0.0":
+"append-field@npm:1.0.0, append-field@npm:^1.0.0":
   version: 1.0.0
   resolution: "append-field@npm:1.0.0"
   checksum: 482ba08acc0ecef00fe7da6bf2f8e48359a9905ee1af525f3120c9260c02e91eedf0579b59d898e8d8455b6c199e340bc0a2fd4b9e02adaa29a8a86c722b37f9
@@ -25072,7 +23684,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"argparse@npm:^1.0.7":
+"argparse@npm:^1.0.7, argparse@npm:~1.0.3":
   version: 1.0.10
   resolution: "argparse@npm:1.0.10"
   dependencies:
@@ -25640,33 +24252,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws-elasticsearch-connector@npm:9.2.0":
-  version: 9.2.0
-  resolution: "aws-elasticsearch-connector@npm:9.2.0"
+"aws-elasticsearch-connector@npm:9.0.0":
+  version: 9.0.0
+  resolution: "aws-elasticsearch-connector@npm:9.0.0"
   dependencies:
-    aws4: ^1.11.0
+    aws4: ^1.10.0
   peerDependencies:
-    "@elastic/elasticsearch": ">=6"
-    aws-sdk: ^2.831.0
-  checksum: 8f594b5461c2f748de4b1eee50ecd3ef3625500641057019b7e0db3115e2419713de74de69c1205a908554ea4dd7aa8a97f2ae8d88d2ab73c5c904cbe71623dc
+    "@elastic/elasticsearch": ">=7.8.0"
+    aws-sdk: ^2.709.0
+  checksum: a5eb6cb84c6a3ca5933842b242e22c0fcdb9e68b5db2d3a052f5ccabc2955979da00670c1fe92b16992efdbb6b29e9a8e4d676b8f955819af7be27cf8271aeec
   languageName: node
   linkType: hard
 
-"aws-sdk@npm:2.1651.0":
-  version: 2.1651.0
-  resolution: "aws-sdk@npm:2.1651.0"
+"aws-sdk@npm:*, aws-sdk@npm:^2.443.0":
+  version: 2.865.0
+  resolution: "aws-sdk@npm:2.865.0"
   dependencies:
     buffer: 4.9.2
     events: 1.1.1
     ieee754: 1.1.13
-    jmespath: 0.16.0
+    jmespath: 0.15.0
     querystring: 0.2.0
     sax: 1.2.1
     url: 0.10.3
-    util: ^0.12.4
-    uuid: 8.0.0
-    xml2js: 0.6.2
-  checksum: 322b5b1b27e12ca68680557fe4ebf21baeb307b13e6759929531e3b5e444700ed45406755ed7b1dcbe011cc9953e4f02f77d350f10c19ab8fe87958923136a69
+    uuid: 3.3.2
+    xml2js: 0.4.19
+  checksum: 9a353c1de282c5b067352e54b6acb7ea0791bfc66619e22b5af10cf824a1a4f5ab6efbf91cc2a424c110b2cc1b1bb035b4971f8721e2fc9e4186e1fda1249909
+  languageName: node
+  linkType: hard
+
+"aws-sdk@npm:2.814.0":
+  version: 2.814.0
+  resolution: "aws-sdk@npm:2.814.0"
+  dependencies:
+    buffer: 4.9.2
+    events: 1.1.1
+    ieee754: 1.1.13
+    jmespath: 0.15.0
+    querystring: 0.2.0
+    sax: 1.2.1
+    url: 0.10.3
+    uuid: 3.3.2
+    xml2js: 0.4.19
+  checksum: 6064f681fba7a102774f9648c5e349d0454521d120a61c738feebfd5bb44682e3ce126121dd8b479949255898f6dca7ca0b98ff4e99338b2c7e12ea160e48eec
   languageName: node
   linkType: hard
 
@@ -25677,21 +24305,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws4@npm:1.13.0":
-  version: 1.13.0
-  resolution: "aws4@npm:1.13.0"
-  checksum: 71594a17a5f7b1a9151ef515500c18f1029caa51e2cb65c1b5b324d9bd8dac89896a9e296825d4e6befdcd612d7fc3b0d8042c667555a56df3ee1ab15d4d9b35
-  languageName: node
-  linkType: hard
-
-"aws4@npm:^1.11.0":
-  version: 1.13.1
-  resolution: "aws4@npm:1.13.1"
-  checksum: 78fc37f00f965848870099474e2827f65aacaec3941674942ee999a4e66a28a84165dceac4f21476594240db895af5fda478ddd6dbc8d9dcbb7a9e07b94befcb
-  languageName: node
-  linkType: hard
-
-"aws4@npm:^1.8.0":
+"aws4@npm:1.11.0, aws4@npm:^1.10.0, aws4@npm:^1.8.0":
   version: 1.11.0
   resolution: "aws4@npm:1.11.0"
   checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f
@@ -26664,6 +25278,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bluebird@npm:~3.4.0":
+  version: 3.4.7
+  resolution: "bluebird@npm:3.4.7"
+  checksum: bffa9dee7d3a41ab15c4f3f24687b49959b4e64e55c058a062176feb8ccefc2163414fb4e1a0f3053bf187600936509660c3ebd168fd9f0e48c7eba23b019466
+  languageName: node
+  linkType: hard
+
 "bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
   version: 4.12.0
   resolution: "bn.js@npm:4.12.0"
@@ -27082,16 +25703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:5.6.0":
-  version: 5.6.0
-  resolution: "buffer@npm:5.6.0"
-  dependencies:
-    base64-js: ^1.0.2
-    ieee754: ^1.1.4
-  checksum: d659494c5032dd39d03d2912e64179cc44c6340e7e9d1f68d3840e7ab4559989fbce92b4950174593c38d05268224235ba404f0878775cab2a616b6dcad9c23e
-  languageName: node
-  linkType: hard
-
 "buffer@npm:^5.4.3, buffer@npm:^5.5.0, buffer@npm:^5.7.1":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
@@ -27967,6 +26578,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"clean-stack@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "clean-stack@npm:3.0.1"
+  dependencies:
+    escape-string-regexp: 4.0.0
+  checksum: dc18c842d7792dd72d463936b1b0a5b2621f0fc11588ee48b602e1a29b6c010c606d89f3de1f95d15d72de74aea93c0fbac8246593a31d95f8462cac36148e05
+  languageName: node
+  linkType: hard
+
 "cleanup-prettier@npm:prettier@2.2.0":
   version: 2.2.0
   resolution: "prettier@npm:2.2.0"
@@ -28048,6 +26668,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-progress@npm:^3.12.0":
+  version: 3.12.0
+  resolution: "cli-progress@npm:3.12.0"
+  dependencies:
+    string-width: ^4.2.3
+  checksum: e8390dc3cdf3c72ecfda0a1e8997bfed63a0d837f97366bbce0ca2ff1b452da386caed007b389f0fe972625037b6c8e7ab087c69d6184cc4dfc8595c4c1d3e6e
+  languageName: node
+  linkType: hard
+
 "cli-spinners@npm:2.6.1, cli-spinners@npm:^2.5.0":
   version: 2.6.1
   resolution: "cli-spinners@npm:2.6.1"
@@ -28062,6 +26691,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-spinners@npm:^2.9.2":
+  version: 2.9.2
+  resolution: "cli-spinners@npm:2.9.2"
+  checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c
+  languageName: node
+  linkType: hard
+
 "cli-table3@npm:^0.6.0, cli-table3@npm:^0.6.1, cli-table3@npm:~0.6.1":
   version: 0.6.2
   resolution: "cli-table3@npm:0.6.2"
@@ -28342,7 +26978,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-string@npm:^1.5.3, color-string@npm:^1.6.0":
+"color-string@npm:^1.5.3, color-string@npm:^1.6.0, color-string@npm:^1.9.0":
   version: 1.9.1
   resolution: "color-string@npm:1.9.1"
   dependencies:
@@ -28371,6 +27007,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"color@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "color@npm:4.2.3"
+  dependencies:
+    color-convert: ^2.0.1
+    color-string: ^1.9.0
+  checksum: 0579629c02c631b426780038da929cca8e8d80a40158b09811a0112a107c62e10e4aad719843b791b1e658ab4e800558f2e87ca4522c8b32349d497ecb6adeb4
+  languageName: node
+  linkType: hard
+
 "colord@npm:^2.9.1":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
@@ -29081,6 +27727,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie-parser@npm:1.4.6":
+  version: 1.4.6
+  resolution: "cookie-parser@npm:1.4.6"
+  dependencies:
+    cookie: 0.4.1
+    cookie-signature: 1.0.6
+  checksum: 1e5a63aa82e8eb4e02d2977c6902983dee87b02e87ec5ec43ac3cb1e72da354003716570cd5190c0ad9e8a454c9d3237f4ad6e2f16d0902205a96a1c72b77ba5
+  languageName: node
+  linkType: hard
+
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
@@ -29095,6 +27751,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:0.4.1":
+  version: 0.4.1
+  resolution: "cookie@npm:0.4.1"
+  checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8
+  languageName: node
+  linkType: hard
+
 "cookie@npm:0.5.0":
   version: 0.5.0
   resolution: "cookie@npm:0.5.0"
@@ -29102,6 +27765,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410
+  languageName: node
+  linkType: hard
+
 "cookie@npm:^0.4.0, cookie@npm:^0.4.1":
   version: 0.4.2
   resolution: "cookie@npm:0.4.2"
@@ -30255,6 +28925,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"date-fns@npm:3.6.0":
+  version: 3.6.0
+  resolution: "date-fns@npm:3.6.0"
+  checksum: 0daa1e9a436cf99f9f2ae9232b55e11f3dd46132bee10987164f3eebd29f245b2e066d7d7db40782627411ecf18551d8f4c9fcdf2226e48bb66545407d448ab7
+  languageName: node
+  linkType: hard
+
 "date-fns@npm:^1.27.2":
   version: 1.30.1
   resolution: "date-fns@npm:1.30.1"
@@ -30437,6 +29114,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:^4.3.5":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
+  dependencies:
+    ms: 2.1.2
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 1630b748dea3c581295e02137a9f5cbe2c1d85fea35c1e6597a65ca2b16a6fce68cec61b299d480787ef310ba927dc8c92d3061faba0ad06c6a724672f66be7f
+  languageName: node
+  linkType: hard
+
 "debuglog@npm:^1.0.0, debuglog@npm:^1.0.1":
   version: 1.0.1
   resolution: "debuglog@npm:1.0.1"
@@ -31076,6 +29765,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dingbat-to-unicode@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "dingbat-to-unicode@npm:1.0.1"
+  checksum: 2da25efca12450d3c48704a6f7da0f181564866bcddcf8e4623154621cac1f892d80f1e1421fb3b681066566eebe319ace707917c169cf3cdfd609f8d98f6a87
+  languageName: node
+  linkType: hard
+
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -31472,6 +30168,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"duck@npm:^0.1.12":
+  version: 0.1.12
+  resolution: "duck@npm:0.1.12"
+  dependencies:
+    underscore: ^1.13.1
+  checksum: 68db472e55cb20926046d6b07dbea978662ddf8a74287aa367a87b49b9677ab1d846348a2a3f9e10d06c44297ab3bcefdb67ebc4f1c27d00c6faf73c97da75dd
+  languageName: node
+  linkType: hard
+
 "duplexer2@npm:~0.1.4":
   version: 0.1.4
   resolution: "duplexer2@npm:0.1.4"
@@ -31584,6 +30289,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ejs@npm:^3.1.10":
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
+  dependencies:
+    jake: ^10.8.5
+  bin:
+    ejs: bin/cli.js
+  checksum: ce90637e9c7538663ae023b8a7a380b2ef7cc4096de70be85abf5a3b9641912dde65353211d05e24d56b1f242d71185c6d00e02cb8860701d571786d92c71f05
+  languageName: node
+  linkType: hard
+
 "ejs@npm:^3.1.5":
   version: 3.1.6
   resolution: "ejs@npm:3.1.6"
@@ -31799,6 +30515,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:2.2.0, entities@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "entities@npm:2.2.0"
+  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
+  languageName: node
+  linkType: hard
+
 "entities@npm:^1.1.1":
   version: 1.1.2
   resolution: "entities@npm:1.1.2"
@@ -31806,13 +30529,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "entities@npm:2.2.0"
-  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
-  languageName: node
-  linkType: hard
-
 "entities@npm:^4.2.0, entities@npm:^4.4.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
@@ -33334,7 +32050,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"events@npm:3.3.0, events@npm:^3.2.0, events@npm:^3.3.0":
+"events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
   checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
@@ -33704,6 +32420,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"express@npm:4.19.2":
+  version: 4.19.2
+  resolution: "express@npm:4.19.2"
+  dependencies:
+    accepts: ~1.3.8
+    array-flatten: 1.1.1
+    body-parser: 1.20.2
+    content-disposition: 0.5.4
+    content-type: ~1.0.4
+    cookie: 0.6.0
+    cookie-signature: 1.0.6
+    debug: 2.6.9
+    depd: 2.0.0
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    etag: ~1.8.1
+    finalhandler: 1.2.0
+    fresh: 0.5.2
+    http-errors: 2.0.0
+    merge-descriptors: 1.0.1
+    methods: ~1.1.2
+    on-finished: 2.4.1
+    parseurl: ~1.3.3
+    path-to-regexp: 0.1.7
+    proxy-addr: ~2.0.7
+    qs: 6.11.0
+    range-parser: ~1.2.1
+    safe-buffer: 5.2.1
+    send: 0.18.0
+    serve-static: 1.15.0
+    setprototypeof: 1.2.0
+    statuses: 2.0.1
+    type-is: ~1.6.18
+    utils-merge: 1.0.1
+    vary: ~1.1.2
+  checksum: 212dbd6c2c222a96a61bc927639c95970a53b06257080bb9e2838adb3bffdb966856551fdad1ab5dd654a217c35db94f987d0aa88d48fb04d306340f5f34dca5
+  languageName: node
+  linkType: hard
+
 "ext@npm:^1.1.2":
   version: 1.4.0
   resolution: "ext@npm:1.4.0"
@@ -33972,25 +32727,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-xml-parser@npm:4.2.5":
-  version: 4.2.5
-  resolution: "fast-xml-parser@npm:4.2.5"
-  dependencies:
-    strnum: ^1.0.5
-  bin:
-    fxparser: src/cli/cli.js
-  checksum: d32b22005504eeb207249bf40dc82d0994b5bb9ca9dcc731d335a1f425e47fe085b3cace3cf9d32172dd1a5544193c49e8615ca95b4bf95a4a4920a226b06d80
-  languageName: node
-  linkType: hard
-
-"fast-xml-parser@npm:4.4.1":
-  version: 4.4.1
-  resolution: "fast-xml-parser@npm:4.4.1"
-  dependencies:
-    strnum: ^1.0.5
+"fast-xml-parser@npm:3.19.0":
+  version: 3.19.0
+  resolution: "fast-xml-parser@npm:3.19.0"
   bin:
-    fxparser: src/cli/cli.js
-  checksum: f440c01cd141b98789ae777503bcb6727393296094cc82924ae9f88a5b971baa4eec7e65306c7e07746534caa661fc83694ff437d9012dc84dee39dfbfaab947
+    xml2js: cli.js
+  checksum: d9da9145f73d90c05ee2746d80c78eca4da0249dea8c81ea8f1a6e1245e62988ed4a040dbd1c7229b1e0bdcbf69d33c882e0ac337d10c7eedb159a4dc9779327
   languageName: node
   linkType: hard
 
@@ -35956,6 +34698,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"handlebars@npm:4.7.8":
+  version: 4.7.8
+  resolution: "handlebars@npm:4.7.8"
+  dependencies:
+    minimist: ^1.2.5
+    neo-async: ^2.6.2
+    source-map: ^0.6.1
+    uglify-js: ^3.1.4
+    wordwrap: ^1.0.0
+  dependenciesMeta:
+    uglify-js:
+      optional: true
+  bin:
+    handlebars: bin/handlebars
+  checksum: 00e68bb5c183fd7b8b63322e6234b5ac8fbb960d712cb3f25587d559c2951d9642df83c04a1172c918c41bcfc81bfbd7a7718bbce93b893e0135fc99edea93ff
+  languageName: node
+  linkType: hard
+
 "har-schema@npm:^2.0.0":
   version: 2.0.0
   resolution: "har-schema@npm:2.0.0"
@@ -36865,6 +35625,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hyperlinker@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "hyperlinker@npm:1.0.0"
+  checksum: f6d020ac552e9d048668206c805a737262b4c395546c773cceea3bc45252c46b4fa6eeb67c5896499dad00d21cb2f20f89fdd480a4529cfa3d012da2957162f9
+  languageName: node
+  linkType: hard
+
 "hyphen@npm:^1.6.4":
   version: 1.6.5
   resolution: "hyphen@npm:1.6.5"
@@ -37015,6 +35782,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"immediate@npm:~3.0.5":
+  version: 3.0.6
+  resolution: "immediate@npm:3.0.6"
+  checksum: f9b3486477555997657f70318cc8d3416159f208bec4cca3ff3442fd266bc23f50f0c9bd8547e1371a6b5e82b821ec9a7044a4f7b944798b25aa3cc6d5e63e62
+  languageName: node
+  linkType: hard
+
 "immer@npm:^10.0.3":
   version: 10.0.4
   resolution: "immer@npm:10.0.4"
@@ -38414,7 +37188,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "island.is@workspace:."
   dependencies:
-    "@acuris/aws-es-connection": 2.3.0
     "@anatine/esbuild-decorators": 0.2.4
     "@anatine/esbuildnx": 0.2.0
     "@anev/ts-mountebank": ^1.6.0
@@ -38422,19 +37195,10 @@ __metadata:
     "@apollo/gateway": 2.1.1
     "@apollo/subgraph": 2.1.1
     "@apollo/utils.keyvadapter": 3.0.0
-    "@aws-sdk/abort-controller": 3.374.0
-    "@aws-sdk/client-elasticsearch-service": 3.609.0
-    "@aws-sdk/client-s3": 3.609.0
-    "@aws-sdk/client-ses": 3.609.0
-    "@aws-sdk/client-sns": 3.609.0
-    "@aws-sdk/client-sqs": 3.598.0
-    "@aws-sdk/client-ssm": 3.598.0
-    "@aws-sdk/cloudfront-signer": 3.609.0
-    "@aws-sdk/credential-provider-node": 3.598.0
-    "@aws-sdk/lib-storage": 3.609.0
-    "@aws-sdk/s3-presigned-post": 3.609.0
-    "@aws-sdk/s3-request-presigner": 3.609.0
-    "@aws-sdk/types": 3.598.0
+    "@aws-sdk/client-ses": 3.145.0
+    "@aws-sdk/client-sqs": 3.145.0
+    "@aws-sdk/client-ssm": 3.145.0
+    "@aws-sdk/credential-provider-node": 3.145.0
     "@azure/msal-node": 1.14.4
     "@babel/core": 7.22.5
     "@babel/plugin-proposal-decorators": 7.22.5
@@ -38478,9 +37242,10 @@ __metadata:
     "@graphql-codegen/typescript-react-apollo": 3.3.3
     "@graphql-codegen/typescript-resolvers": 2.7.3
     "@hookform/error-message": 2.0.1
-    "@island.is/regulations-tools": 0.9.1
+    "@island.is/regulations-tools": 0.9.2
     "@keyv/redis": 2.6.1
     "@livechat/widget-core": 1.3.2
+    "@mockoon/cli": 8.4.0
     "@nestjs/apollo": 10.1.0
     "@nestjs/axios": 2.0.0
     "@nestjs/bull": 0.6.3
@@ -38517,7 +37282,6 @@ __metadata:
     "@rehooks/component-size": 1.0.3
     "@simplewebauthn/server": 10.0.0
     "@sindresorhus/slugify": 1.0.0
-    "@smithy/abort-controller": 3.1.1
     "@statoscope/webpack-plugin": 5.20.1
     "@storybook/addon-a11y": 7.6.9
     "@storybook/addon-essentials": 7.6.9
@@ -38536,6 +37300,7 @@ __metadata:
     "@testing-library/react": 15.0.6
     "@testing-library/user-event": 14.4.3
     "@types/archiver": 6.0.2
+    "@types/aws-sdk": 2.7.0
     "@types/aws4": 1.5.1
     "@types/classnames": 2.2.10
     "@types/cookie-parser": 1.4.2
@@ -38559,7 +37324,7 @@ __metadata:
     "@types/mailparser": 3.4.0
     "@types/memoizee": 0.4.5
     "@types/node": 18.16.9
-    "@types/nodemailer": 6.4.15
+    "@types/nodemailer": 6.4.1
     "@types/opossum": 4.1.1
     "@types/passport-jwt": 3.0.8
     "@types/pdfkit": 0.11.2
@@ -38601,9 +37366,9 @@ __metadata:
     apollo-server-express: 3.10.2
     apollo-server-plugin-response-cache: 3.8.2
     archiver: 6.0.1
-    aws-elasticsearch-connector: 9.2.0
-    aws-sdk: 2.1651.0
-    aws4: 1.13.0
+    aws-elasticsearch-connector: 9.0.0
+    aws-sdk: 2.814.0
+    aws4: 1.11.0
     axios: 1.7.2
     babel-jest: 29.4.3
     babel-loader: 8.2.5
@@ -38724,7 +37489,7 @@ __metadata:
     node-fetch: 2.6.7
     node-gyp: 9.1.0
     node-html-markdown: 1.3.0
-    nodemailer: 6.9.14
+    nodemailer: 6.7.2
     nx: 19.4.0
     oidc-client-ts: 2.4.0
     openapi3-ts: 2.0.0
@@ -38789,7 +37554,7 @@ __metadata:
     soap: 1.0.0
     sort-paths: 1.1.1
     sqlite3: 5.1.6
-    sqs-consumer: 10.3.0
+    sqs-consumer: 5.4.0
     storybook: 7.2.1
     storybook-addon-apollo-client: ^5.0.0
     storybook-addon-designs: 6.3.1
@@ -39912,10 +38677,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jmespath@npm:0.16.0":
-  version: 0.16.0
-  resolution: "jmespath@npm:0.16.0"
-  checksum: 2d602493a1e4addfd1350ac8c9d54b1b03ed09e305fd863bab84a4ee1f52868cf939dd1a08c5cdea29ce9ba8f86875ebb458b6ed45dab3e1c3f2694503fb2fd9
+"jmespath@npm:0.15.0":
+  version: 0.15.0
+  resolution: "jmespath@npm:0.15.0"
+  checksum: 353bb9e69cc4c1560be0a4df43cb4020abc246e1c60cb5b55dcc76d8c858383f1633faf22ccaf6a5e09568a2077d0f4f1e989e6fcfd496b5cef87964cc8cb9e7
+  languageName: node
+  linkType: hard
+
+"joi@npm:17.13.3":
+  version: 17.13.3
+  resolution: "joi@npm:17.13.3"
+  dependencies:
+    "@hapi/hoek": ^9.3.0
+    "@hapi/topo": ^5.1.0
+    "@sideway/address": ^4.1.5
+    "@sideway/formula": ^3.0.1
+    "@sideway/pinpoint": ^2.0.0
+  checksum: 66ed454fee3d8e8da1ce21657fd2c7d565d98f3e539d2c5c028767e5f38cbd6297ce54df8312d1d094e62eb38f9452ebb43da4ce87321df66cf5e3f128cbc400
   languageName: node
   linkType: hard
 
@@ -40108,7 +38886,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.9.0":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.14.1, js-yaml@npm:^3.9.0":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -40485,28 +39263,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "jsonfile@npm:4.0.0"
+"jsonfile@npm:6.1.0, jsonfile@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "jsonfile@npm:6.1.0"
   dependencies:
     graceful-fs: ^4.1.6
+    universalify: ^2.0.0
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
+  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "jsonfile@npm:6.1.0"
+"jsonfile@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "jsonfile@npm:4.0.0"
   dependencies:
     graceful-fs: ^4.1.6
-    universalify: ^2.0.0
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
+  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
   languageName: node
   linkType: hard
 
@@ -40526,6 +39304,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonpath-plus@npm:8.1.0":
+  version: 8.1.0
+  resolution: "jsonpath-plus@npm:8.1.0"
+  bin:
+    jsonpath: bin/jsonpath-cli.js
+    jsonpath-plus: bin/jsonpath-cli.js
+  checksum: 03363938d9b6ea908af592dd5e8c9b2d50dbaba553eb758b4bae9cb042febbd42a591a1c4e0fe312c6c7fc4d0376395168eee3a93b5cb397295c7d85a49ca9fa
+  languageName: node
+  linkType: hard
+
 "jsonwebtoken@npm:8.5.1, jsonwebtoken@npm:^8.5.1":
   version: 8.5.1
   resolution: "jsonwebtoken@npm:8.5.1"
@@ -40612,6 +39400,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jszip@npm:^3.7.1":
+  version: 3.10.1
+  resolution: "jszip@npm:3.10.1"
+  dependencies:
+    lie: ~3.3.0
+    pako: ~1.0.2
+    readable-stream: ~2.3.6
+    setimmediate: ^1.0.5
+  checksum: abc77bfbe33e691d4d1ac9c74c8851b5761fba6a6986630864f98d876f3fcc2d36817dfc183779f32c00157b5d53a016796677298272a714ae096dfe6b1c8b60
+  languageName: node
+  linkType: hard
+
 "juice@npm:8.0.0":
   version: 8.0.0
   resolution: "juice@npm:8.0.0"
@@ -40730,6 +39530,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"killable@npm:1.0.1":
+  version: 1.0.1
+  resolution: "killable@npm:1.0.1"
+  checksum: 911a85c6e390c19d72c4e3149347cf44042cbd7d18c3c6c5e4f706fdde6e0ed532473392e282c7ef27f518407e6cb7d2a0e71a2ae8d8d8f8ffdb68891a29a68a
+  languageName: node
+  linkType: hard
+
 "kind-of@npm:^5.0.0":
   version: 5.1.0
   resolution: "kind-of@npm:5.1.0"
@@ -41017,6 +39824,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lie@npm:~3.3.0":
+  version: 3.3.0
+  resolution: "lie@npm:3.3.0"
+  dependencies:
+    immediate: ~3.0.5
+  checksum: 33102302cf19766f97919a6a98d481e01393288b17a6aa1f030a3542031df42736edde8dab29ffdbf90bebeffc48c761eb1d064dc77592ca3ba3556f9fe6d2a8
+  languageName: node
+  linkType: hard
+
 "lighthouse-logger@npm:^1.0.0":
   version: 1.4.2
   resolution: "lighthouse-logger@npm:1.4.2"
@@ -41124,6 +39940,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lilconfig@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "lilconfig@npm:3.1.2"
+  checksum: 4e8b83ddd1d0ad722600994e6ba5d858ddca14f0587aa6b9c8185e17548149b5e13d4d583d811e9e9323157fa8c6a527e827739794c7502b59243c58e210b8c3
+  languageName: node
+  linkType: hard
+
 "limiter@npm:1.1.5, limiter@npm:^1.1.5":
   version: 1.1.5
   resolution: "limiter@npm:1.1.5"
@@ -41710,6 +40533,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"logform@npm:^2.6.0, logform@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "logform@npm:2.6.1"
+  dependencies:
+    "@colors/colors": 1.6.0
+    "@types/triple-beam": ^1.3.2
+    fecha: ^4.2.0
+    ms: ^2.1.1
+    safe-stable-stringify: ^2.3.1
+    triple-beam: ^1.3.0
+  checksum: 0c6b95fa8350ccc33c7c33d77de2a9920205399706fc1b125151c857b61eb90873f4670d9e0e58e58c165b68a363206ae670d6da8b714527c838da3c84449605
+  languageName: node
+  linkType: hard
+
 "logkitty@npm:^0.7.1":
   version: 0.7.1
   resolution: "logkitty@npm:0.7.1"
@@ -41776,6 +40613,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lop@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "lop@npm:0.4.1"
+  dependencies:
+    duck: ^0.1.12
+    option: ~0.2.1
+    underscore: ^1.13.1
+  checksum: 0586a2601a6cc709664b40e69266fb684136d9f4041a97d76413030846f0c03f36c6a262873efbcf6ab8e5a584449e24b18722b8a7e5d58e5326359f0be08439
+  languageName: node
+  linkType: hard
+
 "lottie-web@npm:5.7.13":
   version: 5.7.13
   resolution: "lottie-web@npm:5.7.13"
@@ -42122,6 +40970,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mammoth@npm:^1.8.0":
+  version: 1.8.0
+  resolution: "mammoth@npm:1.8.0"
+  dependencies:
+    "@xmldom/xmldom": ^0.8.6
+    argparse: ~1.0.3
+    base64-js: ^1.5.1
+    bluebird: ~3.4.0
+    dingbat-to-unicode: ^1.0.1
+    jszip: ^3.7.1
+    lop: ^0.4.1
+    path-is-absolute: ^1.0.0
+    underscore: ^1.13.1
+    xmlbuilder: ^10.0.0
+  bin:
+    mammoth: bin/mammoth
+  checksum: ae5a07e22e40d733445266c01cd196e5e28d885ac8b93f1c1593375d4a843cc771909d97d6c09b8d646e17dac56e10ae06b68d8e2b6edd093d0277bb26b1884c
+  languageName: node
+  linkType: hard
+
 "map-cache@npm:^0.2.0":
   version: 0.2.2
   resolution: "map-cache@npm:0.2.2"
@@ -43407,7 +42275,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.25, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:2.1.35, mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.25, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -43589,6 +42457,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: 2c035575eda1e50623c731ec6c14f65a85296268f749b9337005210bb2b34e2705f8ef1a358b188f69892286ab99dc42c8fb98a57bde55c8d81b3023c19cea28
+  languageName: node
+  linkType: hard
+
 "minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
   version: 1.2.6
   resolution: "minimist@npm:1.2.6"
@@ -43758,6 +42635,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:3.0.1":
+  version: 3.0.1
+  resolution: "mkdirp@npm:3.0.1"
+  bin:
+    mkdirp: dist/cjs/src/bin.js
+  checksum: 972deb188e8fb55547f1e58d66bd6b4a3623bf0c7137802582602d73e6480c1c2268dcbafbfb1be466e00cc7e56ac514d7fd9334b7cf33e3e2ab547c16f83a8d
+  languageName: node
+  linkType: hard
+
 "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
@@ -44038,6 +42924,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mustache@npm:4.2.0":
+  version: 4.2.0
+  resolution: "mustache@npm:4.2.0"
+  bin:
+    mustache: bin/mustache
+  checksum: 928fcb63e3aa44a562bfe9b59ba202cccbe40a46da50be6f0dd831b495be1dd7e38ca4657f0ecab2c1a89dc7bccba0885eab7ee7c1b215830da765758c7e0506
+  languageName: node
+  linkType: hard
+
 "mute-stream@npm:0.0.6":
   version: 0.0.6
   resolution: "mute-stream@npm:0.0.6"
@@ -44154,6 +43049,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"natural-orderby@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "natural-orderby@npm:2.0.3"
+  checksum: 039be7f0b6cf81e63d2ae5299553f8e6c8f6ae4f571c7c002eab9c6d36a2e33101704e0ec64c3cecef956fa3b1a68bb0ddfc03208e89f31c0b0bb806f3198646
+  languageName: node
+  linkType: hard
+
 "ncp@npm:~2.0.0":
   version: 2.0.0
   resolution: "ncp@npm:2.0.0"
@@ -44682,6 +43584,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nodemailer@npm:6.7.2, nodemailer@npm:^6.4.16":
+  version: 6.7.2
+  resolution: "nodemailer@npm:6.7.2"
+  checksum: 3c37a40928448e2f5118a9f2f016c7a4f32228d0e6b7cc7d1834b8001374cc77280dc077a83239420f6daea4c898d9a1f336dfc2273bb7eddaf51a36bd126f72
+  languageName: node
+  linkType: hard
+
 "nodemailer@npm:6.7.3":
   version: 6.7.3
   resolution: "nodemailer@npm:6.7.3"
@@ -44689,20 +43598,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nodemailer@npm:6.9.14":
-  version: 6.9.14
-  resolution: "nodemailer@npm:6.9.14"
-  checksum: 4037a45e24dbca47c0ea9a962d2c316deef7afe6ebf73c7da3a84942a8d501d85aae7f36dc1c5dac58dec7275f7cb1c92fd4f9c7c19f037225019ad2f402a9dc
-  languageName: node
-  linkType: hard
-
-"nodemailer@npm:^6.4.16":
-  version: 6.7.2
-  resolution: "nodemailer@npm:6.7.2"
-  checksum: 3c37a40928448e2f5118a9f2f016c7a4f32228d0e6b7cc7d1834b8001374cc77280dc077a83239420f6daea4c898d9a1f336dfc2273bb7eddaf51a36bd126f72
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^4.0.1":
   version: 4.0.3
   resolution: "nopt@npm:4.0.3"
@@ -45206,6 +44101,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-path@npm:0.11.8":
+  version: 0.11.8
+  resolution: "object-path@npm:0.11.8"
+  checksum: 684ccf0fb6b82f067dc81e2763481606692b8485bec03eb2a64e086a44dbea122b2b9ef44423a08e09041348fe4b4b67bd59985598f1652f67df95f0618f5968
+  languageName: node
+  linkType: hard
+
+"object-treeify@npm:^1.1.33":
+  version: 1.1.33
+  resolution: "object-treeify@npm:1.1.33"
+  checksum: 3af7f889349571ee73f5bdfb5ac478270c85eda8bcba950b454eb598ce41759a1ed6b0b43fbd624cb449080a4eb2df906b602e5138b6186b9563b692231f1694
+  languageName: node
+  linkType: hard
+
 "object.assign@npm:^4.1.0, object.assign@npm:^4.1.2":
   version: 4.1.2
   resolution: "object.assign@npm:4.1.2"
@@ -45574,6 +44483,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"option@npm:~0.2.1":
+  version: 0.2.4
+  resolution: "option@npm:0.2.4"
+  checksum: a9d0170965743b0cdf8055fa5fde9e1e0961d14abde41c0b28e583b1b9596ca82770476c79dd7767fa754ee63694fef707c5325384868d68af018f5fe972f89e
+  languageName: node
+  linkType: hard
+
 "optionator@npm:^0.8.1":
   version: 0.8.3
   resolution: "optionator@npm:0.8.3"
@@ -45877,7 +44793,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pako@npm:^1.0.10, pako@npm:^1.0.11, pako@npm:^1.0.6, pako@npm:~1.0.5":
+"pako@npm:^1.0.10, pako@npm:^1.0.11, pako@npm:^1.0.6, pako@npm:~1.0.2, pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
   checksum: 1be2bfa1f807608c7538afa15d6f25baa523c30ec870a3228a89579e474a4d992f4293859524e46d5d87fd30fa17c5edf34dbef0671251d9749820b488660b16
@@ -46114,6 +45030,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"password-prompt@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "password-prompt@npm:1.1.3"
+  dependencies:
+    ansi-escapes: ^4.3.2
+    cross-spawn: ^7.0.3
+  checksum: 9a5fdbd7360db896809704c141acfe9258450a9982c4c177b82a1e6c69d204800cdab6064abac6736bd7d31142c80108deedf4484146594747cb3ce776816e97
+  languageName: node
+  linkType: hard
+
 "path-browserify@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-browserify@npm:1.0.1"
@@ -47863,6 +46789,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:6.12.3":
+  version: 6.12.3
+  resolution: "qs@npm:6.12.3"
+  dependencies:
+    side-channel: ^1.0.6
+  checksum: 9a9228a623bc36d41648237667d7342fb8d64d1cfeb29e474b0c44591ba06ac507e2d726f60eca5af8dc420e5dd23370af408ef8c28e0405675c7187b736a693
+  languageName: node
+  linkType: hard
+
 "qs@npm:^6.10.0, qs@npm:^6.4.0, qs@npm:^6.5.1, qs@npm:^6.9.4":
   version: 6.10.3
   resolution: "qs@npm:6.10.3"
@@ -48031,7 +46966,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
+"range-parser@npm:1.2.1, range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
   checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
@@ -48599,6 +47534,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-native-date-picker@npm:5.0.4":
+  version: 5.0.4
+  resolution: "react-native-date-picker@npm:5.0.4"
+  peerDependencies:
+    react: ">= 17.0.1"
+    react-native: ">= 0.64.3"
+  checksum: 67db7fba5de613c61a70b5b9274daef8c7d3b6f6cdc5a6063eb61126d4df43252c501c2cb78ebda37fb0997ccb0994e949976d0fb395453580019923100e03ad
+  languageName: node
+  linkType: hard
+
 "react-native-device-info@npm:10.3.0":
   version: 10.3.0
   resolution: "react-native-device-info@npm:10.3.0"
@@ -49464,7 +48409,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^3.0.6":
+"readable-stream@npm:^3.0.6, readable-stream@npm:^3.6.2":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
   dependencies:
@@ -50747,7 +49692,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.8.1, rxjs@npm:^7.8.0":
+"rxjs@npm:*, rxjs@npm:7.8.1, rxjs@npm:^7.8.0":
   version: 7.8.1
   resolution: "rxjs@npm:7.8.1"
   dependencies:
@@ -52421,15 +51366,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sqs-consumer@npm:10.3.0":
-  version: 10.3.0
-  resolution: "sqs-consumer@npm:10.3.0"
+"sqs-consumer@npm:5.4.0":
+  version: 5.4.0
+  resolution: "sqs-consumer@npm:5.4.0"
   dependencies:
-    "@aws-sdk/client-sqs": ^3.529.1
-    debug: ^4.3.4
-  peerDependencies:
-    "@aws-sdk/client-sqs": ^3.529.1
-  checksum: 9f4d317d04e8723c6f2c53b875be58744f0c26a345e0281e179763b467e3fa9d97a80bd576d4aa44de1bb9d70ddf47e828145a1c97efa108594734f565be12c2
+    aws-sdk: ^2.443.0
+    debug: ^4.1.1
+  checksum: 7f05c84609f3b180c135eec4b8b2ad2c3e0c208b77eb3c45ca2887d6003715268750a75d10b91b2748502e4e21a92f8964efccb711d17ff16fb6e88e02646959
   languageName: node
   linkType: hard
 
@@ -53492,7 +52435,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
+"supports-color@npm:8.1.1, supports-color@npm:^8, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
   version: 8.1.1
   resolution: "supports-color@npm:8.1.1"
   dependencies:
@@ -53536,6 +52479,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-hyperlinks@npm:^2.2.0":
+  version: 2.3.0
+  resolution: "supports-hyperlinks@npm:2.3.0"
+  dependencies:
+    has-flag: ^4.0.0
+    supports-color: ^7.0.0
+  checksum: 9ee0de3c8ce919d453511b2b1588a8205bd429d98af94a01df87411391010fe22ca463f268c84b2ce2abad019dfff8452aa02806eeb5c905a8d7ad5c4f4c52b8
+  languageName: node
+  linkType: hard
+
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
@@ -54707,6 +53660,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:2.6.3, tslib@npm:^2.6.3":
+  version: 2.6.3
+  resolution: "tslib@npm:2.6.3"
+  checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^1.10.0, tslib@npm:^1.11.1, tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
@@ -54721,13 +53681,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.6.3":
-  version: 2.6.3
-  resolution: "tslib@npm:2.6.3"
-  checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5
-  languageName: node
-  linkType: hard
-
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -54954,6 +53907,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-emitter@npm:2.1.0":
+  version: 2.1.0
+  resolution: "typed-emitter@npm:2.1.0"
+  dependencies:
+    rxjs: "*"
+  dependenciesMeta:
+    rxjs:
+      optional: true
+  checksum: 95821a9e05784b972cc9d152891fd12a56cb4b1a7c57e768c02bea6a8984da7aff8f19404a7b69eea11fae2a3b6c0c510a4c510f575f50162c759ae9059f2520
+  languageName: node
+  linkType: hard
+
 "typedarray-to-buffer@npm:^3.1.5":
   version: 3.1.5
   resolution: "typedarray-to-buffer@npm:3.1.5"
@@ -55881,6 +54846,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:3.3.2":
+  version: 3.3.2
+  resolution: "uuid@npm:3.3.2"
+  bin:
+    uuid: ./bin/uuid
+  checksum: 8793629d2799f500aeea9fcd0aec6c4e9fbcc4d62ed42159ad96be345c3fffac1bbf61a23e18e2782600884fee05e6d4012ce4b70d0037c8e987533ae6a77870
+  languageName: node
+  linkType: hard
+
 "uuid@npm:8.0.0":
   version: 8.0.0
   resolution: "uuid@npm:8.0.0"
@@ -55935,15 +54909,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "uuid@npm:9.0.1"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 39931f6da74e307f51c0fb463dc2462807531dc80760a9bff1e35af4316131b4fc3203d16da60ae33f07fdca5b56f3f1dd662da0c99fea9aaeab2004780cc5f4
-  languageName: node
-  linkType: hard
-
 "uuidv4@npm:6.0.8":
   version: 6.0.8
   resolution: "uuidv4@npm:6.0.8"
@@ -56865,6 +55830,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"winston-transport@npm:^4.7.0":
+  version: 4.7.1
+  resolution: "winston-transport@npm:4.7.1"
+  dependencies:
+    logform: ^2.6.1
+    readable-stream: ^3.6.2
+    triple-beam: ^1.3.0
+  checksum: e1dc070df1eb2ab0270a369fd7e8ff2b7a714ba9cf9a3f2c9a3509eb5fe60667c64e5cd4f37b3dd64a21017a93ea63fdcb2ac9176b12d2222a9e4244439d1b35
+  languageName: node
+  linkType: hard
+
+"winston@npm:3.13.1":
+  version: 3.13.1
+  resolution: "winston@npm:3.13.1"
+  dependencies:
+    "@colors/colors": ^1.6.0
+    "@dabh/diagnostics": ^2.0.2
+    async: ^3.2.3
+    is-stream: ^2.0.0
+    logform: ^2.6.0
+    one-time: ^1.0.0
+    readable-stream: ^3.4.0
+    safe-stable-stringify: ^2.3.1
+    stack-trace: 0.0.x
+    triple-beam: ^1.3.0
+    winston-transport: ^4.7.0
+  checksum: 34fb3da9ed62fa6a5aded17692b7d4773744999c42efd0a15b866c1202391859b1aef922e94b532632a02738b30ed658429258cb32d5aec4563bb14f2168b888
+  languageName: node
+  linkType: hard
+
 "winston@npm:3.7.2":
   version: 3.7.2
   resolution: "winston@npm:3.7.2"
@@ -57090,6 +56085,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml-js@npm:1.6.11":
+  version: 1.6.11
+  resolution: "xml-js@npm:1.6.11"
+  dependencies:
+    sax: ^1.2.4
+  bin:
+    xml-js: ./bin/cli.js
+  checksum: 24a55479919413687105fc2d8ab05e613ebedb1c1bc12258a108e07cff5ef793779297db854800a4edf0281303ebd1f177bc4a588442f5344e62b3dddda26c2b
+  languageName: node
+  linkType: hard
+
 "xml-name-validator@npm:^3.0.0":
   version: 3.0.0
   resolution: "xml-name-validator@npm:3.0.0"
@@ -57104,6 +56110,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml2js@npm:0.4.19":
+  version: 0.4.19
+  resolution: "xml2js@npm:0.4.19"
+  dependencies:
+    sax: ">=0.6.0"
+    xmlbuilder: ~9.0.1
+  checksum: ca8b2fee430d450a18947786bfd7cd1a353ee00fc6fd550acbc8a8e65f1b4df5e9786fcb2990c1a5514ecd554d445fb74e1d716b3a4fcfffc10554aeb5db482b
+  languageName: node
+  linkType: hard
+
 "xml2js@npm:0.4.23, xml2js@npm:^0.4.17, xml2js@npm:^0.4.23":
   version: 0.4.23
   resolution: "xml2js@npm:0.4.23"
@@ -57124,13 +56140,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:0.6.2":
-  version: 0.6.2
-  resolution: "xml2js@npm:0.6.2"
-  dependencies:
-    sax: ">=0.6.0"
-    xmlbuilder: ~11.0.0
-  checksum: 458a83806193008edff44562c0bdb982801d61ee7867ae58fd35fab781e69e17f40dfeb8fc05391a4648c9c54012066d3955fe5d993ffbe4dc63399023f32ac2
+"xmlbuilder@npm:^10.0.0":
+  version: 10.1.1
+  resolution: "xmlbuilder@npm:10.1.1"
+  checksum: 1543fdf1489ccaf168d8f39978ea5c59ee438bc869f90365cd455f1729759fbfb92bb8e976b990a2c07ce4d4b2c7530ece4a7235b6d6705bdfc8d1f41ec4aa11
   languageName: node
   linkType: hard
 
@@ -57155,6 +56168,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xmlbuilder@npm:~9.0.1":
+  version: 9.0.7
+  resolution: "xmlbuilder@npm:9.0.7"
+  checksum: 8193bb323806a002764f013bea0c6e9ff2dc26fd29109408761b16b59a8ad2214c2abe8e691755fd8b525586e3a0e1efeb92335947d7b0899032b779f1705a53
+  languageName: node
+  linkType: hard
+
 "xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"