diff --git a/build.gradle b/build.gradle
index 1f5fe6d..b3c43d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,8 +47,11 @@ artifacts {
 }
 
 
-signing {
-  sign configurations.archives
+if (project.hasProperty("signing.keyId")) {
+    apply plugin: 'signing'
+    signing {
+        sign configurations.archives
+    }
 }
 
 def isReleaseBuild() {
@@ -63,11 +66,11 @@ uploadArchives {
       beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
       repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
+        authentication(userName: findProperty('ossrhUsername'), password:  findProperty('ossrhPassword'))
       }
 
       snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
+         authentication(userName: findProperty('ossrhUsername'), password:  findProperty('ossrhPassword'))
       }
       
       pom.project {