diff --git a/client/build.gradle b/client/build.gradle
index 2df24f77fe..75211331fb 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -84,8 +84,8 @@ publishing {
             name = "Snapshots"
             url = "https://central.sonatype.com/repository/maven-snapshots/"
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username System.getenv("SONATYPE_USERNAME")
+                password System.getenv("SONATYPE_PASSWORD")
             }
         }
     }
diff --git a/common/build.gradle b/common/build.gradle
index 24cc63046f..24a52061b2 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -119,8 +119,8 @@ publishing {
             name = "Snapshots" //  optional target repository name
             url = "https://central.sonatype.com/repository/maven-snapshots/"
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username System.getenv("SONATYPE_USERNAME")
+                password System.getenv("SONATYPE_PASSWORD")
             }
         }
     }
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 474f62c1b1..47214b332c 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -130,8 +130,8 @@ publishing {
             name = "Snapshots"
             url = "https://central.sonatype.com/repository/maven-snapshots/"
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username System.getenv("SONATYPE_USERNAME")
+                password System.getenv("SONATYPE_PASSWORD")
             }
         }
     }
diff --git a/spi/build.gradle b/spi/build.gradle
index c617131c2a..a341b0632e 100644
--- a/spi/build.gradle
+++ b/spi/build.gradle
@@ -99,8 +99,8 @@ publishing {
             name = "Snapshots" //  optional target repository name
             url = "https://central.sonatype.com/repository/maven-snapshots/"
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username System.getenv("SONATYPE_USERNAME")
+                password System.getenv("SONATYPE_PASSWORD")
             }
         }
     }