diff --git a/package.json b/package.json
index ad25ca2165..54d60b060e 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
     "@angular/platform-browser-dynamic": "~17.2.2",
     "@angular/router": "~17.2.2",
     "@capacitor-community/file-opener": "^6.0.0",
-    "@capacitor-firebase/authentication": "^6.1.0",
-    "@capacitor-firebase/crashlytics": "^6.1.0",
-    "@capacitor-firebase/performance": "^6.1.0",
+    "@capacitor-firebase/authentication": "^6.3.1",
+    "@capacitor-firebase/crashlytics": "^6.3.1",
+    "@capacitor-firebase/performance": "^6.3.1",
     "@capacitor/android": "^6.0.0",
     "@capacitor/app": "^6.0.0",
     "@capacitor/clipboard": "^6.0.0",
diff --git a/packages/data-models/appConfig.ts b/packages/data-models/appConfig.ts
index ff0f282dfb..a1996869f3 100644
--- a/packages/data-models/appConfig.ts
+++ b/packages/data-models/appConfig.ts
@@ -159,10 +159,11 @@ const APP_SIDEMENU_DEFAULTS = {
   should_show_deployment_name: false,
 };
 
-const APP_AUTHENTICATION_DEFAULTS = {
-  enforceLogin: false,
-  signInTemplate: "sign_in",
-};
+/**
+ * @deprecated 0.18.0
+ * Use `deployment.auth` to configure auth
+ */
+const APP_AUTHENTICATION_DEFAULTS = {};
 
 type IAppLaunchAction = {
   type: "template_popup" | "tour_start";
diff --git a/packages/data-models/deployment.model.ts b/packages/data-models/deployment.model.ts
index f884873b8b..776b3771ee 100644
--- a/packages/data-models/deployment.model.ts
+++ b/packages/data-models/deployment.model.ts
@@ -3,7 +3,7 @@ import type { IGdriveEntry } from "../@idemsInternational/gdrive-tools";
 import type { IAppConfig, IAppConfigOverride } from "./appConfig";
 
 /** Update version to force recompile next time deployment set (e.g. after default config update) */
-export const DEPLOYMENT_CONFIG_VERSION = 20241111.0;
+export const DEPLOYMENT_CONFIG_VERSION = 20241215.1;
 
 /** Configuration settings available to runtime application */
 export interface IDeploymentRuntimeConfig {
@@ -36,6 +36,13 @@ export interface IDeploymentRuntimeConfig {
     /** sentry/glitchtip logging dsn */
     dsn: string;
   };
+  /** Enable auth actions by specifying auth provider */
+  auth: {
+    /** provider to use with authentication actions. actions will be disabled if no provider specified */
+    provider?: "firebase" | "supabase";
+    /** prevent user accessing app pages without being logged in. Specified template will be shown until logged in */
+    enforceLoginTemplate?: string;
+  };
   /**
    * Specify if using firebase for auth and crashlytics.
    * Requires firebase config available through encrypted config */
@@ -51,10 +58,6 @@ export interface IDeploymentRuntimeConfig {
       appId: string;
       measurementId: string;
     };
-    auth: {
-      /** Enables `auth` actions to allow user sign-in/out */
-      enabled: boolean;
-    };
     crashlytics: {
       /** Enables app crash reports to firebase crashlytics */
       enabled: boolean;
@@ -200,9 +203,9 @@ export const DEPLOYMENT_RUNTIME_CONFIG_DEFAULTS: IDeploymentRuntimeConfig = {
     endpoint: "https://apps-server.idems.international/analytics",
   },
   app_config: {},
+  auth: {},
   firebase: {
     config: null,
-    auth: { enabled: false },
     crashlytics: { enabled: true },
   },
   supabase: {
diff --git a/packages/scripts/src/tasks/providers/appData.ts b/packages/scripts/src/tasks/providers/appData.ts
index 94e9277c1c..3e4ba0b09c 100644
--- a/packages/scripts/src/tasks/providers/appData.ts
+++ b/packages/scripts/src/tasks/providers/appData.ts
@@ -68,7 +68,7 @@ const copyDeploymentDataToApp = async () => {
 const optimiseBuild = async () => new AppDataOptimiser(WorkflowRunner.config).run();
 
 function generateRuntimeConfig(deploymentConfig: IDeploymentConfigJson): IDeploymentRuntimeConfig {
-  const { analytics, api, app_config, error_logging, firebase, git, name, supabase, web } =
+  const { analytics, api, app_config, auth, error_logging, firebase, git, name, supabase, web } =
     deploymentConfig;
 
   return {
@@ -77,6 +77,7 @@ function generateRuntimeConfig(deploymentConfig: IDeploymentConfigJson): IDeploy
     analytics,
     api,
     app_config,
+    auth,
     error_logging,
     firebase,
     name,
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index aa5e801801..2341d75e02 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -110,7 +110,6 @@ export class AppComponent {
     public templateTranslateService: TemplateTranslateService,
     private crashlyticsService: CrashlyticsService,
     private appDataService: AppDataService,
-    private authService: AuthService,
     private seoService: SeoService,
     private taskService: TaskService,
     private feedbackService: FeedbackService,
@@ -135,7 +134,6 @@ export class AppComponent {
       this.hackSetDeveloperOptions();
       const isDeveloperMode = this.templateFieldService.getField("user_mode") === false;
       const user = this.userMetaService.userMeta;
-      await this.loadAuthConfig();
 
       if (!user.first_app_open) {
         await this.userMetaService.setUserMeta({ first_app_open: new Date().toISOString() });
@@ -174,29 +172,6 @@ export class AppComponent {
     }
   }
 
-  /**
-   * Authentication requires verified domain and app ids populated to firebase console
-   * Currently only run on native where specified (but can comment out for testing locally)
-   */
-  private async loadAuthConfig() {
-    const { firebase } = this.deploymentService.config;
-    const { enforceLogin, signInTemplate } =
-      this.appConfigService.appConfig().APP_AUTHENTICATION_DEFAULTS;
-    const ensureLogin = firebase.config && enforceLogin && Capacitor.isNativePlatform();
-    if (ensureLogin) {
-      this.authService.ready();
-      const authUser = await this.authService.getCurrentUser();
-      if (!authUser) {
-        const { modal } = await this.templateService.runStandaloneTemplate(signInTemplate, {
-          showCloseButton: false,
-          waitForDismiss: false,
-        });
-        await this.authService.waitForSignInComplete();
-        await modal.dismiss();
-      }
-    }
-  }
-
   /**
    * Various services set core app data which may be used in templates such as current app day,
    * user id etc. Make sure these services have run their initialisation logic before proceeding.
@@ -241,7 +216,6 @@ export class AppComponent {
         this.templateService,
         this.templateProcessService,
         this.appDataService,
-        this.authService,
         this.serverService,
         this.seoService,
         this.feedbackService,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 591b129364..aedaf10727 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -38,16 +38,16 @@ export function lottiePlayerFactory() {
     BrowserAnimationsModule,
     IonicModule.forRoot(),
     AppRoutingModule,
+    TemplateComponentsModule,
+    DeploymentFeaturesModule,
     HttpClientModule,
     SharedModule,
     FormsModule,
     LottieModule.forRoot({ player: lottiePlayerFactory }),
     // NOTE CC 2021-11-04 not sure if cache causes issues or not https://github.com/ngx-lottie/ngx-lottie/issues/115
     // LottieCacheModule.forRoot(),
-    TemplateComponentsModule,
     TourModule,
     ContextMenuModule,
-    DeploymentFeaturesModule,
   ],
   providers: [
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
diff --git a/src/app/deployment-features.module.ts b/src/app/deployment-features.module.ts
index e5c44bfdb8..8c12edc419 100644
--- a/src/app/deployment-features.module.ts
+++ b/src/app/deployment-features.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 
 import { AnalyticsModule } from "./shared/services/analytics";
 import { NavStackModule } from "./feature/nav-stack/nav-stack.module";
+import { AuthModule } from "./shared/services/auth/auth.module";
 
 /**
  * Module imports required for specific deployment features
@@ -14,5 +15,5 @@ import { NavStackModule } from "./feature/nav-stack/nav-stack.module";
  *
  * This is a feature marked for future implementation
  */
-@NgModule({ imports: [AnalyticsModule, NavStackModule] })
+@NgModule({ imports: [AuthModule, AnalyticsModule, NavStackModule] })
 export class DeploymentFeaturesModule {}
diff --git a/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.html b/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.html
index 397245aca7..6c6084e384 100644
--- a/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.html
+++ b/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.html
@@ -8,7 +8,7 @@
         <div
           class="container-radio"
           [class.checked-radio]="form.get('answer').value === radio.name"
-          *ngFor="let radio of valuesFromListAnswers"
+          *ngFor="let radio of answerOptions()"
         >
           <label>
             <input
diff --git a/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.ts b/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.ts
index ba1158cb2f..16b68c1bf3 100644
--- a/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.ts
+++ b/src/app/shared/components/template/components/combo-box/combo-box-modal/combo-box-modal.component.ts
@@ -1,7 +1,6 @@
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, input, Input, OnInit } from "@angular/core";
 import { FlowTypes } from "src/app/shared/model";
 import {
-  getAnswerListParamFromTemplateRow,
   getBooleanParamFromTemplateRow,
   getNumberParamFromTemplateRow,
   getStringParamFromTemplateRow,
@@ -16,8 +15,8 @@ import { ModalController } from "@ionic/angular";
   styleUrls: ["./combo-box-modal.component.scss"],
 })
 export class ComboBoxModalComponent implements OnInit {
+  public answerOptions = input.required<IAnswerListItem[]>();
   @Input() row: FlowTypes.TemplateRow;
-  @Input() template: FlowTypes.Template;
   @Input() selectedValue: string;
   @Input() customAnswerSelected: boolean;
   @Input() style: string;
@@ -29,7 +28,10 @@ export class ComboBoxModalComponent implements OnInit {
   inputPosition: boolean = false;
   maxLength: number = 30;
   placeholder: string = "";
-  constructor(private fb: FormBuilder, private modalController: ModalController) {}
+  constructor(
+    private fb: FormBuilder,
+    private modalController: ModalController
+  ) {}
 
   ngOnInit() {
     this.getParams();
@@ -37,7 +39,6 @@ export class ComboBoxModalComponent implements OnInit {
   }
 
   getParams() {
-    this.valuesFromListAnswers = getAnswerListParamFromTemplateRow(this.row, "answer_list", null);
     this.textTitle = getStringParamFromTemplateRow(this.row, "text", null);
     this.inputAllowed = getBooleanParamFromTemplateRow(this.row, "input_allowed", false);
     this.inputPosition =
diff --git a/src/app/shared/components/template/components/combo-box/combo-box.component.ts b/src/app/shared/components/template/components/combo-box/combo-box.component.ts
index daec4a1de7..ea8a239826 100644
--- a/src/app/shared/components/template/components/combo-box/combo-box.component.ts
+++ b/src/app/shared/components/template/components/combo-box/combo-box.component.ts
@@ -1,5 +1,4 @@
-import { Component, Input, OnDestroy, OnInit } from "@angular/core";
-import { FlowTypes } from "../../../../model";
+import { Component, computed, OnDestroy, OnInit } from "@angular/core";
 import { ModalController } from "@ionic/angular";
 import { ComboBoxModalComponent } from "./combo-box-modal/combo-box-modal.component";
 import {
@@ -10,8 +9,9 @@ import {
 } from "src/app/shared/utils";
 import { TemplateBaseComponent } from "../base";
 import { ITemplateRowProps } from "../../models";
-import { TemplateService } from "../../services/template.service";
-import { ReplaySubject } from "rxjs";
+import { ReplaySubject, map, filter, switchMap } from "rxjs";
+import { DataItemsService } from "../data-items/data-items.service";
+import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 
 @Component({
   selector: "plh-combo-box",
@@ -22,19 +22,34 @@ export class TmplComboBoxComponent
   extends TemplateBaseComponent
   implements ITemplateRowProps, OnInit, OnDestroy
 {
-  @Input() template: FlowTypes.Template;
-  placeholder: string;
-  prioritisePlaceholder: boolean;
-  style: string;
-  text = "";
-  customAnswerSelected: boolean = false;
-  customAnswerText: string;
-  answerList: IAnswerListItem[];
+  public placeholder: string;
+  public prioritisePlaceholder: boolean;
+  private style: string;
+  public text = "";
+  private customAnswerSelected: boolean = false;
+  private customAnswerText: string;
   private componentDestroyed$ = new ReplaySubject(1);
 
+  // HACK - allow combo_box to include data_items child row to define answer list
+  private dataItemRows = toSignal(
+    toObservable(this.rows).pipe(
+      map((rows) => rows.find((r) => r.type === "data_items")),
+      filter((row) => row !== undefined),
+      switchMap((row) => this.dataItemsService.getItemsObservable(row, this.parent.templateRowMap))
+    )
+  );
+
+  private answerOptions = computed(() => {
+    const dataItemRows = this.dataItemRows();
+    if (dataItemRows !== undefined) {
+      return (dataItemRows as IAnswerListItem[]) || [];
+    }
+    return getAnswerListParamFromTemplateRow(this.rowSignal(), "answer_list", []);
+  });
+
   constructor(
     private modalController: ModalController,
-    private templateService: TemplateService
+    private dataItemsService: DataItemsService
   ) {
     super();
   }
@@ -43,15 +58,16 @@ export class TmplComboBoxComponent
     this.getParams();
 
     this.customAnswerSelected =
-      this.answerList.length > 0 && this._row.value
-        ? !this.answerList.find((x) => x.name === this._row.value)
+      this.answerOptions().length > 0 && this._row.value
+        ? !this.answerOptions().find((x) => x.name === this._row.value)
         : false;
 
     this.text = "";
     if (this._row.value) {
       this.text = this.customAnswerSelected
         ? this.customAnswerText
-        : this.answerList.find((answerListItem) => answerListItem.name === this._row.value)?.text;
+        : this.answerOptions().find((answerListItem) => answerListItem.name === this._row.value)
+            ?.text;
     }
   }
 
@@ -63,7 +79,6 @@ export class TmplComboBoxComponent
       false
     );
     this.style = getStringParamFromTemplateRow(this._row, "style", "");
-    this.answerList = getAnswerListParamFromTemplateRow(this._row, "answer_list", []);
   }
 
   async openModal() {
@@ -71,8 +86,8 @@ export class TmplComboBoxComponent
       component: ComboBoxModalComponent,
       cssClass: "combo-box-modal",
       componentProps: {
+        answerOptions: this.answerOptions,
         row: this._row,
-        template: this.template,
         selectedValue: this.customAnswerSelected ? this.text : this._row.value,
         customAnswerSelected: this.customAnswerSelected,
         style: this.style,
diff --git a/src/app/shared/components/template/components/data-items/data-items.service.ts b/src/app/shared/components/template/components/data-items/data-items.service.ts
index 7fc03406ca..8307d852cf 100644
--- a/src/app/shared/components/template/components/data-items/data-items.service.ts
+++ b/src/app/shared/components/template/components/data-items/data-items.service.ts
@@ -45,6 +45,11 @@ export class DataItemsService {
                   const parsedItemList = await this.hackParseDataList(data);
                   const itemProcessor = new ItemProcessor(parsedItemList, parameter_list);
                   const { itemTemplateRows, itemData } = itemProcessor.process(rows);
+                  // if no child rows for data_items loop assume want back raw items
+                  if (rows.length === 0) {
+                    return itemData;
+                  }
+                  // otherwise process generated template rows
                   const itemRowsWithMeta = updateItemMeta(itemTemplateRows, itemData, dataListName);
                   const parsedItemRows = await this.hackProcessRows(
                     itemRowsWithMeta,
diff --git a/src/app/shared/components/template/components/layout/popup/popup.component.html b/src/app/shared/components/template/components/layout/popup/popup.component.html
index 35b028640b..1b46e0a87e 100644
--- a/src/app/shared/components/template/components/layout/popup/popup.component.html
+++ b/src/app/shared/components/template/components/layout/popup/popup.component.html
@@ -2,6 +2,7 @@
   class="popup-backdrop"
   (click)="dismissOnBackdrop($event)"
   [attr.data-fullscreen]="props.fullscreen ? true : null"
+  [dir]="templateTranslateService.languageDirection()"
   [attr.data-variant]="props.variant ? props.variant : null"
 >
   <div class="popup-container">
diff --git a/src/app/shared/components/template/components/layout/popup/popup.component.ts b/src/app/shared/components/template/components/layout/popup/popup.component.ts
index aba38cab27..ef6a5ae5b7 100644
--- a/src/app/shared/components/template/components/layout/popup/popup.component.ts
+++ b/src/app/shared/components/template/components/layout/popup/popup.component.ts
@@ -2,6 +2,7 @@ import { Component, Input } from "@angular/core";
 import { ModalController } from "@ionic/angular";
 import { FlowTypes } from "../../../models";
 import { TemplateContainerComponent } from "../../../template-container.component";
+import { TemplateTranslateService } from "../../../services/template-translate.service";
 
 @Component({
   templateUrl: "./popup.component.html",
@@ -14,7 +15,12 @@ import { TemplateContainerComponent } from "../../../template-container.componen
 export class TemplatePopupComponent {
   @Input() props: ITemplatePopupComponentProps;
 
-  constructor(private modalCtrl: ModalController) {}
+  constructor(
+    private modalCtrl: ModalController,
+    // HACK: Since pop-ups can be launched outside of main app container (e.g. as part of launch actions),
+    // handle RTL language support directly in this component
+    public templateTranslateService: TemplateTranslateService
+  ) {}
 
   /**
    * When templates emit completed/uncompleted value from standalone popup close the popup
diff --git a/src/app/shared/components/template/services/instance/template-action.service.ts b/src/app/shared/components/template/services/instance/template-action.service.ts
index 7f8b8231d5..7e7b40f338 100644
--- a/src/app/shared/components/template/services/instance/template-action.service.ts
+++ b/src/app/shared/components/template/services/instance/template-action.service.ts
@@ -12,7 +12,6 @@ import { TemplateService } from "../template.service";
 import { TemplateTranslateService } from "../template-translate.service";
 import { EventService } from "src/app/shared/services/event/event.service";
 import { DBSyncService } from "src/app/shared/services/db/db-sync.service";
-import { AuthService } from "src/app/shared/services/auth/auth.service";
 import { SkinService } from "src/app/shared/services/skin/skin.service";
 import { ThemeService } from "src/app/feature/theme/services/theme.service";
 import { getGlobalService } from "src/app/shared/services/global.service";
@@ -65,9 +64,6 @@ export class TemplateActionService extends SyncServiceBase {
   private get dbSyncService() {
     return getGlobalService(this.injector, DBSyncService);
   }
-  private get authService() {
-    return getGlobalService(this.injector, AuthService);
-  }
   private get skinService() {
     return getGlobalService(this.injector, SkinService);
   }
@@ -93,7 +89,6 @@ export class TemplateActionService extends SyncServiceBase {
       this.analyticsService,
       this.templateService,
       this.eventService,
-      this.authService,
       this.skinService,
     ]);
   }
diff --git a/src/app/shared/services/auth/auth.module.ts b/src/app/shared/services/auth/auth.module.ts
new file mode 100644
index 0000000000..d81ad098ee
--- /dev/null
+++ b/src/app/shared/services/auth/auth.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from "@angular/core";
+
+import { AuthService } from "./auth.service";
+
+@NgModule({
+  imports: [],
+  exports: [],
+  providers: [],
+})
+export class AuthModule {
+  constructor(private service: AuthService) {
+    // include service to initialise and register handlers
+    service.ready();
+  }
+}
diff --git a/src/app/shared/services/auth/auth.service.ts b/src/app/shared/services/auth/auth.service.ts
index affb1e16f9..e76d98c529 100644
--- a/src/app/shared/services/auth/auth.service.ts
+++ b/src/app/shared/services/auth/auth.service.ts
@@ -1,53 +1,70 @@
-import { Injectable } from "@angular/core";
-import { FirebaseAuthentication, User } from "@capacitor-firebase/authentication";
-import { BehaviorSubject, firstValueFrom } from "rxjs";
-import { filter } from "rxjs/operators";
-import { SyncServiceBase } from "../syncService.base";
+import { effect, Injectable, Injector, signal } from "@angular/core";
 import { TemplateActionRegistry } from "../../components/template/services/instance/template-action.registry";
-import { FirebaseService } from "../firebase/firebase.service";
 import { LocalStorageService } from "../local-storage/local-storage.service";
 import { DeploymentService } from "../deployment/deployment.service";
+import { AuthProviderBase } from "./providers/base.auth";
+import { AsyncServiceBase } from "../asyncService.base";
+import { getAuthProvider } from "./providers";
+import { IAuthUser } from "./types";
+import { filter, firstValueFrom, tap } from "rxjs";
+import { TemplateService } from "../../components/template/services/template.service";
+import { toObservable } from "@angular/core/rxjs-interop";
 
 @Injectable({
   providedIn: "root",
 })
-export class AuthService extends SyncServiceBase {
-  private authUser$ = new BehaviorSubject<User | null>(null);
+export class AuthService extends AsyncServiceBase {
+  /** Auth provider used */
+  private provider: AuthProviderBase;
 
-  // include auth import to ensure app registered
   constructor(
     private templateActionRegistry: TemplateActionRegistry,
-    private firebaseService: FirebaseService,
     private localStorageService: LocalStorageService,
-    private deploymentService: DeploymentService
+    private deploymentService: DeploymentService,
+    private injector: Injector,
+    private templateService: TemplateService
   ) {
     super("Auth");
-    this.initialise();
-  }
-  private initialise() {
-    const { firebase } = this.deploymentService.config;
-    if (firebase?.auth?.enabled && this.firebaseService.app) {
-      this.addAuthListeners();
-      this.registerTemplateActionHandlers();
-    }
-  }
-
-  /** Return a promise that resolves after a signed in user defined */
-  public async waitForSignInComplete() {
-    return firstValueFrom(this.authUser$.pipe(filter((value?: User | null) => !!value)));
+    this.provider = getAuthProvider(this.config.provider);
+    this.registerInitFunction(this.initialise);
+    effect(async () => {
+      const authUser = this.provider.authUser();
+      this.addStorageEntry(authUser);
+    });
   }
 
-  public async signInWithGoogle() {
-    return FirebaseAuthentication.signInWithGoogle();
+  private get config() {
+    return this.deploymentService.config.auth || {};
   }
 
-  public async signOut() {
-    return FirebaseAuthentication.signOut();
+  private async initialise() {
+    await this.provider.initialise(this.injector);
+    this.registerTemplateActionHandlers();
+    if (this.config.enforceLoginTemplate) {
+      // NOTE - Do not await the enforce login to allow other services to initialise in background
+      this.enforceLogin(this.config.enforceLoginTemplate);
+    }
   }
 
-  public async getCurrentUser() {
-    const { user } = await FirebaseAuthentication.getCurrentUser();
-    return user;
+  private async enforceLogin(templateName: string) {
+    // If user already logged in simply return. If providers auto-login during then waiting to verify
+    // should be included during the provide init method
+    if (this.provider.authUser()) {
+      return;
+    }
+    const { modal } = await this.templateService.runStandaloneTemplate(templateName, {
+      showCloseButton: false,
+      waitForDismiss: false,
+    });
+    // wait for user signal to update with a signed in user before dismissing modal
+    const authUser$ = toObservable(this.provider.authUser, { injector: this.injector });
+    await firstValueFrom(
+      authUser$.pipe(
+        tap((authUser) => console.log("auth user", authUser)),
+        filter((value: IAuthUser | null) => !!value)
+      )
+    );
+    await modal.dismiss();
   }
 
   private registerTemplateActionHandlers() {
@@ -55,8 +72,8 @@ export class AuthService extends SyncServiceBase {
       auth: async ({ args }) => {
         const [actionId] = args;
         const childActions = {
-          sign_in_google: async () => await this.signInWithGoogle(),
-          sign_out: async () => await this.signOut(),
+          sign_in_google: async () => await this.provider.signInWithGoogle(),
+          sign_out: async () => await this.provider.signOut(),
         };
         if (!(actionId in childActions)) {
           console.error(`[AUTH] - No action, "${actionId}"`);
@@ -69,22 +86,13 @@ export class AuthService extends SyncServiceBase {
        * Use `auth: sign_in_google` instead
        * */
       google_auth: async () => {
-        return await this.signInWithGoogle();
+        return await this.provider.signInWithGoogle();
       },
     });
   }
 
-  /** Listen to auth state changes and update local subject accordingly */
-  private addAuthListeners() {
-    FirebaseAuthentication.addListener("authStateChange", ({ user }) => {
-      // console.log("[User] updated", user);
-      this.addStorageEntry(user);
-      this.authUser$.next(user);
-    });
-  }
-
   /** Keep a subset of auth user info in contact fields for db lookup*/
-  private addStorageEntry(user?: User) {
+  private addStorageEntry(user?: IAuthUser) {
     if (user) {
       const { uid } = user;
       this.localStorageService.setProtected("APP_AUTH_USER", JSON.stringify({ uid }));
diff --git a/src/app/shared/services/auth/providers/base.auth.ts b/src/app/shared/services/auth/providers/base.auth.ts
new file mode 100644
index 0000000000..2eea05c2d7
--- /dev/null
+++ b/src/app/shared/services/auth/providers/base.auth.ts
@@ -0,0 +1,18 @@
+import { Injector, signal } from "@angular/core";
+import { IAuthUser } from "../types";
+
+export class AuthProviderBase {
+  public authUser = signal<IAuthUser | null>(null);
+
+  public async initialise(injector: Injector) {}
+
+  public async signInWithGoogle() {
+    throw new Error("Google sign in not enabled");
+    return this.authUser();
+  }
+
+  public async signOut() {
+    this.authUser.set(undefined);
+    return this.authUser();
+  }
+}
diff --git a/src/app/shared/services/auth/providers/firebase.auth.ts b/src/app/shared/services/auth/providers/firebase.auth.ts
new file mode 100644
index 0000000000..6001373357
--- /dev/null
+++ b/src/app/shared/services/auth/providers/firebase.auth.ts
@@ -0,0 +1,46 @@
+import { Injectable, Injector } from "@angular/core";
+import { FirebaseAuthentication } from "@capacitor-firebase/authentication";
+import { getAuth } from "firebase/auth";
+import { FirebaseService } from "../../firebase/firebase.service";
+import { AuthProviderBase } from "./base.auth";
+
+@Injectable({
+  providedIn: "root",
+})
+export class FirebaseAuthProvider extends AuthProviderBase {
+  public override async initialise(injector: Injector) {
+    const firebaseService = injector.get(FirebaseService);
+    // TODO - is service required here?
+    if (!firebaseService.app) {
+      throw new Error("[Firebase Auth] app not configured");
+    }
+    this.addAuthListeners();
+    // use firebase authStateReady to ensure any previously logged in user is available
+    await getAuth().authStateReady();
+  }
+
+  public async signInWithGoogle() {
+    await FirebaseAuthentication.signInWithGoogle();
+    return this.authUser();
+  }
+
+  public async signOut() {
+    await FirebaseAuthentication.signOut();
+    return this.authUser();
+  }
+
+  public async getCurrentUser() {
+    const { user } = await FirebaseAuthentication.getCurrentUser();
+    return user;
+  }
+
+  /**
+   * Listen to auth state changes and update authUser signal
+   * This helps to ensure the signal is kept in sync with automated user sign-in/out
+   * */
+  private addAuthListeners() {
+    FirebaseAuthentication.addListener("authStateChange", ({ user }) => {
+      this.authUser.set(user);
+    });
+  }
+}
diff --git a/src/app/shared/services/auth/providers/index.ts b/src/app/shared/services/auth/providers/index.ts
new file mode 100644
index 0000000000..9fe03efa66
--- /dev/null
+++ b/src/app/shared/services/auth/providers/index.ts
@@ -0,0 +1,17 @@
+import { IAuthProvider } from "../types";
+import { AuthProviderBase } from "./base.auth";
+import { FirebaseAuthProvider } from "./firebase.auth";
+import { SupabaseAuthProvider } from "./supabase.auth";
+
+// TODO - optimise for production (only include provider used)
+export const getAuthProvider = (name: IAuthProvider): AuthProviderBase => {
+  switch (name) {
+    case "firebase":
+      return new FirebaseAuthProvider();
+    case "supabase":
+      return new SupabaseAuthProvider();
+    default:
+      console.warn("[Auth Provider] not configured for: ", name);
+      return new AuthProviderBase();
+  }
+};
diff --git a/src/app/shared/services/auth/providers/supabase.auth.ts b/src/app/shared/services/auth/providers/supabase.auth.ts
new file mode 100644
index 0000000000..cfedac6236
--- /dev/null
+++ b/src/app/shared/services/auth/providers/supabase.auth.ts
@@ -0,0 +1,3 @@
+import { AuthProviderBase } from "./base.auth";
+
+export class SupabaseAuthProvider extends AuthProviderBase {}
diff --git a/src/app/shared/services/auth/types.ts b/src/app/shared/services/auth/types.ts
new file mode 100644
index 0000000000..e65c35f5da
--- /dev/null
+++ b/src/app/shared/services/auth/types.ts
@@ -0,0 +1,7 @@
+import type { IDeploymentConfig } from "packages/data-models";
+
+export type IAuthProvider = IDeploymentConfig["auth"]["provider"];
+
+export interface IAuthUser {
+  uid: string;
+}
diff --git a/src/app/shared/utils/utils.ts b/src/app/shared/utils/utils.ts
index 2b2c9daf1c..cf854f96c0 100644
--- a/src/app/shared/utils/utils.ts
+++ b/src/app/shared/utils/utils.ts
@@ -223,7 +223,6 @@ export function getAnswerListParamFromTemplateRow(
   _default: IAnswerListItem[]
 ): IAnswerListItem[] {
   const params = row.parameter_list || {};
-  console.log(params[name]);
   return params.hasOwnProperty(name) ? parseAnswerList(params[name]) : _default;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 9df397df48..08bb91ed08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2048,41 +2048,41 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@capacitor-firebase/authentication@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@capacitor-firebase/authentication@npm:6.1.0"
+"@capacitor-firebase/authentication@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@capacitor-firebase/authentication@npm:6.3.1"
   peerDependencies:
     "@capacitor/core": ^6.0.0
-    firebase: ^10.9.0
+    firebase: ^10.9.0 || ^11.0.0
   peerDependenciesMeta:
     firebase:
       optional: true
-  checksum: c70c82576c46333d8d56c03dbe51ceab798cddd7974dbc2aa0f6e287059deea245d17be6343302096a09bd91d8e13b0bf8d6e8417b65ecb86e62573674492df0
+  checksum: 148200081ff5100e992205a19d9940e155c32e92a428405eb490e04b009f56ac364fc1c606e0ce1c6aec35003701fbff0022dd6a3057ecb3a8fbe16cacaf4bb6
   languageName: node
   linkType: hard
 
-"@capacitor-firebase/crashlytics@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@capacitor-firebase/crashlytics@npm:6.1.0"
+"@capacitor-firebase/crashlytics@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@capacitor-firebase/crashlytics@npm:6.3.1"
   peerDependencies:
     "@capacitor/core": ^6.0.0
   peerDependenciesMeta:
     firebase:
       optional: true
-  checksum: 9d20b204545e7bb6fed9b858270342634bd8772c84b516ba467d1a6b13a870edcdc1048def10c50f2edebd7fd0c896a2f7728176594cda670d807ed0b5e0f045
+  checksum: b52dc7a42d2f961aa47b30b8918038fa9ae370308240e52f3b78f2d125b3318a7eed34aa845aa98470daf826878b62c8233d8dac47e33d6fcb7c89ea59201914
   languageName: node
   linkType: hard
 
-"@capacitor-firebase/performance@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@capacitor-firebase/performance@npm:6.1.0"
+"@capacitor-firebase/performance@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@capacitor-firebase/performance@npm:6.3.1"
   peerDependencies:
     "@capacitor/core": ^6.0.0
-    firebase: ^10.9.0
+    firebase: ^10.9.0 || ^11.0.0
   peerDependenciesMeta:
     firebase:
       optional: true
-  checksum: 8aa094e6cece67ed8101cc0d78b2c9a0f3aa9f027de765095963ad95604be4bda70155573a8b8ef190ae571c878ae3fe3f63c688a56268f79840faddd16acaac
+  checksum: 25b4da6e44db02520bfa9f0d89b1428c0efa275e1a270f9b567513e469e9f2ce8157c1c9ba70d8c83b21b462aaecadea1dec807f84ec036cb59be66963284a63
   languageName: node
   linkType: hard
 
@@ -15107,9 +15107,9 @@ __metadata:
     "@angular/platform-browser-dynamic": ~17.2.2
     "@angular/router": ~17.2.2
     "@capacitor-community/file-opener": ^6.0.0
-    "@capacitor-firebase/authentication": ^6.1.0
-    "@capacitor-firebase/crashlytics": ^6.1.0
-    "@capacitor-firebase/performance": ^6.1.0
+    "@capacitor-firebase/authentication": ^6.3.1
+    "@capacitor-firebase/crashlytics": ^6.3.1
+    "@capacitor-firebase/performance": ^6.3.1
     "@capacitor/android": ^6.0.0
     "@capacitor/app": ^6.0.0
     "@capacitor/cli": ^6.0.0