diff --git a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
index f208192..ef1122f 100644
--- a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
+++ b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
@@ -10,7 +10,6 @@
 import io.mosip.kernel.signature.dto.SignResponseDto;
 import io.mosip.kernel.signature.service.SignatureServicev2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
diff --git a/certify-service/src/main/java/io/mosip/certify/proofgenerators/RSASignature2018ProofGenerator.java b/certify-service/src/main/java/io/mosip/certify/proofgenerators/RSASignature2018ProofGenerator.java
index 0234947..6b5d41e 100644
--- a/certify-service/src/main/java/io/mosip/certify/proofgenerators/RSASignature2018ProofGenerator.java
+++ b/certify-service/src/main/java/io/mosip/certify/proofgenerators/RSASignature2018ProofGenerator.java
@@ -13,8 +13,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.Map;
 
 @Component
@@ -37,9 +35,8 @@ public Canonicalizer getCanonicalizer() {
 
     @Override
     public LdProof generateProof(LdProof vcLdProof, String vcEncodedHash, Map<String, String> keyID) {
-        String vcEncodedData = Base64.getUrlEncoder().encodeToString(vcEncodedHash.getBytes(StandardCharsets.UTF_8));
         JWSSignatureRequestDto payload = new JWSSignatureRequestDto();
-        payload.setDataToSign(vcEncodedData);
+        payload.setDataToSign(vcEncodedHash);
         payload.setApplicationId(keyID.get(Constants.APPLICATION_ID));
         payload.setReferenceId(keyID.get(Constants.REFERENCE_ID)); // alg, empty = RSA
         payload.setIncludePayload(false);
diff --git a/docker-compose/docker-compose-injistack/config/certify-csvdp-farmer.properties b/docker-compose/docker-compose-injistack/config/certify-csvdp-farmer.properties
index bf52427..7fc539d 100644
--- a/docker-compose/docker-compose-injistack/config/certify-csvdp-farmer.properties
+++ b/docker-compose/docker-compose-injistack/config/certify-csvdp-farmer.properties
@@ -34,7 +34,7 @@ mosip.certify.key-values={\
                     'format': 'ldp_vc',\
                     'scope' : 'farmer_vc_ldp',\
                     'cryptographic_binding_methods_supported': {'did:jwk'},\
-                    'cryptographic_suites_supported': {'RsaSignature2018'},\
+                    'cryptographic_suites_supported': {'Ed25519Signature2020'},\
                     'proof_types_supported': {'jwt'},\
                     'credential_definition': {\
                       'type': {'VerifiableCredential','FarmerCredential'},\
@@ -70,7 +70,7 @@ mosip.certify.key-values={\
                     'format': 'ldp_vc',\
                     'scope' : 'mock_identity_vc_ldp',\
                     'cryptographic_binding_methods_supported': {'did:jwk'},\
-                    'credential_signing_alg_values_supported': {'RsaSignature2018'},\
+                    'credential_signing_alg_values_supported': {'Ed25519Signature2020'},\
                     'proof_types_supported': {'jwt': {'proof_signing_alg_values_supported': {'RS256', 'PS256'}}},\
                     'credential_definition': {\
                       'type': {'VerifiableCredential','FarmerCredential'},\