diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6ce793f..4c5803d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/org/liquibase/gradle/LiquibaseTask.groovy b/src/main/groovy/org/liquibase/gradle/LiquibaseTask.groovy
index 1b972e1..1c4d58b 100644
--- a/src/main/groovy/org/liquibase/gradle/LiquibaseTask.groovy
+++ b/src/main/groovy/org/liquibase/gradle/LiquibaseTask.groovy
@@ -17,6 +17,7 @@
 
 package org.liquibase.gradle
 
+import org.gradle.api.Task
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
@@ -137,11 +138,18 @@ class LiquibaseTask extends JavaExec {
 //		configureLogging(classpath, project.liquibase.mainClassName)
 //		setSystemProperties(["mainClass": project.liquibase.mainClassName])
 //		setMain("org.liquibase.gradle.LiquibaseRunner")
-		setMain(project.liquibase.mainClassName)
 		// "inherit" the system properties from the Gradle JVM.
 		systemProperties System.properties
 		println "liquibase-plugin: Running the '${activity.name}' activity..."
 		project.logger.debug("liquibase-plugin: Running 'liquibase ${args.join(" ")}'")
 		super.exec()
 	}
+
+	@Override
+	Task configure(Closure closure) {
+		conventionMapping("main") {
+			project.extensions.findByType(LiquibaseExtension.class).mainClassName
+		}
+		return super.configure(closure)
+	}
 }