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 2fffc93fefc42..161e1461f3ed4 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
@@ -35,10 +35,7 @@ import { ApplicationActionService } from './application-action.service'
     PaymentModule,
     AuditModule.forRoot(environment.audit),
     AuthModule.register(environment.auth),
-    TemplateAPIModule.register({
-      ...environment.templateApi,
-      applicationService: TemplateApiApplicationService,
-    }),
+    TemplateAPIModule.register(environment.templateApi),
     ApplicationApiCoreModule,
     createBullModule(),
     ApplicationFilesModule,
diff --git a/libs/application/template-api-modules/README.md b/libs/application/template-api-modules/README.md
index 4a868c3b6fe20..be1687c444c5e 100644
--- a/libs/application/template-api-modules/README.md
+++ b/libs/application/template-api-modules/README.md
@@ -35,7 +35,7 @@ export class ReferenceTemplateModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: ReferenceTemplateModule,
-      imports: [SharedTemplateAPIModule.register(config)],
+      imports: [SharedTemplateAPIModule],
       providers: [ReferenceTemplateService],
       exports: [ReferenceTemplateService],
     }
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 2473e3838fece..0bce3c375ac27 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
@@ -1,4 +1,4 @@
-import { DynamicModule } from '@nestjs/common'
+import { DynamicModule, Module } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
 import { EmailModule } from '@island.is/email-service'
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
@@ -11,32 +11,24 @@ import { SharedTemplateApiService } from './shared.service'
 import { SmsModule } from '@island.is/nova-sms'
 import { PaymentModule } from '@island.is/application/api/payment'
 import { AttachmentS3Service } from './services'
+import { sharedModuleConfig } from './shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import { ApplicationModule } from './api/application/application.module'
 
