diff --git a/apps/client/cypress/e2e/specs/admin/system-settings.e2e.ts b/apps/client/cypress/e2e/specs/admin/system-settings.e2e.ts
index 56e0f86e2a..9cba028059 100644
--- a/apps/client/cypress/e2e/specs/admin/system-settings.e2e.ts
+++ b/apps/client/cypress/e2e/specs/admin/system-settings.e2e.ts
@@ -1,4 +1,4 @@
-import type { SystemSettings } from '@cpn-console/shared'
+import { type SystemSettings, SystemSettingsSchema } from '@cpn-console/shared'
 import { getModel } from '../../support/func.js'
 
 describe('Administration system settings', () => {
@@ -7,7 +7,7 @@ describe('Administration system settings', () => {
   beforeEach(() => {
     cy.intercept('GET', 'api/v1/system/settings?key=maintenance').as('listMaintenanceSetting')
     cy.intercept('GET', 'api/v1/system/settings').as('listSystemSettings')
-    cy.intercept('POST', 'api/v1/system/settings').as('upsertSystemSetting')
+    cy.intercept('POST', 'api/v1/system/settings').as('upsertSystemSettings')
 
     cy.kcLogin('tcolin')
     cy.visit('/admin/system-settings')
@@ -29,12 +29,13 @@ describe('Administration system settings', () => {
     cy.getByDataTestid(`toggle-maintenance`)
       .find('input')
       .check({ force: true })
-    cy.wait('@upsertSystemSetting').its('response').then(($response) => {
+
+    cy.getByDataTestid('button-submit')
+      .click()
+
+    cy.wait('@upsertSystemSettings').its('response').then(($response) => {
       expect($response?.statusCode).to.match(/^20\d$/)
-      expect(JSON.stringify($response?.body)).to.equal(JSON.stringify({
-        key: 'maintenance',
-        value: 'on',
-      }))
+      expect(JSON.stringify($response?.body)).to.equal(JSON.stringify(SystemSettingsSchema.parse({})))
     })
 
     cy.visit('/projects')
@@ -83,12 +84,13 @@ describe('Administration system settings', () => {
     cy.getByDataTestid(`toggle-maintenance`)
       .find('input')
       .uncheck({ force: true })
-    cy.wait('@upsertSystemSetting').its('response').then(($response) => {
+
+    cy.getByDataTestid('button-submit')
+      .click()
+
+    cy.wait('@upsertSystemSettings').its('response').then(($response) => {
       expect($response?.statusCode).to.match(/^20\d$/)
-      expect(JSON.stringify($response?.body)).to.equal(JSON.stringify({
-        key: 'maintenance',
-        value: 'off',
-      }))
+      expect(JSON.stringify($response?.body)).to.equal(JSON.stringify(SystemSettingsSchema.parse({})))
     })
 
     cy.visit('/projects')
diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 02fa047bc0..89c0929ce0 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -42,11 +42,10 @@ watch(label, (label: string) => {
 const systemSettings = ref<SystemSettings>()
 
 const serviceStore = useServiceStore()
-onBeforeMount(() => {
-  serviceStore.startHealthPolling()
-  serviceStore.checkServicesHealth()
-
-  systemStore.listSystemSettings()
+onBeforeMount(async () => {
+  await serviceStore.startHealthPolling()
+  await serviceStore.checkServicesHealth()
+  await systemStore.listSystemSettings()
   systemSettings.value = systemStore.systemSettings
 })
 </script>
@@ -54,7 +53,7 @@ onBeforeMount(() => {
 <template>
   <DsfrHeader
     :service-title="systemSettings?.appName ?? 'Console Cloud π Native'"
-    :logo-text="systemSettings?.appSubTitle ?? ['Ministère', 'de l’intérieur', 'et des outre-mer']"
+    :logo-text="systemSettings?.appSubTitle.split(',') ?? ['Ministère', 'de l’intérieur', 'et des outre-mer']"
     :quick-links="quickLinks"
   />
   <DsfrNotice
diff --git a/apps/client/src/stores/system-settings.spec.ts b/apps/client/src/stores/system-settings.spec.ts
index b79946b03e..892371b3b3 100644
--- a/apps/client/src/stores/system-settings.spec.ts
+++ b/apps/client/src/stores/system-settings.spec.ts
@@ -4,7 +4,7 @@ import { apiClient } from '../api/xhr-client.js'
 import { useSystemSettingsStore } from './system-settings.js'
 
 const listSystemSettings = vi.spyOn(apiClient.SystemSettings, 'listSystemSettings')
-const upsertSystemSetting = vi.spyOn(apiClient.SystemSettings, 'upsertSystemSetting')
+const upsertSystemSettings = vi.spyOn(apiClient.SystemSettings, 'upsertSystemSettings')
 
 describe('system Settings Store', () => {
   beforeEach(() => {
@@ -15,41 +15,29 @@ describe('system Settings Store', () => {
   })
 
   it('should get system settings list by api call', async () => {
-    const data = [
-      { key: 'maintenace', value: 'on' },
-      { key: 'theme', value: 'dsfr' },
-      { key: 'organisation', value: 'miom' },
-    ]
-    listSystemSettings.mockReturnValueOnce(Promise.resolve({ status: 200, body: data }))
+    const sytemSettings = { maintenace: 'on', theme: 'dsfr', organisation: 'miom' }
+    // @ts-expect-error TS2345
+    listSystemSettings.mockReturnValueOnce(Promise.resolve({ status: 200, body: sytemSettings }))
     const systemSettingsStore = useSystemSettingsStore()
 
     await systemSettingsStore.listSystemSettings()
 
-    expect(systemSettingsStore.systemSettings).toEqual(data)
+    expect(systemSettingsStore.systemSettings).toEqual(sytemSettings)
     expect(listSystemSettings).toHaveBeenCalledTimes(1)
   })
 
   it('should upsert a system setting by api call', async () => {
-    const data = [
-      { key: 'maintenace', value: 'on' },
-      { key: 'theme', value: 'dsfr' },
-      { key: 'organisation', value: 'miom' },
-    ]
-    const newSystemSetting = { key: 'organisation', value: 'mj' }
-    const newData = [
-      { key: 'maintenace', value: 'on' },
-      { key: 'theme', value: 'dsfr' },
-      { key: 'organisation', value: 'mj' },
-    ]
-
-    upsertSystemSetting.mockReturnValueOnce(Promise.resolve({ status: 201, body: newSystemSetting }))
+    const sytemSettings = { maintenace: 'on', theme: 'dsfr', organisation: 'miom' }
+    const newSystemSettings = { maintenace: 'on', theme: 'dsfr', organisation: 'mj' }
+
+    // @ts-expect-error TS2345
+    upsertSystemSettings.mockReturnValueOnce(Promise.resolve({ status: 201, body: newSystemSettings }))
     const systemSettingsStore = useSystemSettingsStore()
-    systemSettingsStore.systemSettings = data
+    systemSettingsStore.systemSettings = sytemSettings
 
-    const res = await systemSettingsStore.upsertSystemSetting(data)
+    await systemSettingsStore.upsertSystemSettings(sytemSettings)
 
-    expect(res).toEqual(newSystemSetting)
-    expect(systemSettingsStore.systemSettings).toEqual(newData)
-    expect(upsertSystemSetting).toHaveBeenCalledTimes(1)
+    expect(systemSettingsStore.systemSettings).toEqual(newSystemSettings)
+    expect(upsertSystemSettings).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/apps/client/src/stores/system-settings.ts b/apps/client/src/stores/system-settings.ts
index 6fb9e34394..3f3eb8b42c 100644
--- a/apps/client/src/stores/system-settings.ts
+++ b/apps/client/src/stores/system-settings.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import type {
   SystemSettings,
+  UpsertSystemSettingsBody,
 } from '@cpn-console/shared'
 import { apiClient, extractData } from '@/api/xhr-client.js'
 
@@ -12,18 +13,14 @@ export const useSystemSettingsStore = defineStore('systemSettings', () => {
       .then(response => extractData(response, 200))
   }
 
-  // const upsertSystemSetting = async (newSystemSetting: UpsertSystemSettingBody) => {
-  //   const res = await apiClient.SystemSettings.upsertSystemSetting({ body: newSystemSetting })
-  //     .then(response => extractData(response, 201))
-  //   systemSettings.value = systemSettings.value
-  //     .toSpliced(systemSettings.value
-  //       .findIndex(systemSetting => systemSetting.key === res.key), 1, res)
-  //   return res
-  // }
+  const upsertSystemSettings = async (newSystemSetting: UpsertSystemSettingsBody) => {
+    systemSettings.value = await apiClient.SystemSettings.upsertSystemSettings({ body: newSystemSetting })
+      .then(response => extractData(response, 201))
+  }
 
   return {
     systemSettings,
     listSystemSettings,
-    // upsertSystemSetting,
+    upsertSystemSettings,
   }
 })
diff --git a/apps/client/src/views/admin/SystemSettings.vue b/apps/client/src/views/admin/SystemSettings.vue
index c24d3d3930..25d0545a5d 100644
--- a/apps/client/src/views/admin/SystemSettings.vue
+++ b/apps/client/src/views/admin/SystemSettings.vue
@@ -1,11 +1,10 @@
 <script lang="ts" setup>
 import type { SystemSettings } from '@cpn-console/shared'
 import { useSystemSettingsStore } from '@/stores/system-settings.js'
+import { useSnackbarStore } from '@/stores/snackbar.js'
 
 const systemStore = useSystemSettingsStore()
 
-const updated = ref<Record<string, Record<string, string>>>({})
-
 // permet de definir quel input choisir ??
 // function refTheValues(settings: SystemSetting[]) {
 //   return settings.map((setting) => {
@@ -18,55 +17,66 @@ const updated = ref<Record<string, Record<string, string>>>({})
 
 const systemSettings = ref<SystemSettings>()
 
-// reload les settings
-async function reload() {
+onBeforeMount(async () => {
   await systemStore.listSystemSettings()
   systemSettings.value = systemStore.systemSettings
+})
 
-  updated.value = {}
+function updateMaintenance(value: boolean) {
+  if (!systemSettings.value) return
+  systemSettings.value.maintenance = value ? 'on' : 'off'
 }
 
-onBeforeMount(async () => {
-  // await systemStore.listSystemSettings()
-  reload()
-})
-
-// A modifié pour save les settings dynamiquement
-async function upsertSystemSetting(key: string, value: boolean) {
-  // await systemStore.upsertSystemSetting({ key, value: value ? 'on' : 'off' })
-  console.log(key + value)
+async function upsertSystemSetting() {
+  if (!systemSettings.value) return
+  await systemStore.upsertSystemSettings(systemSettings.value)
+  systemSettings.value = systemStore.systemSettings
+  useSnackbarStore().setMessage('Réglages mis à jour', 'success')
 }
 </script>
 
 <template>
   <h1>Réglages de la console Cloud π Native</h1>
+  <DsfrNotice
+    v-if="!systemSettings"
+    title="Aucun réglage à configurer."
+  />
   <div
-    class="flex <md:flex-col items-center justify-between gap-2 mt-8"
+    v-else
   >
-    <!-- {{ systemSettings }} -->
-    <DsfrToggleSwitch
-      :model-value="systemSettings.maintenance === 'on'"
-      :label="`${systemSettings.maintenance === 'on' ? 'Désactiver' : 'Activer'} le mode maintenance`"
-      data-testid="toggle-maintenance"
-      @update:model-value="(event: boolean) => upsertSystemSetting('maintenance', event)"
-    />
-    <DsfrInput
-      v-model="systemSettings.appName"
-      data-testid="input-appName"
-      label="appName"
-      label-visible
-    />
-    <DsfrInput
-      v-model="systemSettings.contactMail"
-      data-testid="input-contactMail"
-      label="contactMail"
-      label-visible
-    />
-    <DsfrInput
-      v-model="systemSettings.appSubTitle"
-      data-testid="input-appSubTitle"
-      label="appSubTitle"
-      label-visible
+    <div
+      class="flex flex-col gap-2 my-8"
+    >
+      <DsfrToggleSwitch
+        :model-value="systemSettings.maintenance === 'on'"
+        :label="`${systemSettings.maintenance === 'on' ? 'Désactiver' : 'Activer'} le mode maintenance`"
+        data-testid="toggle-maintenance"
+        @update:model-value="(event: boolean) => updateMaintenance(event)"
+      />
+      <DsfrInput
+        v-model="systemSettings.appName"
+        data-testid="input-appName"
+        label="appName"
+        label-visible
+      />
+      <DsfrInput
+        v-model="systemSettings.contactMail"
+        data-testid="input-contactMail"
+        label="contactMail"
+        label-visible
+      />
+      <DsfrInput
+        v-model="systemSettings.appSubTitle"
+        data-testid="input-appSubTitle"
+        label="appSubTitle"
+        label-visible
+      />
+    </div>
+    <DsfrButton
+      label="Enregistrer"
+      data-testid="button-submit"
+      secondary
+      @click="upsertSystemSetting()"
     />
   </div>
 </template>
@@ -74,7 +84,7 @@ async function upsertSystemSetting(key: string, value: boolean) {
 <!-- <template>
   <h1>Réglages de la console Cloud π Native</h1>
   <div
-    v-if="!systemStore.systemSettings.length"
+    v-if="!systemStore.systemSettings?.length"
     class="flex <md:flex-col-reverse items-center justify-between gap-2 mt-8"
   >
     <div> -->
diff --git a/apps/server/src/resources/repository/queries.ts b/apps/server/src/resources/repository/queries.ts
index 05735ef40a..518c175a0e 100644
--- a/apps/server/src/resources/repository/queries.ts
+++ b/apps/server/src/resources/repository/queries.ts
@@ -19,7 +19,7 @@ export function initializeRepository({ projectId, internalRepoName, externalRepo
     data: {
       projectId,
       internalRepoName,
-      externalRepoUrl,
+      externalRepoUrl: externalRepoUrl ?? '',
       externalUserName,
       isInfra,
       isPrivate,
diff --git a/apps/server/src/resources/system/settings/business.ts b/apps/server/src/resources/system/settings/business.ts
index 2efc8d6d63..b88523ed1a 100644
--- a/apps/server/src/resources/system/settings/business.ts
+++ b/apps/server/src/resources/system/settings/business.ts
@@ -1,9 +1,10 @@
-import type { UpsertSystemSettingsBody } from '@cpn-console/shared'
+import type { SystemSettings, UpsertSystemSettingsBody } from '@cpn-console/shared'
 import { upsertSystemSetting as upsertSystemSettingQuery } from './queries.js'
 
-import { config } from '@/utils/config.js'
+import { getConfig } from '@/utils/config.js'
 
-export function getSystemSettings(key?: keyof typeof config) {
+export async function getSystemSettings(key?: keyof SystemSettings) {
+  const config = await getConfig()
   if (key) {
     return { [key]: config[key] }
   } else {
@@ -11,4 +12,10 @@ export function getSystemSettings(key?: keyof typeof config) {
   }
 }
 
-export const upsertSystemSettings = (newSystemSetting: UpsertSystemSettingsBody) => upsertSystemSettingQuery(newSystemSetting)
+export async function upsertSystemSettings(newSystemSettings: UpsertSystemSettingsBody) {
+  if (!newSystemSettings) return getSystemSettings()
+  for (const [key, value] of Object.entries(newSystemSettings)) {
+    await upsertSystemSettingQuery({ key, value })
+  }
+  return getSystemSettings()
+}
diff --git a/apps/server/src/resources/system/settings/queries.ts b/apps/server/src/resources/system/settings/queries.ts
index c64cb3b74c..a9f9560e9e 100644
--- a/apps/server/src/resources/system/settings/queries.ts
+++ b/apps/server/src/resources/system/settings/queries.ts
@@ -15,4 +15,16 @@ export function upsertSystemSetting(newSystemSetting: SystemSetting) {
   })
 }
 
-export const getSystemSettings = (where?: Prisma.SystemSettingWhereInput) => prisma.systemSetting.findMany({ where })
+export async function getSystemSettings(where?: Prisma.SystemSettingWhereInput) {
+  const res = await prisma.systemSetting.findMany({ where })
+  if (res === undefined || typeof res != 'object') {
+    return {}
+  } else {
+    res.reduce((acc, curr) => {
+      return {
+        ...acc,
+        [curr.key]: curr.value,
+      }
+    }, {})
+  }
+}
diff --git a/apps/server/src/resources/system/settings/router.spec.ts b/apps/server/src/resources/system/settings/router.spec.ts
index c4c6b56b63..c68ad9d477 100644
--- a/apps/server/src/resources/system/settings/router.spec.ts
+++ b/apps/server/src/resources/system/settings/router.spec.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { systemSettingsContract } from '@cpn-console/shared'
+import { SystemSettingsSchema, systemSettingsContract } from '@cpn-console/shared'
 import app from '../../../app.js'
 import * as utilsController from '../../../utils/controller.js'
 import { getUserMockInfos } from '../../../utils/mocks.js'
@@ -8,7 +8,7 @@ import * as business from './business.js'
 vi.mock('fastify-keycloak-adapter', (await import('../../../utils/mocks.js')).mockSessionPlugin)
 const authUserMock = vi.spyOn(utilsController, 'authUser')
 const businessGetSystemSettingsMock = vi.spyOn(business, 'getSystemSettings')
-const businessUpsertSystemSettingMock = vi.spyOn(business, 'upsertSystemSetting')
+const businessUpsertSystemSettingMock = vi.spyOn(business, 'upsertSystemSettings')
 
 describe('test systemSettingsContract', () => {
   beforeEach(() => {
@@ -18,7 +18,7 @@ describe('test systemSettingsContract', () => {
   describe('listSystemSettings', () => {
     it('should return plugin configurations for authorized users', async () => {
       const user = getUserMockInfos(true)
-      const systemSettings = []
+      const systemSettings = {}
 
       authUserMock.mockResolvedValueOnce(user)
       businessGetSystemSettingsMock.mockResolvedValueOnce(systemSettings)
@@ -28,13 +28,13 @@ describe('test systemSettingsContract', () => {
         .end()
 
       expect(businessGetSystemSettingsMock).toHaveBeenCalledTimes(1)
-      expect(response.json()).toEqual(systemSettings)
+      expect(response.json()).toEqual(SystemSettingsSchema.parse({}))
       expect(response.statusCode).toEqual(200)
     })
   })
 
-  describe('upsertSystemSetting', () => {
-    const newConfig = { key: 'key1', value: 'value1' }
+  describe('upsertSystemSettings', () => {
+    const newConfig = { appName: 'key1' }
     it('should update system setting, authorized users', async () => {
       const user = getUserMockInfos(true)
 
@@ -42,7 +42,7 @@ describe('test systemSettingsContract', () => {
       businessUpsertSystemSettingMock.mockResolvedValueOnce(newConfig)
 
       const response = await app.inject()
-        .post(systemSettingsContract.upsertSystemSetting.path)
+        .post(systemSettingsContract.upsertSystemSettings.path)
         .body(newConfig)
         .end()
 
@@ -56,7 +56,7 @@ describe('test systemSettingsContract', () => {
       authUserMock.mockResolvedValueOnce(user)
 
       const response = await app.inject()
-        .post(systemSettingsContract.upsertSystemSetting.path)
+        .post(systemSettingsContract.upsertSystemSettings.path)
         .body(newConfig)
         .end()
 
diff --git a/apps/server/src/resources/system/settings/router.ts b/apps/server/src/resources/system/settings/router.ts
index 7b5bf3c565..e4b9fe852f 100644
--- a/apps/server/src/resources/system/settings/router.ts
+++ b/apps/server/src/resources/system/settings/router.ts
@@ -21,7 +21,7 @@ export function systemSettingsRouter() {
       }
     },
 
-    upsertSystemSetting: async ({ request: req, body: data }) => {
+    upsertSystemSettings: async ({ request: req, body: data }) => {
       const perms = await authUser(req)
       if (!AdminAuthorized.isAdmin(perms.adminPermissions)) return new Forbidden403()
 
diff --git a/apps/server/src/utils/config.spec.ts b/apps/server/src/utils/config.spec.ts
new file mode 100644
index 0000000000..6b8a59657b
--- /dev/null
+++ b/apps/server/src/utils/config.spec.ts
@@ -0,0 +1,69 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { SystemSettingsSchema as ConfigSchema } from '@cpn-console/shared'
+import prisma from '../__mocks__/prisma.js'
+import { getConfig } from './config.js'
+
+const originalEnv = process.env
+const testEnv = {
+  maintenance: 'on',
+  appName: 'Console Cloud Pi Native du test unitaire ENV',
+  contactMail: 'cloudpinative-test-unitaire@testENV.unitaire.gouv.fr',
+  appSubTitle: 'Ministère, du test unitaire, et des tests ENV',
+}
+
+describe('utils - config', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    globalThis.process.env = originalEnv
+  })
+
+  // describe('getEnv', () => {
+  //   it('should retieve environment variables', () => {
+  //     globalThis.process.env = { ...originalEnv, ...testEnv }
+
+  //     const env = getEnvConfig()
+
+  //     expect(env).toEqual(testEnv)
+  //   })
+  // })
+
+  describe('getConfig', () => {
+    it('should retieve config', async () => {
+      prisma.systemSetting.findMany.mockResolvedValue([])
+      globalThis.process.env = {}
+
+      const testConfig = await import('./configs/config.valid.spec.json', { assert: { type: 'json' } })
+      const env = await getConfig()
+
+      expect(env).toEqual(testConfig.default)
+    })
+
+    it('should retieve config override by environment variables', async () => {
+      prisma.systemSetting.findMany.mockResolvedValue([])
+      globalThis.process.env = { ...originalEnv, ...testEnv }
+      const testConfig = await import('./configs/config.valid.spec.json', { assert: { type: 'json' } })
+
+      const env = await getConfig()
+      const expected = {
+        ...ConfigSchema.parse({}),
+        ...testConfig.default,
+        ...testEnv,
+      }
+
+      expect(env).toEqual(expected)
+    })
+
+    it('should throw an error if config file have an invalid schema', async () => {
+      prisma.systemSetting.findMany.mockResolvedValue([])
+      globalThis.process.env = {}
+
+      try {
+        await getConfig({ fileConfigPath: './configs/config.invalid.spec.json' })
+      } catch (error) {
+        expect(error).toBeInstanceOf(Error)
+        expect(JSON.parse(error?.message).description).toEqual('invalid config file "./configs/config.invalid.spec.json"')
+        expect(JSON.parse(error?.message).error.issues[0].message).toEqual('Unrecognized key(s) in object: \'config\'')
+      }
+    })
+  })
+})
diff --git a/apps/server/src/utils/config.ts b/apps/server/src/utils/config.ts
index 484e082621..b13eddfeb9 100644
--- a/apps/server/src/utils/config.ts
+++ b/apps/server/src/utils/config.ts
@@ -1,5 +1,6 @@
 import path from 'node:path'
-import { SystemSettingSchema as ConfigSchema } from '@cpn-console/shared'
+import { SystemSettingsSchema as ConfigSchema } from '@cpn-console/shared'
+import { getSystemSettings } from '@/resources/queries-index.js'
 
 const getNodeEnv: () => 'development' | 'test' | 'production' = () => {
   if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
@@ -8,126 +9,38 @@ const getNodeEnv: () => 'development' | 'test' | 'production' = () => {
   return 'production'
 }
 
-function snakeCaseToCamelCase(input: string) {
-  return input
-    .split('_')
-    .reduce((acc, cur, i) => {
-      if (!i) {
-        return cur.toLowerCase()
-      }
-      return acc + cur.charAt(0).toUpperCase() + cur.substring(1).toLowerCase()
-    }, '')
-}
-
-function deepMerge(target: any, source: any) {
-  const result = { ...target, ...source }
-  for (const key of Object.keys(result)) {
-    if (Array.isArray(target[key]) && Array.isArray(source[key])) {
-      result[key] = result[key].map((value: unknown, idx: number) => {
-        return typeof value === 'object'
-          ? deepMerge(target[key][idx], source[key][idx])
-          : structuredClone(result[key][idx])
-      })
-    } else if (typeof target[key] === 'object' && typeof source[key] === 'object') {
-      result[key] = deepMerge(target[key], source[key])
-    } else {
-      result[key] = structuredClone(result[key])
-    }
-  }
-  return result
-}
-
 const configPaths = {
-  development: path.resolve(__dirname, '../../config-example.json'),
-  production: '/app/config.json',
+  // development: path.resolve(__dirname, '../../config-example.json'),
+  development: path.resolve(__dirname, './configs/config-valid.json'),
+  production: './config.json',
   test: path.resolve(__dirname, './configs/config.valid.spec.json'),
 }
 
 const CONFIG_PATH = configPaths[getNodeEnv()]
-const ENV_PREFIX = ['API__', 'DOC__']
-
-// export const ConfigSchema = z.object({
-//   maintenance: z.string().default('off'),
-//   appName: z.string().default('Console Cloud Pi Native TEST DE FOU'),
-//   contactMail: z.string().default('cloudpinative-relations@interieur.gouv.fr'),
-//   appSubTitle: z.array(z.string()).default(['Ministère 2', 'de l’intérieur 3', 'et des outre-mer 4']),
-//   // appLogoUrl: z.string().default(''), // pas sur de la faisabilité
-// }).strict()
 
 export type Config = Zod.infer<typeof ConfigSchema>
 
-// maybe a modifié ? ?
-export function parseEnv(obj: Record<string, string>): Config | Record<PropertyKey, never> {
-  return Object
-    .entries(obj)
-    .map(([key, value]) => key
-      .split('__')
-      .toReversed()
-      .reduce((acc, val, idx) => {
-        if (!idx) {
-          try {
-            return { [snakeCaseToCamelCase(val)]: JSON.parse(value) }
-          } catch (_e) {
-            return { [snakeCaseToCamelCase(val)]: value }
-          }
-        } else {
-          return { [snakeCaseToCamelCase(val)]: acc }
-        }
-      }, {}))
-    .reduce((acc, val) => deepMerge(acc, val), {})
-}
-
-// pour recup l'env
-export function getEnv(prefix: string | string[] = ENV_PREFIX): Record<string, string> {
-  return Object
-    .entries(process.env)
-    .filter(([key, _value]) => Array.isArray(prefix) ? prefix.some(p => key.startsWith(p)) : key.startsWith(prefix))
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
-}
-
-export async function getConfig(opts?: { fileConfigPath?: string, envPrefix?: string | string[] }) {
-  const fileConfigPath = opts?.fileConfigPath ?? CONFIG_PATH
-  const envPrefix = opts?.envPrefix ?? ENV_PREFIX
-
-  const defaultConfig = ConfigSchema.parse({})
-  let envConfig: Config | Record<PropertyKey, never> = {}
-  let fileConfig: Config | Record<PropertyKey, never> = {}
-  // const dbConfig: Config | Record<PropertyKey, never> = {}
-
-  try {
-    envConfig = parseEnv(getEnv(envPrefix))
-    ConfigSchema.partial().parse(envConfig)
-  } catch (error) {
-    const errorMessage = { description: 'invalid config environment variables', error }
-    throw new Error(JSON.stringify(errorMessage))
-  }
-
+export async function getFileConfig(fileConfigPath = CONFIG_PATH): Promise<Partial<Config>> {
   try {
     const file = await import(fileConfigPath, { assert: { type: 'json' } })
-
       .catch(_e => console.log(`no config file detected "${fileConfigPath}"`))
+
     if (file) {
-      fileConfig = file.default
-      ConfigSchema.partial().parse(fileConfig)
+      return file.default
     }
+    return {}
   } catch (error) {
     const errorMessage = { description: `invalid config file "${fileConfigPath}"`, error }
     throw new Error(JSON.stringify(errorMessage))
   }
+}
 
-  // try {
-  //   dbConfig = JSON.parse(await getSystemSettings())
-  // } catch (error) {
-  //   const errorMessage = { description: `invalid config env`, error }
-  //   throw new Error(JSON.stringify(errorMessage))
-  // }
-
-  return {
-    ...defaultConfig,
-    ...fileConfig,
-    ...envConfig,
-    // ...dbConfig,
-  }
+export async function getConfig(opts?: { fileConfigPath?: string, envPrefix?: string | string[] }) {
+  return ConfigSchema.parse({
+    ...await getFileConfig(opts?.fileConfigPath),
+    ...process.env,
+    ...(await getSystemSettings()),
+  })
 }
 
 export const config = await getConfig()
diff --git a/apps/server/src/utils/configs/config-valid.json b/apps/server/src/utils/configs/config-valid.json
new file mode 100644
index 0000000000..82b917f7cd
--- /dev/null
+++ b/apps/server/src/utils/configs/config-valid.json
@@ -0,0 +1,6 @@
+{
+  "maintenance": "off",
+  "appName": "Console Cloud Pi Native",
+  "contactMail": "cloudpinative-test-unitaire@.gouv.fr",
+  "appSubTitle": "Ministère, de l’intérieur, et des outre-mer"
+}
diff --git a/apps/server/src/utils/configs/config.invalid.spec.json b/apps/server/src/utils/configs/config.invalid.spec.json
new file mode 100644
index 0000000000..e2dd67ba4e
--- /dev/null
+++ b/apps/server/src/utils/configs/config.invalid.spec.json
@@ -0,0 +1,6 @@
+{
+  "config": {
+    "var1": "cfg1",
+    "var2": "cfg2"
+  }
+}
diff --git a/apps/server/src/utils/configs/config.valid.spec.json b/apps/server/src/utils/configs/config.valid.spec.json
new file mode 100644
index 0000000000..74f7cdadd9
--- /dev/null
+++ b/apps/server/src/utils/configs/config.valid.spec.json
@@ -0,0 +1,6 @@
+{
+  "maintenance": "off",
+  "appName": "Console Cloud Pi Native du test unitaire",
+  "contactMail": "cloudpinative-test-unitaire@test.unitaire.gouv.fr",
+  "appSubTitle": "Ministère, du test unitaire, et des tests"
+}
diff --git a/packages/shared/src/contracts/system.ts b/packages/shared/src/contracts/system.ts
index b5b9591d88..8492580d3d 100644
--- a/packages/shared/src/contracts/system.ts
+++ b/packages/shared/src/contracts/system.ts
@@ -63,7 +63,7 @@ export const systemSettingsContract = contractInstance.router({
     responses: ListSystemSettingsSchema.responses,
   },
 
-  upsertSystemSetting: {
+  upsertSystemSettings: {
     method: 'POST',
     path: `${apiPrefix}/system/settings`,
     contentType: 'application/json',
@@ -76,4 +76,4 @@ export const systemSettingsContract = contractInstance.router({
 
 export type SystemSettings = ClientInferResponseBody<typeof systemSettingsContract.listSystemSettings, 200>
 
-export type UpsertSystemSettingBody = ClientInferRequest<typeof systemSettingsContract.upsertSystemSetting>['body']
+export type UpsertSystemSettingsBody = ClientInferRequest<typeof systemSettingsContract.upsertSystemSettings>['body']
diff --git a/packages/shared/src/schemas/system.ts b/packages/shared/src/schemas/system.ts
index 147bdc4ef9..6608b07a3e 100644
--- a/packages/shared/src/schemas/system.ts
+++ b/packages/shared/src/schemas/system.ts
@@ -14,12 +14,12 @@ export const pluginSchema = z.object({
 
 export type PluginSchema = Zod.infer<typeof pluginSchema>
 
-export const SystemSettingSchema = z.object({
+export const SystemSettingsSchema = z.object({
   maintenance: z.string().default('off'),
-  appName: z.string().default('Console Cloud Pi Native TEST DE FOU'),
+  appName: z.string().default('Console Cloud Pi Native'),
   contactMail: z.string().default('cloudpinative-relations@interieur.gouv.fr'),
-  appSubTitle: z.array(z.string()).default(['Ministère 1', 'de l’intérieur 2', 'et des outre-mer 3']),
-}).strict()
+  appSubTitle: z.string().default('Ministère, de l’intérieur, et des outre-mer'),
+})
 
 export const GetVersionSchema = {
   responses: {
@@ -61,19 +61,19 @@ export const UpdateSystemPluginSchema = {
 
 export const ListSystemSettingsSchema = {
   query: z.object({
-    key: SystemSettingSchema.keyof(),
+    key: SystemSettingsSchema.keyof(),
   })
     .partial().strict(),
   responses: {
-    200: SystemSettingSchema,
+    200: SystemSettingsSchema,
     500: ErrorSchema,
   },
 }
 
 export const UpsertSystemSettingsSchema = {
-  body: SystemSettingSchema,
+  body: SystemSettingsSchema.optional(),
   responses: {
-    201: SystemSettingSchema,
+    201: SystemSettingsSchema,
     400: ErrorSchema,
     401: ErrorSchema,
     500: ErrorSchema,