diff --git a/src/components/secure-credentials/secure-credentials.ts b/src/components/secure-credentials/secure-credentials.ts
index 085c022..a6af36d 100644
--- a/src/components/secure-credentials/secure-credentials.ts
+++ b/src/components/secure-credentials/secure-credentials.ts
@@ -2,7 +2,7 @@
  * SecureCredentialsComponent - Composant pour la gestion des credentials sécurisés
  * Interface utilisateur pour la gestion des clés de spend et de scan avec PBKDF2
  */
-import { secureCredentialsService } from '../../services/secure-credentials.service';
+import { SecureCredentialsService } from '../../services/secure-credentials.service';
 import { secureLogger } from '../../services/secure-logger';
 import { eventBus } from '../../services/event-bus';
 
@@ -134,6 +134,7 @@ export class SecureCredentialsComponent {
       this.showMessage('Création des credentials en cours...', 'info');
 
       // Générer les credentials
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       const credentials = await secureCredentialsService.generateSecureCredentials(password);
 
       // Stocker les credentials
@@ -169,6 +170,7 @@ export class SecureCredentialsComponent {
     try {
       this.showMessage('Récupération des credentials...', 'info');
 
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       const credentials = await secureCredentialsService.retrieveCredentials(password);
 
       if (credentials) {
@@ -197,6 +199,7 @@ export class SecureCredentialsComponent {
     const input = event.target as HTMLInputElement;
     const password = input.value;
 
+    const secureCredentialsService = SecureCredentialsService.getInstance();
     const validation = secureCredentialsService.validatePasswordStrength(password);
     const strengthDiv = document.getElementById('password-strength');
 
@@ -242,6 +245,7 @@ export class SecureCredentialsComponent {
     }
 
     try {
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       await secureCredentialsService.deleteCredentials();
       this.showMessage('Credentials supprimés avec succès', 'success');
       await this.updateUI();
@@ -265,6 +269,7 @@ export class SecureCredentialsComponent {
    */
   private async updateUI(): Promise<void> {
     try {
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       const hasCredentials = await secureCredentialsService.hasCredentials();
 
       const createSection = document.getElementById('create-credentials-section');
diff --git a/src/services/pairing.service.ts b/src/services/pairing.service.ts
index 10eb0a0..479dac3 100644
--- a/src/services/pairing.service.ts
+++ b/src/services/pairing.service.ts
@@ -8,7 +8,8 @@ import { ProcessRepository } from '../repositories/process.repository';
 import { eventBus } from './event-bus';
 import { secureLogger } from './secure-logger';
 // import { secureKeyManager } from './secure-key-manager';
-import { secureCredentialsService, CredentialData } from './secure-credentials.service';
+import { SecureCredentialsService } from './secure-credentials.service';
+import { CredentialData } from './credentials/types';
 
 export interface PairingResult {
   success: boolean;
@@ -48,6 +49,8 @@ export class PairingService {
         throw new Error('No device found. Please initialize the device first.');
       }
 
+      const secureCredentialsService = SecureCredentialsService.getInstance();
+
       // Valider la force du mot de passe
       const passwordValidation = secureCredentialsService.validatePasswordStrength(password);
       if (!passwordValidation.isValid) {
@@ -297,6 +300,7 @@ export class PairingService {
    */
   async getSecureCredentials(password: string): Promise<CredentialData | null> {
     try {
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       const credentials = await secureCredentialsService.retrieveCredentials(password);
 
       if (credentials) {
@@ -323,6 +327,7 @@ export class PairingService {
    */
   async hasSecureCredentials(): Promise<boolean> {
     try {
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       return await secureCredentialsService.hasCredentials();
     } catch (error) {
       secureLogger.error('Failed to check secure credentials', error as Error, {
@@ -338,6 +343,7 @@ export class PairingService {
    */
   async deleteSecureCredentials(): Promise<PairingResult> {
     try {
+      const secureCredentialsService = SecureCredentialsService.getInstance();
       await secureCredentialsService.deleteCredentials();
 
       secureLogger.info('Secure credentials deleted', {
@@ -371,6 +377,7 @@ export class PairingService {
     score: number;
     feedback: string[];
   } {
+    const secureCredentialsService = SecureCredentialsService.getInstance();
     return secureCredentialsService.validatePasswordStrength(password);
   }
 
diff --git a/src/services/service-container.ts b/src/services/service-container.ts
index 1223850..f572fa9 100644
--- a/src/services/service-container.ts
+++ b/src/services/service-container.ts
@@ -9,7 +9,7 @@ import { eventBus } from './event-bus';
 import { secureLogger } from './secure-logger';
 import { memoryManager } from './memory-manager';
 import { secureKeyManager } from './secure-key-manager';
-import { secureCredentialsService } from './secure-credentials.service';
+import { SecureCredentialsService } from './secure-credentials.service';
 import Database from './database.service';
 
 export interface ServiceContainer {