diff --git a/app/core/src/main/resources/application-saas.properties b/app/core/src/main/resources/application-saas.properties
deleted file mode 100644
index af7f1a9c2..000000000
--- a/app/core/src/main/resources/application-saas.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-multipart.enabled=true
-logging.level.org.springframework=WARN
-logging.level.org.hibernate=WARN
-logging.level.org.eclipse.jetty=WARN
-#logging.level.org.springframework.security.saml2=TRACE
-#logging.level.org.springframework.security=DEBUG
-#logging.level.org.opensaml=DEBUG
-#logging.level.stirling.software.SPDF.config.security: DEBUG
-logging.level.com.zaxxer.hikari=WARN
-spring.jpa.open-in-view=false
-server.forward-headers-strategy=NATIVE
-server.error.path=/error
-server.error.whitelabel.enabled=false
-server.error.include-stacktrace=always
-server.error.include-exception=true
-server.error.include-message=always
-#logging.level.org.springframework.web=DEBUG
-#logging.level.org.springframework=DEBUG
-#logging.level.org.springframework.security=DEBUG
-
-spring.servlet.multipart.max-file-size=2000MB
-spring.servlet.multipart.max-request-size=2000MB
-server.servlet.session.tracking-modes=cookie
-server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
-spring.devtools.restart.enabled=true
-spring.devtools.livereload.enabled=true
-spring.devtools.restart.exclude=stirling.software.proprietary.security/**
-spring.thymeleaf.encoding=UTF-8
-spring.web.resources.mime-mappings.webmanifest=application/manifest+json
-spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
-
-#spring.datasource.url=jdbc:postgresql://aws-0-us-east-2.pooler.supabase.com:5432/postgres?sslmode=require&user=postgres.nrlkjfznsavsbmweiyqu&password=${SAAS_DB_PASSWORD}
-#spring.datasource.driver-class-name=org.postgresql.Driver
-#spring.datasource.username=postgres.nrlkjfznsavsbmweiyqu
-#spring.datasource.password=${SAAS_DB_PASSWORD}
-spring.h2.console.enabled=false
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-server.servlet.session.timeout:30m
-# Change the default URL path for OpenAPI JSON
-springdoc.api-docs.path=/v1/api-docs
-# Set the URL of the OpenAPI JSON for the Swagger UI
-springdoc.swagger-ui.url=/v1/api-docs
-springdoc.swagger-ui.path=/index.html
-posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
-posthog.host=https://eu.i.posthog.com
-
-spring.main.allow-bean-definition-overriding=true
-
-# Set up a consistent temporary directory location
-java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf}
diff --git a/app/core/src/main/resources/application-saas.yml b/app/core/src/main/resources/application-saas.yml
new file mode 100644
index 000000000..f5c2d54a4
--- /dev/null
+++ b/app/core/src/main/resources/application-saas.yml
@@ -0,0 +1,72 @@
+spring:
+  main.allow-bean-definition-overriding: true
+  web.resources.mime-mappings.webmanifest: application/manifest+json
+  mvc.async.request-timeout: ${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
+  thymeleaf.encoding: UTF-8
+  jpa.open-in-view: false
+  servlet.multipart:
+    max-file-size: 2000MB
+    max-request-size: 2000MB
+  devtools:
+    restart:
+      enabled: true
+      exclude: stirling.software.proprietary.security/**
+    livereload.enabled: true
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://db.nrlkjfznsavsbmweiyqu.supabase.co:5432/postgres?sslmode=require
+    username: postgres
+    password: ${SAAS_DB_PASSWORD}
+  jpa:
+    hibernate.ddl-auto: update
+    database-platform: org.hibernate.dialect.PostgreSQLDialect
+  security:
+    oauth2:
+      res
+  
+multipart.enabled: true
+logging.level:
+  org:
+    springframework: WARN
+    hibernate: WARN
+    jetty: WARN
+#    springframework.security.saml2: TRACE
+#    springframework.security: DEBUG
+#    opensaml: DEBUG
+#  stirling.software.SPDF.config.security: DEBUG
+  com.zaxxer.hikari: WARN
+  
+server:
+  forward-headers-strategy: NATIVE
+  error:
+    path: /error
+    whitelabel.enabled: false
+    include-stacktrace: always
+    include-exception: true
+    include-message: always
+  servlet:
+    session:
+      timeout: 30m
+      tracking-modes: cookie
+    context-path: ${SYSTEM_ROOTURIPATH:/}
+
+# Change the default URL path for OpenAPI JSON
+springdoc:
+  api-docs.path: /v1/api-docs
+  swagger-ui:
+    url: /v1/api-docs
+    path: /index.html
+
+posthog:
+  api:
+    key: ${POSTHOG_API_KEY:phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq}
+  host: ${POSTHOG_HOST:https://eu.i.posthog.com}
+
+supabase:
+  id: ${SUPABASE_PROJECT_ID:nrlkjfznsavsbmweiyqu}
+  publishable-key: ${SUPABASE_PUBLISHABLE_KEY:rp7EBq9Dk-ZPCSe7EMWD7JZ6rMulReSUmJ4WIHowMl1AlCC6m1xA3UsBctHRbFkttik9pReYltrWzt7Ft1aap36_S2tKRzEN9qngJM1D7yd2s0Ok0kLeC54DxBvuqQVKe4dk6g_XC7ElV8w6JUQBN9xMLbnMQG49qvq2syugk-Ujj1M9VGsNr85HdgAFymODW3vI4w1hrz4rCDOU_uuDDGHoEvChnFVZ_tmO80IUKUCiWIIzkBn8k8mnmbnC0vCRMV-YT1J7DS-pznuqcEZhotJ3DnD3TwNJevVklo7QfZGL6hyIK-t5DNMBc3uujS1bZ9bLA3RMqXWgD9ZTmjcutw}
+  jwks:
+    url: https://nrlkjfznsavsbmweiyqu.supabase.co/auth/v1/.well-known/jwks.json
+
+# Set up a consistent temporary directory location
+java.io.tmpdir: ${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf}