diff --git a/build.gradle.kts b/build.gradle.kts
index 8f42ec39ea5..6adc62c3fad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
         classpath(kotlin("serialization", bootstrapKotlinVersion))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5dec7cc5987..538bdd42999 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
@@ -143,7 +143,7 @@ java {
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     implementation("com.gradle.publish:plugin-publish-plugin:0.14.0")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index 46b4316c775..47f50e8955a 100644
--- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -12,7 +12,7 @@ How to Publish
 2. Prepare publication credentials for https://kotlin.jetbrains.space/p/kotlin/packages/maven/kotlin-dependencies/org.jetbrains.kotlin/kotlin-build-gradle-plugin
 3. Execute `./gradlew -p dependencies/kotlin-build-gradle-plugin publish -PkotlinSpaceUsername=usr -PkotlinSpacePassword=token`
  */
-version = "0.0.30"
+version = "0.0.31"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt
index 377639c0ec8..061175327ff 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt
@@ -82,11 +82,9 @@ open class VersionGenerator : DefaultTask() {
     open val buildNumber = project.findProperty("build.number")?.toString()
 
     @Input
-    open val meta = (project.findProperty("konanMetaVersion") as? String ?: kotlinNativeProperties["konanMetaVersion"])?.let{ MetaVersion.valueOf(it.toString().toUpperCase()) } ?: MetaVersion.DEV
-
-    private val versionPattern = Pattern.compile(
-        "^(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-(\\p{Alpha}\\p{Alnum}*))?(?:-(\\d+))?$"
-    )
+    open val meta = (project.findProperty("konanMetaVersion") as? String
+        ?: kotlinNativeProperties["konanMetaVersion"])?.let { MetaVersion.valueOf(it.toString().toUpperCase()) }
+        ?: MetaVersion.DEV
 
     fun defaultVersionFileLocation() {
         versionFile = if (kotlinNativeVersionInResources)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ede0c161c55..e1b56b9698b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8269,6 +8269,11 @@
             <sha256 value="f0a4386823155a1e66699ecfcc6e404e2905ed4568353ebe7e461bfea598d1d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-gradle-plugin" version="0.0.31">
+         <artifact name="kotlin-build-gradle-plugin-0.0.31.jar">
+            <sha256 value="58e432984087297aa22789c314df2ebc2e03cb5c854cf79ec9b24bcb5b405ca4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-coroutines-experimental-compat" version="1.4.20">
          <artifact name="kotlin-coroutines-experimental-compat-1.4.20.jar">
             <md5 value="0f2f51103201fb7e173dce35670f625b" origin="Generated by Gradle"/>
diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle
index 70db007ee01..84e95e8517f 100644
--- a/kotlin-native/performance/build.gradle
+++ b/kotlin-native/performance/build.gradle
@@ -31,7 +31,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }
 
diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts
index 030aad494c2..53011808c30 100644
--- a/kotlin-native/performance/buildSrc/build.gradle.kts
+++ b/kotlin-native/performance/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -80,7 +80,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/performance/buildSrc/settings.gradle.kts b/kotlin-native/performance/buildSrc/settings.gradle.kts
index 5a8cfb53384..009f236f6ce 100644
--- a/kotlin-native/performance/buildSrc/settings.gradle.kts
+++ b/kotlin-native/performance/buildSrc/settings.gradle.kts
@@ -14,7 +14,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }
 
diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
index 1c0acb828ee..8f16909f50b 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
@@ -32,7 +32,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -79,7 +79,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
index 2a51d8bfc65..7f2020bd193 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
@@ -13,6 +13,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }
diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
index 861a673cc4c..027248f5240 100644
--- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -77,7 +77,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
index 2a51d8bfc65..7f2020bd193 100644
--- a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
@@ -13,6 +13,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
index f35fdb98013..2b7056b11ad 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -75,7 +75,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
index 74bc14862ed..535502ad64c 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
@@ -22,6 +22,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }
diff --git a/settings.gradle b/settings.gradle
index befbf6097e8..54295a67cb3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,7 +28,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.30")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.31")
     }
 }