diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/SendCSRRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/SendCSRRemoteOperationIT.kt
index 1f62d9e5a2..fa0747b79c 100644
--- a/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/SendCSRRemoteOperationIT.kt
+++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/SendCSRRemoteOperationIT.kt
@@ -35,7 +35,8 @@ class SendCSRRemoteOperationIT : AbstractIT() {
         val keyPair = keyGen.genKeyPair()
 
         // create CSR
-        val urlEncoded: String = CsrHelper().generateCsrPemEncodedString(keyPair, client.userId)
+        val urlEncoded: String =
+            CsrHelper().generateCsrPemEncodedString(keyPair, client.userId)
 
         val operation = SendCSRRemoteOperation(urlEncoded)
         var result = operation.execute(nextcloudClient)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/CsrHelper.kt b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/CsrHelper.kt
index 979f20e6b0..ac82a9c493 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/CsrHelper.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/CsrHelper.kt
@@ -72,11 +72,14 @@ class CsrHelper {
         userId: String
     ): PKCS10CertificationRequest {
         val principal = "CN=$userId"
+
         val privateKey = PrivateKeyFactory.createKey(keyPair.private.encoded)
-        val signatureAlgorithm = DefaultSignatureAlgorithmIdentifierFinder().find("SHA1WITHRSA")
-        val digestAlgorithm = DefaultDigestAlgorithmIdentifierFinder().find("SHA-1")
+        val signatureAlgorithm = SignatureAlgorithm.SHA256
+        val signatureAlgorithmIdentifier =
+            DefaultSignatureAlgorithmIdentifierFinder().find(signatureAlgorithm.signatureAlg)
+        val digestAlgorithmIdentifier = DefaultDigestAlgorithmIdentifierFinder().find(signatureAlgorithm.digestAlg)
         val signer =
-            BcRSAContentSignerBuilder(signatureAlgorithm, digestAlgorithm).build(privateKey)
+            BcRSAContentSignerBuilder(signatureAlgorithmIdentifier, digestAlgorithmIdentifier).build(privateKey)
         val csrBuilder: PKCS10CertificationRequestBuilder =
             JcaPKCS10CertificationRequestBuilder(
                 X500Name(principal),
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/SignatureAlgorithm.kt b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/SignatureAlgorithm.kt
new file mode 100644
index 0000000000..e08fbb6937
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/SignatureAlgorithm.kt
@@ -0,0 +1,15 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.e2ee
+
+enum class SignatureAlgorithm(
+    val signatureAlg: String,
+    val digestAlg: String
+) {
+    SHA256("SHA256WITHRSAENCRYPTION", "SHA-256")
+}