-export class SharedTemplateAPIModule {
-  static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
-    const configuration = () => config
-
-    return {
-      module: SharedTemplateAPIModule,
-      imports: [
-        ConfigModule.forRoot({
-          load: [configuration],
-        }),
-        EmailModule,
-        SmsModule,
-        ApplicationApiCoreModule,
-        AwsModule,
-        PaymentModule,
-      ],
-      providers: [
-        SharedTemplateApiService,
-        {
-          provide: BaseTemplateApiApplicationService,
-          useClass: config.applicationService,
-        },
-        AttachmentS3Service,
-      ],
-      exports: [SharedTemplateApiService, AttachmentS3Service],
-    }
-  }
-}
+@Module({
+  imports: [
+    EmailModule,
+    SmsModule,
+    ApplicationApiCoreModule,
+    AwsModule,
+    PaymentModule,
+    ApplicationModule,
+  ],
+  providers: [
+    SharedTemplateApiService,
+    //BaseTemplateApiApplicationService, // Fix this
+    AttachmentS3Service,
+  ],
+  exports: [SharedTemplateApiService, AttachmentS3Service],
+})
+export class SharedTemplateAPIModule {}
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 a241ad8929c41..9c872c99a88b6 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
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common'
-import { ConfigType } from '@nestjs/config'
+import { ConfigService, ConfigType } from '@nestjs/config'
 import { EmailService } from '@island.is/email-service'
 import {
   Application,
@@ -23,6 +23,11 @@ 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 { sharedModuleConfig } from './shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import jwt from 'jsonwebtoken'
+import { uuid } from 'uuidv4'
+import { TemplateAPIConfig } from '../..'
+import { AwsService } from '@island.is/nest/aws'
 
 @Injectable()
 export class SharedTemplateApiService {
@@ -36,15 +41,19 @@ export class SharedTemplateApiService {
     private readonly smsService: SmsService,
     @Inject(sharedModuleConfig.KEY)
     private config: ConfigType<typeof sharedModuleConfig>,
-    @Inject(BaseTemplateApiApplicationService)
-    private readonly applicationService: BaseTemplateApiApplicationService,
+    // @Inject(BaseTemplateApiApplicationService)
+    // private readonly baseApplicationService: BaseTemplateApiApplicationService,
+    @Inject(ConfigService)
+    private readonly configService: ConfigService<TemplateAPIConfig>,
+    private readonly applicationService: ApplicationService,
     private readonly paymentService: PaymentService,
+    private readonly awsService: AwsService,
   ) {
     this.s3 = new S3()
   }
 
   async createAssignToken(application: Application, expiresIn: number) {
-    const token = await this.applicationService.createAssignToken(
+    const token = await this.createToken(
       application,
       this.config.jwtSecret,
       expiresIn,
@@ -204,7 +213,7 @@ export class SharedTemplateApiService {
       ContentEncoding?: string
     },
   ): Promise<string> {
-    return this.applicationService.saveAttachmentToApplicaton(
+    return this.saveAttachmentToApplicaton(
       application,
       fileName,
       buffer,
@@ -265,4 +274,69 @@ export class SharedTemplateApiService {
       Expires: expiration,
     })
   }
+
+  async saveAttachmentToApplicaton(
+    application: ApplicationWithAttachments,
+    fileName: string,
+    buffer: Buffer,
+    uploadParameters?: {
+      ContentType?: string
+      ContentDisposition?: string
+      ContentEncoding?: string
+    },
+  ): Promise<string> {
+    const uploadBucket = this.configService.get('attachmentBucket') as string
+    if (!uploadBucket) throw new Error('No attachment bucket configured')
+
+    const fileId = uuid()
+    const attachmentKey = `${fileId}-${fileName}`
+    const s3key = `${application.id}/${attachmentKey}`
+    const url = await this.awsService.uploadFile(
+      buffer,
+      uploadBucket,
+      s3key,
+      uploadParameters,
+    )
+
+    await this.applicationService.update(application.id, {
+      attachments: {
+        ...application.attachments,
+        [attachmentKey]: url,
+      },
+    })
+
+    return attachmentKey
+  }
+
+  async storeNonceForApplication(application: Application): Promise<string> {
+    const nonce = uuid()
+
+    const applicationToUpdate = await this.applicationService.findOneById(
+      application.id,
+    )
+
+    if (!applicationToUpdate) throw new Error('Application not found')
+
+    await this.applicationService.addNonce(applicationToUpdate, nonce)
+
+    return nonce
+  }
+
+  async createToken(
+    application: Application,
+    secret: string,
+    expiresIn: number,
+  ): Promise<string> {
+    const nonce = await this.storeNonceForApplication(application)
+    const token = jwt.sign(
+      {
+        applicationId: application.id,
+        state: application.state,
+        nonce,
+      },
+      secret,
+      { expiresIn },
+    )
+    return token
+  }
 }
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 c3d21f0fbc8f0..6b74b8a16bdb9 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
@@ -24,10 +24,7 @@ export class AccidentNotificationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: AccidentNotificationModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        HealthInsuranceV2ClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, HealthInsuranceV2ClientModule],
       providers: [
         {
           provide: ACCIDENT_NOTIFICATION_CONFIG,
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 00535db0c3a9a..508a0547b5617 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
@@ -24,6 +24,9 @@ import { SmsService } from '@island.is/nova-sms'
 import { PaymentService } from '@island.is/application/api/payment'
 import { templateAPIConfig } from '../../template-api.config'
 import { sharedModuleConfig } from '../../shared/shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import { update } from 'lodash'
+import { AwsService } from '@island.is/nest/aws'
 const nationalId = '1234564321'
 let id = 0
 
@@ -125,6 +128,14 @@ describe('AccidentNotificationService', () => {
             applicationSenderEmail: '',
           },
         },
+        {
+          provide: ApplicationService,
+          useValue: {},
+        },
+        {
+          provide: AwsService,
+          useValue: {},
+        },
         AccidentNotificationAttachmentProvider,
         SharedTemplateApiService,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.module.ts
index 75a186c3aecd2..6cd08a014d6c4 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.module.ts
@@ -16,7 +16,7 @@ export class AnnouncementOfDeathModule {
       imports: [
         NationalRegistryClientModule,
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ConfigModule.forRoot({
           isGlobal: true,
           load: [XRoadConfig, NationalRegistryClientConfig],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/change-machine-supervisor/change-machine-supervisor.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/change-machine-supervisor/change-machine-supervisor.module.ts
index 116efde5bbef3..80edb06519085 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/change-machine-supervisor/change-machine-supervisor.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/change-machine-supervisor/change-machine-supervisor.module.ts
@@ -14,7 +14,7 @@ export class ChangeMachineSupervisorTemplateModule {
     return {
       module: ChangeMachineSupervisorTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/deregister-machine/deregister-machine.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/deregister-machine/deregister-machine.module.ts
index 77942a19619fa..19943de99d753 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/deregister-machine/deregister-machine.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/deregister-machine/deregister-machine.module.ts
@@ -14,7 +14,7 @@ export class DeregisterMachineTemplateModule {
     return {
       module: DeregisterMachineTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.module.ts
index cb6bf48b72c93..e0d73f2277bdc 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.module.ts
@@ -14,7 +14,7 @@ export class RegisterNewMachineTemplateModule {
     return {
       module: RegisterNewMachineTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/request-inspection/request-inspection.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/request-inspection/request-inspection.module.ts
index cab327e995945..eca5c55a75896 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/request-inspection/request-inspection.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/request-inspection/request-inspection.module.ts
@@ -14,7 +14,7 @@ export class RequestInspectionTemplateModule {
     return {
       module: RequestInspectionTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/street-registration/street-registration.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/street-registration/street-registration.module.ts
index 11921ffa576c4..ae5da7ec0958b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/street-registration/street-registration.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/street-registration/street-registration.module.ts
@@ -17,7 +17,7 @@ export class StreetRegistrationTemplateModule {
     return {
       module: StreetRegistrationTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ChargeFjsV2ClientModule,
         ConfigModule.forRoot({
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.module.ts
index fed235ae5fe22..f67ef1a7e1709 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.module.ts
@@ -17,7 +17,7 @@ export class TransferOfMachineOwnershipTemplateModule {
     return {
       module: TransferOfMachineOwnershipTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ChargeFjsV2ClientModule,
         ConfigModule.forRoot({
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/car-recycling/car-recycling.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/car-recycling/car-recycling.module.ts
index 21c8e1f31d571..ab604c3752598 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/car-recycling/car-recycling.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/car-recycling/car-recycling.module.ts
@@ -13,7 +13,7 @@ export class CarRecyclingModule {
       module: CarRecyclingModule,
       imports: [
         CarRecyclingClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ApplicationApiCoreModule,
         VehiclesClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change-v2/children-residence-change.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change-v2/children-residence-change.module.ts
index 2953cf3a04aa0..8f744355ffda7 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change-v2/children-residence-change.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/children-residence-change-v2/children-residence-change.module.ts
@@ -12,7 +12,7 @@ export class ChildrenResidenceChangeModuleV2 {
       module: ChildrenResidenceChangeModuleV2,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SmsModule,
         NationalRegistryClientModule,
       ],
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 7034ce3959661..b8c2f3f3fd56d 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
@@ -15,7 +15,7 @@ export class ChildrenResidenceChangeModule {
       module: ChildrenResidenceChangeModule,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SmsModule,
         NationalRegistryClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/complaints-to-althingi-ombudsman/complaints-to-althingi-ombudsman.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/complaints-to-althingi-ombudsman/complaints-to-althingi-ombudsman.module.ts
index 087a08d9237ed..8fc12e90c841d 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/complaints-to-althingi-ombudsman/complaints-to-althingi-ombudsman.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/complaints-to-althingi-ombudsman/complaints-to-althingi-ombudsman.module.ts
@@ -24,7 +24,7 @@ export class ComplaintsToAlthingiOmbudsmanTemplateModule {
     return {
       module: ComplaintsToAlthingiOmbudsmanTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         FileStorageModule,
         ClientsAlthingiOmbudsmanModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.module.ts
index a9734b91c4e4b..19ccd3027a99e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.module.ts
@@ -13,7 +13,7 @@ export class CriminalRecordSubmissionModule {
     return {
       module: CriminalRecordSubmissionModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         CriminalRecordModule,
         SyslumennClientModule,
       ],
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 631204c5000c7..8ac4e841f788d 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
@@ -20,7 +20,7 @@ export class DataProtectionComplaintModule {
     return {
       module: DataProtectionComplaintModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         FileStorageModule,
         ClientsDataProtectionComplaintModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.module.ts
index d075572eff51c..05c81347751c6 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.module.ts
@@ -14,7 +14,7 @@ export class CitizenshipModule {
     return {
       module: CitizenshipModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         DirectorateOfImmigrationClientModule,
         NationalRegistryClientModule,
         ConfigModule.forRoot({
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/document-provider-onboarding/document-provider-onboarding.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/document-provider-onboarding/document-provider-onboarding.module.ts
index 5a83c7db5b2a1..483cfdd615dd2 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/document-provider-onboarding/document-provider-onboarding.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/document-provider-onboarding/document-provider-onboarding.module.ts
@@ -12,7 +12,7 @@ export class DocumentProviderOnboardingModule {
     return {
       module: DocumentProviderOnboardingModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ClientsDocumentProviderModule.register({
           basePath: SERVICE_DOCUMENTS_BASEPATH,
         }),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-learners-permit/driving-learners-permit.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-learners-permit/driving-learners-permit.module.ts
index 99404753e71e9..a10794c85ac65 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/driving-learners-permit/driving-learners-permit.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-learners-permit/driving-learners-permit.module.ts
@@ -15,10 +15,7 @@ export class DrivingLearnersPermitModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DrivingLearnersPermitModule,
-      imports: [
-        DrivingLicenseApiModule,
-        SharedTemplateAPIModule.register(config),
-      ],
+      imports: [DrivingLicenseApiModule, SharedTemplateAPIModule],
       providers: [DrivingLearnersPermitService],
       exports: [DrivingLearnersPermitService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-book-update-instructor/driving-license-book-update-instructor.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-book-update-instructor/driving-license-book-update-instructor.module.ts
index eea4a689e2b03..266afc6ac760a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-book-update-instructor/driving-license-book-update-instructor.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-book-update-instructor/driving-license-book-update-instructor.module.ts
@@ -8,10 +8,7 @@ export class DrivingLicenseBookUpdateInstructorModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DrivingLicenseBookUpdateInstructorModule,
-      imports: [
-        SharedTemplateAPIModule.register(baseConfig),
-        DrivingLicenseBookClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, DrivingLicenseBookClientModule],
       providers: [DrivingLicenseBookUpdateInstructorService],
       exports: [DrivingLicenseBookUpdateInstructorService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.module.ts
index 880c8eaa3b66a..1bcce0a09a861 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.module.ts
@@ -15,10 +15,7 @@ export class DrivingLicenseDuplicateModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DrivingLicenseDuplicateModule,
-      imports: [
-        SharedTemplateAPIModule.register(baseConfig),
-        DrivingLicenseModule,
-      ],
+      imports: [SharedTemplateAPIModule, DrivingLicenseModule],
       providers: [DrivingLicenseDuplicateService],
       exports: [DrivingLicenseDuplicateService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-submission/driving-license-submission.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-submission/driving-license-submission.module.ts
index 4f2e93725d498..83acc3ef47f74 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-submission/driving-license-submission.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-submission/driving-license-submission.module.ts
@@ -15,10 +15,7 @@ export class DrivingLicenseSubmissionModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DrivingLicenseSubmissionModule,
-      imports: [
-        SharedTemplateAPIModule.register(baseConfig),
-        DrivingLicenseModule,
-      ],
+      imports: [SharedTemplateAPIModule, DrivingLicenseModule],
       providers: [DrivingLicenseSubmissionService],
       exports: [DrivingLicenseSubmissionService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/energy-funds/energy-funds.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/energy-funds/energy-funds.module.ts
index 792b45ffd4cc8..4a0a2d09c1587 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/energy-funds/energy-funds.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/energy-funds/energy-funds.module.ts
@@ -17,7 +17,7 @@ export class EnergyFundsModule {
     return {
       module: EnergyFundsModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         EnergyFundsClientModule,
         VehiclesClientModule,
         ConfigModule.forRoot({
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 21e42a3418355..dfea7b1512cda 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
@@ -11,10 +11,7 @@ export class EstateTemplateModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: EstateTemplateModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        SyslumennClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, SyslumennClientModule],
       providers: [EstateTemplateService],
       exports: [EstateTemplateService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.module.ts
index 2e1ca0586226f..fd2d4dc5f7375 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.module.ts
@@ -8,7 +8,7 @@ export class EuropeanHealthInsuranceCardModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: EuropeanHealthInsuranceCardModule,
-      imports: [EhicClientModule, SharedTemplateAPIModule.register(config)],
+      imports: [EhicClientModule, SharedTemplateAPIModule],
       providers: [EuropeanHealthInsuranceCardService],
       exports: [EuropeanHealthInsuranceCardService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/example-payment-actions/examplePaymentActions.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/example-payment-actions/examplePaymentActions.module.ts
index 1ee061a17cc44..0f43f8a9b2210 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/example-payment-actions/examplePaymentActions.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/example-payment-actions/examplePaymentActions.module.ts
@@ -14,7 +14,7 @@ export class ExamplePaymentActionsModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: ExamplePaymentActionsModule,
-      imports: [SharedTemplateAPIModule.register(baseConfig)],
+      imports: [SharedTemplateAPIModule],
       providers: [ExamplePaymentActionsService],
       exports: [ExamplePaymentActionsService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/financial-aid/financial-aid.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/financial-aid/financial-aid.module.ts
index 706edcc85cf8a..c1525d2ec8806 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/financial-aid/financial-aid.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/financial-aid/financial-aid.module.ts
@@ -12,7 +12,7 @@ export class FinancialAidModule {
       module: FinancialAidModule,
       imports: [
         MunicipalitiesFinancialAidClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
       ],
       providers: [FinancialAidService],
       exports: [FinancialAidService],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-cemetery/financial-statement-cemetery.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-cemetery/financial-statement-cemetery.module.ts
index 0bd4bb768bc65..0c1cd8c4f64f8 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-cemetery/financial-statement-cemetery.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-cemetery/financial-statement-cemetery.module.ts
@@ -13,7 +13,7 @@ export class FinancialStatementCemeteryTemplateModule {
     return {
       module: FinancialStatementCemeteryTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ConfigModule.forRoot({
           load: [FinancialStatementsInaoClientConfig],
         }),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-individual-election/financial-statement-individual-election.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-individual-election/financial-statement-individual-election.module.ts
index 54b2c29a4cef2..12438bc8fd8e9 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-individual-election/financial-statement-individual-election.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/financial-statement-individual-election/financial-statement-individual-election.module.ts
@@ -13,7 +13,7 @@ export class FinancialStatementIndividualElectionModule {
     return {
       module: FinancialStatementIndividualElectionModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ConfigModule.forRoot({
           load: [FinancialStatementsInaoClientConfig],
         }),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.module.ts
index ac777e44bc538..5191d2b3f3c1d 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao/financial-statements-inao.module.ts
@@ -14,7 +14,7 @@ export class FinancialStatementsInaoTemplateModule {
     return {
       module: FinancialStatementsInaoTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ConfigModule.forRoot({
           load: [FinancialStatementsInaoClientConfig],
         }),
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/funding-government-projects/funding-government-projects.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/funding-government-projects/funding-government-projects.module.ts
index 6ff8bbf134250..a99f1df91b5aa 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/funding-government-projects/funding-government-projects.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/funding-government-projects/funding-government-projects.module.ts
@@ -20,7 +20,7 @@ export class FundingGovernmentProjectsModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: FundingGovernmentProjectsModule,
-      imports: [SharedTemplateAPIModule.register(config), FileStorageModule],
+      imports: [SharedTemplateAPIModule, FileStorageModule],
       providers: [
         {
           provide: FUNDING_GOVERNMENT_PROJECTS_CONFIG,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/general-fishing-license/general-fishing-license.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/general-fishing-license/general-fishing-license.module.ts
index 87fea625a2dda..ddbe0ae40e5d0 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/general-fishing-license/general-fishing-license.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/general-fishing-license/general-fishing-license.module.ts
@@ -8,10 +8,7 @@ export class GeneralFishingLicenseModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: GeneralFishingLicenseModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        FishingLicenseClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, FishingLicenseClientModule],
       providers: [GeneralFishingLicenseService],
       exports: [GeneralFishingLicenseService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/general-petition/general-petition.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/general-petition/general-petition.module.ts
index 54e5c7ab90a7a..5a569c22ab7b5 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/general-petition/general-petition.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/general-petition/general-petition.module.ts
@@ -11,7 +11,7 @@ export class GeneralPetitionModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: GeneralPetitionModule,
-      imports: [SharedTemplateAPIModule.register(config)],
+      imports: [SharedTemplateAPIModule],
       providers: [
         GeneralPetitionService,
         {
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/grindavik-housing-buyout/grindavik-housing-buyout.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/grindavik-housing-buyout/grindavik-housing-buyout.module.ts
index f9b7b44e0aad8..aa3f9cdacda93 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/grindavik-housing-buyout/grindavik-housing-buyout.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/grindavik-housing-buyout/grindavik-housing-buyout.module.ts
@@ -16,7 +16,7 @@ export class GrindavikHousingBuyoutModule {
         SyslumennClientModule,
         NationalRegistryClientModule,
         AssetsClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
       ],
       providers: [GrindavikHousingBuyoutService],
       exports: [GrindavikHousingBuyoutService],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance-declaration/health-insurance-declaration.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance-declaration/health-insurance-declaration.module.ts
index ae7c797d4edab..f4e031209028e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/health-insurance-declaration/health-insurance-declaration.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/health-insurance-declaration/health-insurance-declaration.module.ts
@@ -13,7 +13,7 @@ export class HealthInsuranceDeclarationModule {
       imports: [
         RightsPortalClientModule,
         FileStorageModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
       ],
       providers: [
         HealthInsuranceDeclarationService,
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 a6bdf74fd03ac..b2d39530a0a82 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
@@ -16,10 +16,7 @@ export class HealthInsuranceModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: HealthInsuranceModule,
-      imports: [
-        HealthInsuranceV2ClientModule,
-        SharedTemplateAPIModule.register(config),
-      ],
+      imports: [HealthInsuranceV2ClientModule, SharedTemplateAPIModule],
       providers: [HealthInsuranceService, BucketService],
       exports: [HealthInsuranceService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/healthcare-license-certificate/healthcare-license-certificate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/healthcare-license-certificate/healthcare-license-certificate.module.ts
index 5af77c9c916cd..c9d4669fc742d 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/healthcare-license-certificate/healthcare-license-certificate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/healthcare-license-certificate/healthcare-license-certificate.module.ts
@@ -13,7 +13,7 @@ export class HealthcareLicenseCertificateModule {
     return {
       module: HealthcareLicenseCertificateModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         HealthDirectorateClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/healthcare-work-permit/healthcare-work-permit.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/healthcare-work-permit/healthcare-work-permit.module.ts
index 05c9b1dc99d11..cbbae587f3c3d 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/healthcare-work-permit/healthcare-work-permit.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/healthcare-work-permit/healthcare-work-permit.module.ts
@@ -10,7 +10,7 @@ export class HealthcareWorkPermitModule {
     return {
       module: HealthcareWorkPermitModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         HealthDirectorateClientModule,
         UniversityCareersClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/home-support/home-support.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/home-support/home-support.module.ts
index fe1b9814398d2..d1fa658bf6df4 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/home-support/home-support.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/home-support/home-support.module.ts
@@ -10,10 +10,7 @@ export class HomeSupportModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: HomeSupportModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        ArborgWorkpointModule,
-      ],
+      imports: [SharedTemplateAPIModule, ArborgWorkpointModule],
       providers: [HomeSupportService],
       exports: [HomeSupportService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/id-card/id-card.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/id-card/id-card.module.ts
index 09a487b525239..213bab0cdfead 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/id-card/id-card.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/id-card/id-card.module.ts
@@ -14,7 +14,7 @@ export class IdCardModule {
     return {
       module: IdCardModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ChargeFjsV2ClientModule,
         PassportsClientModule,
         ConfigModule.forRoot({
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/inheritance-report.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/inheritance-report.module.ts
index ce19739f16871..c5f5a1919b9b6 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/inheritance-report.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/inheritance-report/inheritance-report.module.ts
@@ -13,7 +13,7 @@ export class InheritanceReportModule {
     return {
       module: InheritanceReportModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SyslumennClientModule,
         NationalRegistryXRoadModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/institution-collaboration/institution-collaboration.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/institution-collaboration/institution-collaboration.module.ts
index 7b5d4a4e679d1..fc9bb10d4c75d 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/institution-collaboration/institution-collaboration.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/institution-collaboration/institution-collaboration.module.ts
@@ -20,7 +20,7 @@ export class InstitutionCollaborationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: InstitutionCollaborationModule,
-      imports: [SharedTemplateAPIModule.register(config), FileStorageModule],
+      imports: [SharedTemplateAPIModule, FileStorageModule],
       providers: [
         {
           provide: INSTITUTION_COLLABORATION_CONFIG,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/login-service/login-service.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/login-service/login-service.module.ts
index d5a100d0b4d45..fe39393d07132 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/login-service/login-service.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/login-service/login-service.module.ts
@@ -19,7 +19,7 @@ export class LoginServiceModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: LoginServiceModule,
-      imports: [SharedTemplateAPIModule.register(config)],
+      imports: [SharedTemplateAPIModule],
       providers: [
         {
           provide: LOGIN_SERVICE_CONFIG,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/marriage-conditions-submission/marriage-conditions-submission.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/marriage-conditions-submission/marriage-conditions-submission.module.ts
index f592030a3f54c..815c2e04af7a3 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/marriage-conditions-submission/marriage-conditions-submission.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/marriage-conditions-submission/marriage-conditions-submission.module.ts
@@ -11,7 +11,7 @@ export class MarriageConditionsSubmissionModule {
       module: MarriageConditionsSubmissionModule,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         NationalRegistryXRoadModule,
       ],
       providers: [MarriageConditionsSubmissionService],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/mortgage-certificate-submission/mortgage-certificate-submission.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/mortgage-certificate-submission/mortgage-certificate-submission.module.ts
index 19a064aeb3153..2a19fda7e9aed 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/mortgage-certificate-submission/mortgage-certificate-submission.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/mortgage-certificate-submission/mortgage-certificate-submission.module.ts
@@ -10,7 +10,7 @@ export class MortgageCertificateSubmissionModule {
     return {
       module: MortgageCertificateSubmissionModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         MortgageCertificateModule,
         SyslumennClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/new-primary-school/new-primary-school.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/new-primary-school/new-primary-school.module.ts
index ecb5a0ae4f051..fb16a9591cfc1 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/new-primary-school/new-primary-school.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/new-primary-school/new-primary-school.module.ts
@@ -10,7 +10,7 @@ export class NewPrimarySchoolModule {
     return {
       module: NewPrimarySchoolModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         NationalRegistryXRoadModule,
         FriggClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/no-debt-certificate/no-debt-certificate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/no-debt-certificate/no-debt-certificate.module.ts
index 293a9545bd9ce..42e10c1b16099 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/no-debt-certificate/no-debt-certificate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/no-debt-certificate/no-debt-certificate.module.ts
@@ -11,7 +11,7 @@ export class NoDebtCertificateModule {
     return {
       module: NoDebtCertificateModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         FinanceClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/official-journal-of-iceland.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/official-journal-of-iceland.module.ts
index 6c8aa1da456a1..cbfc72f1d639f 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/official-journal-of-iceland.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/official-journal-of-iceland.module.ts
@@ -10,7 +10,7 @@ export class OfficialJournalOfIcelandTemplateModule {
     return {
       module: OfficialJournalOfIcelandTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         OfficialJournalOfIcelandModule,
         OfficialJournalOfIcelandApplicationModule,
       ],
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 4610e3de6d468..25cb317a359b7 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
@@ -13,7 +13,7 @@ export class OperatingLicenseModule {
       module: OperatingLicenseModule,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         CriminalRecordModule,
         FinanceClientModule,
         JudicialAdministrationClientModule,
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 1ec4008ac711b..85eb2d224729f 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
@@ -8,10 +8,7 @@ export class PSignSubmissionModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: PSignSubmissionModule,
-      imports: [
-        SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
-      ],
+      imports: [SyslumennClientModule, SharedTemplateAPIModule],
       providers: [PSignSubmissionService],
       exports: [PSignSubmissionService],
     }
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 2221e0f1950a2..618aeb7d02856 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
@@ -18,7 +18,7 @@ export class ParentalLeaveModule {
       module: ParentalLeaveModule,
       imports: [
         VMSTModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SmsModule,
         ApplicationApiCoreModule,
         NationalRegistryClientModule,
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 e910981952786..5fa626c16ffa0 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
@@ -43,6 +43,8 @@ import { ChildrenService } from './children/children.service'
 import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
 import { PaymentService } from '@island.is/application/api/payment'
 import { sharedModuleConfig } from '../../shared/shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import { AwsService } from '@island.is/nest/aws'
 
 const nationalId = '1234564321'
 let id = 0
@@ -232,11 +234,15 @@ describe('ParentalLeaveService', () => {
           useClass: MockSmsService,
         },
         {
-          provide: BaseTemplateApiApplicationService,
+          provide: sharedModuleConfig.KEY,
           useValue: {},
         },
         {
-          provide: sharedModuleConfig.KEY,
+          provide: ApplicationService,
+          useValue: {},
+        },
+        {
+          provide: AwsService,
           useValue: {},
         },
         SharedTemplateApiService,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/passport/passport.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/passport/passport.module.ts
index 0a20738fb0b33..c3862a0730a38 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/passport/passport.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/passport/passport.module.ts
@@ -8,10 +8,7 @@ export class PassportModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: PassportModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        PassportsClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, PassportsClientModule],
       providers: [PassportService],
       exports: [PassportService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/public-debt-payment-plan/public-debt-payment-plan.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/public-debt-payment-plan/public-debt-payment-plan.module.ts
index b5cd40ba01a8f..e3deab45fd97a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/public-debt-payment-plan/public-debt-payment-plan.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/public-debt-payment-plan/public-debt-payment-plan.module.ts
@@ -17,10 +17,7 @@ export class PublicDebtPaymentPlanTemplateModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: PublicDebtPaymentPlanTemplateModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        PaymentScheduleClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, PaymentScheduleClientModule],
       providers: [PublicDebtPaymentPlanTemplateService, PrerequisitesService],
       exports: [PublicDebtPaymentPlanTemplateService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/reference-template/reference-template.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/reference-template/reference-template.module.ts
index 9afdedb659075..58b15a6396249 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/reference-template/reference-template.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/reference-template/reference-template.module.ts
@@ -14,7 +14,7 @@ export class ReferenceTemplateModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: ReferenceTemplateModule,
-      imports: [SharedTemplateAPIModule.register(config)],
+      imports: [SharedTemplateAPIModule],
       providers: [ReferenceTemplateService],
       exports: [ReferenceTemplateService],
     }
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
index 111c2917eabb9..664d3866a2693 100644
--- 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
@@ -15,10 +15,7 @@ export class ParliamentaryListCreationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: ParliamentaryListCreationModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        SignatureCollectionClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, SignatureCollectionClientModule],
       providers: [ParliamentaryListCreationService],
       exports: [ParliamentaryListCreationService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.module.ts
index b479dbf675cf5..fc2cf4cb5d05e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-creation/signature-list-creation.module.ts
@@ -15,10 +15,7 @@ export class SignatureListCreationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: SignatureListCreationModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        SignatureCollectionClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, SignatureCollectionClientModule],
       providers: [SignatureListCreationService],
       exports: [SignatureListCreationService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.module.ts
index 0c8a0670fa860..8fefb2e5ffe96 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/signature-collection/signature-list-signing/signature-list-signing.module.ts
@@ -15,10 +15,7 @@ export class SignatureListSigningModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: SignatureListSigningModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        SignatureCollectionClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, SignatureCollectionClientModule],
       providers: [SignatureListSigningService],
       exports: [SignatureListSigningService],
     }
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 69e9067c328b4..bb187e3f8cfe7 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
@@ -16,7 +16,7 @@ export class SocialInsuranceAdministrationModule {
       module: SocialInsuranceAdministrationModule,
       imports: [
         SocialInsuranceAdministrationClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ApplicationApiCoreModule,
         NationalRegistryClientModule,
       ],
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/anonymity-in-vehicle-registry/anonymity-in-vehicle-registry.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/anonymity-in-vehicle-registry/anonymity-in-vehicle-registry.module.ts
index 76c5ab5df9c96..17834268669a7 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/anonymity-in-vehicle-registry/anonymity-in-vehicle-registry.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/anonymity-in-vehicle-registry/anonymity-in-vehicle-registry.module.ts
@@ -13,7 +13,7 @@ export class AnonymityInVehicleRegistryModule {
     return {
       module: AnonymityInVehicleRegistryModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         VehicleInfolocksClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-co-owner-of-vehicle/change-co-owner-of-vehicle.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-co-owner-of-vehicle/change-co-owner-of-vehicle.module.ts
index 2ceb6ef4a64af..d6d3642dc33ff 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-co-owner-of-vehicle/change-co-owner-of-vehicle.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-co-owner-of-vehicle/change-co-owner-of-vehicle.module.ts
@@ -37,7 +37,7 @@ export class ChangeCoOwnerOfVehicleModule {
     return {
       module: ChangeCoOwnerOfVehicleModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         VehicleOwnerChangeClientModule,
         VehicleOperatorsClientModule,
         VehicleCodetablesClientModule,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-operator-of-vehicle/change-operator-of-vehicle.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-operator-of-vehicle/change-operator-of-vehicle.module.ts
index a3f5dec70fda5..3a070990028c9 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-operator-of-vehicle/change-operator-of-vehicle.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/change-operator-of-vehicle/change-operator-of-vehicle.module.ts
@@ -37,7 +37,7 @@ export class ChangeOperatorOfVehicleModule {
     return {
       module: ChangeOperatorOfVehicleModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         ChargeFjsV2ClientModule,
         VehicleOperatorsClientModule,
         VehicleOwnerChangeClientModule,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-company-card/digital-tachograph-company-card.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-company-card/digital-tachograph-company-card.module.ts
index 7d2b8f146ac1b..920cd0d893b30 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-company-card/digital-tachograph-company-card.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-company-card/digital-tachograph-company-card.module.ts
@@ -7,7 +7,7 @@ export class DigitalTachographCompanyCardModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DigitalTachographCompanyCardModule,
-      imports: [SharedTemplateAPIModule.register(baseConfig)],
+      imports: [SharedTemplateAPIModule],
       providers: [DigitalTachographCompanyCardService],
       exports: [DigitalTachographCompanyCardService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-drivers-card/digital-tachograph-drivers-card.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-drivers-card/digital-tachograph-drivers-card.module.ts
index 2b6c55de4e496..df4aa95ae8ad5 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-drivers-card/digital-tachograph-drivers-card.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-drivers-card/digital-tachograph-drivers-card.module.ts
@@ -14,7 +14,7 @@ export class DigitalTachographDriversCardModule {
     return {
       module: DigitalTachographDriversCardModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         DigitalTachographDriversCardClientModule,
         DrivingLicenseApiModule,
         ConfigModule.forRoot({
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-workshop-card/digital-tachograph-workshop-card.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-workshop-card/digital-tachograph-workshop-card.module.ts
index 6e50780512868..858b62b448f1b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-workshop-card/digital-tachograph-workshop-card.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/digital-tachograph-workshop-card/digital-tachograph-workshop-card.module.ts
@@ -7,7 +7,7 @@ export class DigitalTachographWorkshopCardModule {
   static register(baseConfig: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DigitalTachographWorkshopCardModule,
-      imports: [SharedTemplateAPIModule.register(baseConfig)],
+      imports: [SharedTemplateAPIModule],
       providers: [DigitalTachographWorkshopCardService],
       exports: [DigitalTachographWorkshopCardService],
     }
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/license-plate-renewal/license-plate-renewal.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/license-plate-renewal/license-plate-renewal.module.ts
index 326dade196a3f..56a891e8f43c0 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/license-plate-renewal/license-plate-renewal.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/license-plate-renewal/license-plate-renewal.module.ts
@@ -13,7 +13,7 @@ export class LicensePlateRenewalModule {
     return {
       module: LicensePlateRenewalModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         VehiclePlateRenewalClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-license-plate/order-vehicle-license-plate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-license-plate/order-vehicle-license-plate.module.ts
index c07931786b7a1..f014ed57ba18e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-license-plate/order-vehicle-license-plate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-license-plate/order-vehicle-license-plate.module.ts
@@ -21,7 +21,7 @@ export class OrderVehicleLicensePlateModule {
     return {
       module: OrderVehicleLicensePlateModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         VehiclePlateOrderingClientModule,
         VehicleCodetablesClientModule,
         VehiclesClientModule,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-registration-certificate/order-vehicle-registration-certificate.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-registration-certificate/order-vehicle-registration-certificate.module.ts
index 317d5f51f5553..5e5d0fa97b533 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-registration-certificate/order-vehicle-registration-certificate.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/order-vehicle-registration-certificate/order-vehicle-registration-certificate.module.ts
@@ -13,7 +13,7 @@ export class OrderVehicleRegistrationCertificateModule {
     return {
       module: OrderVehicleRegistrationCertificateModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         VehiclePrintingClientModule,
         ConfigModule.forRoot({
           isGlobal: true,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/transfer-of-vehicle-ownership/transfer-of-vehicle-ownership.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/transfer-of-vehicle-ownership/transfer-of-vehicle-ownership.module.ts
index d88ede30ee9f5..06628c9c24a8b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/transfer-of-vehicle-ownership/transfer-of-vehicle-ownership.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/transport-authority/transfer-of-vehicle-ownership/transfer-of-vehicle-ownership.module.ts
@@ -33,7 +33,7 @@ export class TransferOfVehicleOwnershipModule {
     return {
       module: TransferOfVehicleOwnershipModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         ChargeFjsV2ClientModule,
         VehicleOwnerChangeClientModule,
         VehicleCodetablesClientModule,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/university/university.module.ts b/libs/application/template-api-modules/src/lib/modules/templates/university/university.module.ts
index e519707eaf259..5f64d73cf26b9 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/university/university.module.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/university/university.module.ts
@@ -15,7 +15,7 @@ export class UniversityModule {
     return {
       module: UniversityModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         NationalRegistryClientModule,
         InnaClientModule,
         UniversityGatewayApiClientModule,