diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c64e30d..11403d51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Minor
 * [PR 397:](https://github.com/corretto/amazon-corretto-crypto-provider/pull/397) Support for Concatenation KDFs
 * [PR 399:](https://github.com/corretto/amazon-corretto-crypto-provider/pull/399) Support for Counter KDFs
+* [PR 394:](https://github.com/corretto/amazon-corretto-crypto-provider/pull/394) Support for Ed25519 DSA
 
 ## 2.4.1
 
diff --git a/build.gradle b/build.gradle
index 0ed1c2d3..c4c82e18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -375,7 +375,7 @@ task build(overwrite:true) {
                 alias: jcecertAlias,
                 jar: "${buildDir}/cmake/AmazonCorrettoCryptoProvider.jar",
                 destDir: "${buildDir}/lib",
-                storepass: jcecertPassword,
+                storepass: "${System.env.KEYSTORE_PASSWORD}" ,
                 keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
                 tsaurl: "http://timestamp.digicert.com"
             )
@@ -675,14 +675,14 @@ task fakePublish {
                 ant.signjar(
                     alias: jcecertAlias,
                     jar: "${destinationDir}/${newPrefix}-osx-x86_64.jar",
-                    storepass: jcecertPassword,
+                    storepass: "${System.env.KEYSTORE_PASSWORD}",
                     keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
                     tsaurl: "http://timestamp.digicert.com"
                 )
                 ant.signjar(
                     alias: jcecertAlias,
                     jar: "${destinationDir}/${newPrefix}-osx-aarch_64.jar",
-                    storepass: jcecertPassword,
+                    storepass: "${System.env.KEYSTORE_PASSWORD}",
                     keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
                     tsaurl: "http://timestamp.digicert.com"
                 )
@@ -691,14 +691,14 @@ task fakePublish {
             ant.signjar(
                 alias: jcecertAlias,
                 jar: "${destinationDir}/${newPrefix}-linux-aarch_64.jar",
-                storepass: jcecertPassword,
+                storepass: "${System.env.KEYSTORE_PASSWORD}" ,
                 keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
                 tsaurl: "http://timestamp.digicert.com"
             )
             ant.signjar(
                 alias: jcecertAlias,
                 jar: "${destinationDir}/${newPrefix}-linux-x86_64.jar",
-                storepass: jcecertPassword,
+                storepass: "${System.env.KEYSTORE_PASSWORD}",
                 keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
                 tsaurl: "http://timestamp.digicert.com"
             )
@@ -708,7 +708,7 @@ task fakePublish {
 
 }
 
-if (project.hasProperty('mavenUser') && project.hasProperty('jcecertAlias')) {
+if (project.hasProperty('jcecertAlias')) {
     publishing {
         publications {
             mavenJava(MavenPublication) {
diff --git a/tst/com/amazon/corretto/crypto/provider/test/CounterKdfTest.java b/tst/com/amazon/corretto/crypto/provider/test/CounterKdfTest.java
index 2d25a93b..9a415773 100644
--- a/tst/com/amazon/corretto/crypto/provider/test/CounterKdfTest.java
+++ b/tst/com/amazon/corretto/crypto/provider/test/CounterKdfTest.java
@@ -34,7 +34,7 @@
 @ResourceLock(value = TestUtil.RESOURCE_GLOBAL, mode = ResourceAccessMode.READ)
 public class CounterKdfTest {
   @Test
-  public void concatenationKdfsAreNotAvailableInFipsMode() {
+  public void counterKdfsAreNotAvailableInFipsMode() {
     Stream.of("CounterKdfWithHmacSHA256", "CounterKdfWithHmacSHA384", "CounterKdfWithHmacSHA512")
         .forEach(
             alg -> {
@@ -59,7 +59,7 @@ public void outputLengthCannotBeZeroOrNegative() {
 
   // The rest of the tests are only available in non-FIPS mode.
   @Test
-  public void concatenationKdfExpectsConcatenationKdfSpecAsKeySpec() throws Exception {
+  public void counterKdfExpectsCounterKdfSpecAsKeySpec() throws Exception {
     assumeFalse(TestUtil.isFips());
     final SecretKeyFactory skf =
         SecretKeyFactory.getInstance("CounterKdfWithHmacSHA256", TestUtil.NATIVE_PROVIDER);