diff --git a/Kores-DSL/build.gradle b/Kores-DSL/build.gradle
index 5083b2a4b..efd3fa95f 100644
--- a/Kores-DSL/build.gradle
+++ b/Kores-DSL/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'license'
 
 apply plugin: 'maven-publish'
 
-version '4.1.7.base'
+version '4.1.8.base'
 
 jar {
     manifest {
diff --git a/build.gradle b/build.gradle
index 1bd024df7..acdd762e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,6 @@ buildscript {
 }
 
 group 'com.github.koresframework'
-version '4.1.7.base'
+version '4.1.8.base'
 
 apply from: 'gradle/common.gradle'
diff --git a/gradle/common.gradle b/gradle/common.gradle
index e84f53480..26a77e249 100644
--- a/gradle/common.gradle
+++ b/gradle/common.gradle
@@ -22,8 +22,10 @@ defaultTasks 'licenseFormat', 'build', 'test', 'jar', 'shadowJar'
 
 sourceCompatibility = 16
 
-def GITHUB_USERNAME = project.findProperty("USERNAME") ?: System.getenv("USERNAME")
-def GITHUB_PAT = project.findProperty("TOKEN") ?: System.getenv("TOKEN")
+def userNameProp = project.findProperty("USERNAME")
+def patProp = project.findProperty("TOKEN")
+def GITHUB_USERNAME = (userNameProp == null || userNameProp.isEmpty()) ? System.getenv("USERNAME") : userNameProp
+def GITHUB_PAT = (patProp == null || patProp.isEmpty()) ? System.getenv("TOKEN") : patProp
 
 repositories {
     mavenCentral()