diff --git a/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt b/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt
index e14b9d60..23722bd5 100644
--- a/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt
+++ b/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt
@@ -17,7 +17,7 @@ import co.touchlab.kmmbridge.findStringProperty
 import org.gradle.api.Project
 
 internal val Project.githubPublishTokenOrNull: String?
-    get() = project.property("GITHUB_PUBLISH_TOKEN") as String?
+    get() = project.findStringProperty("GITHUB_PUBLISH_TOKEN")
 
 internal val Project.githubPublishUser: String?
     get() = project.findStringProperty("GITHUB_PUBLISH_USER")
@@ -37,10 +37,8 @@ internal val Project.githubRepoOrNull: String?
 
 internal val Project.githubPublishToken
     get() =
-        (
-            project.property("GITHUB_PUBLISH_TOKEN")
-                ?: throw IllegalArgumentException("KMMBridge Github operations need property GITHUB_PUBLISH_TOKEN")
-            ) as String
+        project.findStringProperty("GITHUB_PUBLISH_TOKEN")
+            ?: throw IllegalArgumentException("KMMBridge Github operations need property GITHUB_PUBLISH_TOKEN")
 
 internal val Project.githubArtifactReleaseId
     get() = project.findStringProperty("GITHUB_ARTIFACT_RELEASE_ID")
diff --git a/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt b/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt
index 75215f87..9c7b8e3f 100644
--- a/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt
+++ b/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt
@@ -18,7 +18,7 @@ import java.net.URLEncoder
 import org.gradle.api.Project
 
 internal val Project.gitLabPublishTokenOrNull: String?
-    get() = project.property("GITLAB_PUBLISH_TOKEN") as String?
+    get() = project.findStringProperty("GITLAB_PUBLISH_TOKEN")
 
 internal val Project.gitLabPublishUser: String?
     get() = project.findStringProperty("GITLAB_PUBLISH_USER")
diff --git a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt
index abd9c23c..054ce399 100644
--- a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt
+++ b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt
@@ -14,17 +14,9 @@
 package co.touchlab.kmmbridge
 
 import org.gradle.api.Project
-import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.kotlin.dsl.getByType
 
 val Project.publishingExtension get() = extensions.getByType<PublishingExtension>()
 
-fun Project.findStringProperty(name: String): String? {
-    rootProject.extensions.getByType(ExtraPropertiesExtension::class.java).run {
-        if (has(name)) {
-            return get(name).toString()
-        }
-    }
-    return null
-}
+fun Project.findStringProperty(name: String): String? = providers.gradleProperty(name).getOrNull()