diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
index ea79ed7130..a98e928d0a 100644
--- a/gradle-plugins/build.gradle.kts
+++ b/gradle-plugins/build.gradle.kts
@@ -3,7 +3,7 @@ import com.gradle.publish.PluginBundleExtension
 plugins {
     // __KOTLIN_COMPOSE_VERSION__
     kotlin("jvm") version "1.5.10" apply false
-    id("com.gradle.plugin-publish") version "0.15.0" apply false
+    id("com.gradle.plugin-publish") version "0.16.0" apply false
 }
 
 subprojects {
@@ -99,6 +99,7 @@ fun Project.configureGradlePlugin(
         vcsUrl = BuildProperties.vcs
         website = BuildProperties.website
         description = publicationConfig.description
+        tags = gradlePluginConfig.pluginPortalTags
     }
 
     // gradle plugin definition (relates to gradlePlugin extension block from java-gradle-plugin)
diff --git a/gradle-plugins/buildSrc/src/main/kotlin/GradlePluginConfigExtension.kt b/gradle-plugins/buildSrc/src/main/kotlin/GradlePluginConfigExtension.kt
index 275b137479..a99d93fefc 100644
--- a/gradle-plugins/buildSrc/src/main/kotlin/GradlePluginConfigExtension.kt
+++ b/gradle-plugins/buildSrc/src/main/kotlin/GradlePluginConfigExtension.kt
@@ -9,6 +9,7 @@ import org.gradle.api.Project
 open class GradlePluginConfigExtension {
     lateinit var pluginId: String
     lateinit var implementationClass: String
+    var pluginPortalTags: Collection<String> = emptyList()
 }
 
 val Project.gradlePluginConfig: GradlePluginConfigExtension?
diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
index 951e4be8fb..c413c9a685 100644
--- a/gradle-plugins/compose/build.gradle.kts
+++ b/gradle-plugins/compose/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 gradlePluginConfig {
     pluginId = "org.jetbrains.compose"
     implementationClass = "org.jetbrains.compose.ComposePlugin"
+    pluginPortalTags = listOf("ui-framework")
 }
 
 mavenPublicationConfig {