diff --git a/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java b/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java
index 8faa054..d83b882 100644
--- a/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java
+++ b/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java
@@ -81,8 +81,8 @@ public static class EcPublicKeyJwk extends PublicKeyJwk {
          */
         public EcPublicKeyJwk(ECPublicKey ecPublicKey, List<String> base64EncodedCertificates) {
             super("EC", base64EncodedCertificates);
-            valueX = Base64.getEncoder().encodeToString(ecPublicKey.getW().getAffineX().toByteArray());
-            valueY = Base64.getEncoder().encodeToString(ecPublicKey.getW().getAffineY().toByteArray());
+            valueX = Base64.getUrlEncoder().encodeToString(ecPublicKey.getW().getAffineX().toByteArray());
+            valueY = Base64.getUrlEncoder().encodeToString(ecPublicKey.getW().getAffineY().toByteArray());
 
             ECNamedCurveSpec curveSpec = (ECNamedCurveSpec) ecPublicKey.getParams();
             switch (curveSpec.getName()) {
@@ -113,8 +113,8 @@ public static class RsaPublicKeyJwk extends PublicKeyJwk {
          */
         public RsaPublicKeyJwk(RSAPublicKey rsaPublicKey, List<String> base64EncodedCertificates) {
             super("RSA", base64EncodedCertificates);
-            valueN = Base64.getEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray());
-            valueE = Base64.getEncoder().encodeToString(rsaPublicKey.getPublicExponent().toByteArray());
+            valueN = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray());
+            valueE = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getPublicExponent().toByteArray());
         }
     }
 
diff --git a/src/test/java/tng/trustnetwork/keydistribution/service/DidTrustListServiceTest.java b/src/test/java/tng/trustnetwork/keydistribution/service/DidTrustListServiceTest.java
index 60143d1..2c332c2 100644
--- a/src/test/java/tng/trustnetwork/keydistribution/service/DidTrustListServiceTest.java
+++ b/src/test/java/tng/trustnetwork/keydistribution/service/DidTrustListServiceTest.java
@@ -516,17 +516,17 @@ private void assertVerificationMethod(Object in, String kid, X509Certificate dsc
 
         if (dsc.getPublicKey().getAlgorithm().equals(CertificateTestUtils.SignerType.EC.getSigningAlgorithm())) {
             Assertions.assertEquals(((ECPublicKey) dsc.getPublicKey()).getW().getAffineX(),
-                                    new BigInteger(Base64.getDecoder().decode(publicKeyJwk.get("x").toString())));
+                                    new BigInteger(Base64.getUrlDecoder().decode(publicKeyJwk.get("x").toString())));
             Assertions.assertEquals(((ECPublicKey) dsc.getPublicKey()).getW().getAffineY(),
-                                    new BigInteger(Base64.getDecoder().decode(publicKeyJwk.get("y").toString())));
+                                    new BigInteger(Base64.getUrlDecoder().decode(publicKeyJwk.get("y").toString())));
             Assertions.assertEquals(CertificateTestUtils.SignerType.EC.getSigningAlgorithm(),
                                     publicKeyJwk.get("kty").toString());
             Assertions.assertEquals("P-256", publicKeyJwk.get("crv").toString());
         } else {
             Assertions.assertEquals(((RSAPublicKey) dsc.getPublicKey()).getPublicExponent(),
-                                    new BigInteger(Base64.getDecoder().decode(publicKeyJwk.get("e").toString())));
+                                    new BigInteger(Base64.getUrlDecoder().decode(publicKeyJwk.get("e").toString())));
             Assertions.assertEquals(((RSAPublicKey) dsc.getPublicKey()).getModulus(),
-                                    new BigInteger(Base64.getDecoder().decode(publicKeyJwk.get("n").toString())));
+                                    new BigInteger(Base64.getUrlDecoder().decode(publicKeyJwk.get("n").toString())));
             Assertions.assertEquals(CertificateTestUtils.SignerType.RSA.getSigningAlgorithm(),
                                     publicKeyJwk.get("kty").toString());
         }