diff --git a/scm-packaging/deb/build.gradle b/scm-packaging/deb/build.gradle
index 31b49984d8..62b7d03aa3 100644
--- a/scm-packaging/deb/build.gradle
+++ b/scm-packaging/deb/build.gradle
@@ -65,16 +65,16 @@ task deb(type: Deb) {
   preInstallFile file('src/main/scripts/preinst')
   postInstallFile file('src/main/scripts/postinst')
 
-  if (project.hasProperty("gpg.scm.keyring")) {
-    signingKeyRingFile file(project.property("gpg.scm.keyring"))
+  if (project.hasProperty("signing.keyId")) {
+    signingKeyId project.property("signing.keyId")
   }
 
-  if (project.hasProperty("gpg.scm.key")) {
-    signingKeyId project.property("gpg.scm.key")
+  if (project.hasProperty("signing.password")) {
+    signingKeyPassphrase project.property("signing.password")
   }
 
-  if (project.hasProperty("gpg.scm.passphrase")) {
-    signingKeyPassphrase project.property("gpg.scm.passphrase")
+  if (project.hasProperty("signing.secretKeyRingFile")) {
+    signingKeyRingFile file(project.property("signing.secretKeyRingFile"))
   }
 
   VersionNumber version = VersionNumber.parse(project.version)
diff --git a/scm-packaging/rpm/build.gradle b/scm-packaging/rpm/build.gradle
index 3884d8eab6..799c1f87d3 100644
--- a/scm-packaging/rpm/build.gradle
+++ b/scm-packaging/rpm/build.gradle
@@ -84,16 +84,16 @@ task rpm(type: Rpm) {
   preInstall file('src/main/scripts/before-installation.sh')
   postInstall file('src/main/scripts/after-installation.sh')
 
-  if (project.hasProperty("gpg.scm.keyring")) {
-    signingKeyRingFile file(project.property("gpg.scm.keyring"))
+  if (project.hasProperty("signing.keyId")) {
+    signingKeyId project.property("signing.keyId")
   }
 
-  if (project.hasProperty("gpg.scm.key")) {
-    signingKeyId project.property("gpg.scm.key")
+  if (project.hasProperty("signing.password")) {
+    signingKeyPassphrase project.property("signing.password")
   }
 
-  if (project.hasProperty("gpg.scm.passphrase")) {
-    signingKeyPassphrase project.property("gpg.scm.passphrase")
+  if (project.hasProperty("signing.secretKeyRingFile")) {
+    signingKeyRingFile file(project.property("signing.secretKeyRingFile"))
   }
 
   VersionNumber version = VersionNumber.parse(project.version)