diff --git a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java
index d396c23d..482575fe 100644
--- a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java
+++ b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java
@@ -2,6 +2,7 @@
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -15,7 +16,6 @@
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Positive;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
@@ -165,7 +165,7 @@ public Map<String,String> getProperties() {
         p.put("AccumuloRecordWriter.instanceName", instanceName);
         p.put("AccumuloRecordWriter.username", username);
         // encode the password because that's how the AccumuloRecordWriter expects it
-        byte[] encodedPassword = Base64.encodeBase64(password.getBytes(Charset.forName("UTF-8")));
+        byte[] encodedPassword = Base64.getEncoder().encode(password.getBytes(Charset.forName("UTF-8")));
         p.put("AccumuloRecordWriter.password", new String(encodedPassword, Charset.forName("UTF-8")));
         p.put("AccumuloRecordWriter.createtables", Boolean.toString(createTables));
         p.put(shardTableName + ".table.config.class", ShardTableConfigHelper.class.getCanonicalName());