diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7af0511..609c9b5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -117,7 +117,7 @@ terraform-scripts/quarkus-shedlock.tf                           @quarkiverse/qua
 terraform-scripts/quarkus-smallrye-opentracing.tf               @quarkiverse/quarkiverse-smallrye-opentracing
 terraform-scripts/quarkus-snappy.tf                             @quarkiverse/quarkiverse-snappy
 terraform-scripts/quarkus-sshd.tf                               @quarkiverse/quarkiverse-sshd
-terraform-scripts/quarkus-statiq.tf                             @quarkiverse/quarkiverse-statiq
+terraform-scripts/quarkus-roq.tf                                @quarkiverse/quarkiverse-roq
 terraform-scripts/quarkus-systemd-notify.tf                     @quarkiverse/quarkiverse-systemd-notify
 terraform-scripts/quarkus-tekton-client.tf                      @quarkiverse/quarkiverse-tekton-client
 terraform-scripts/quarkus-tika.tf                               @quarkiverse/quarkiverse-tika
diff --git a/terraform-scripts/quarkus-statiq.tf b/terraform-scripts/quarkus-roq.tf
similarity index 79%
rename from terraform-scripts/quarkus-statiq.tf
rename to terraform-scripts/quarkus-roq.tf
index ef3006c..fd5ef91 100644
--- a/terraform-scripts/quarkus-statiq.tf
+++ b/terraform-scripts/quarkus-roq.tf
@@ -1,6 +1,6 @@
 # Create repository
 resource "github_repository" "quarkus_statiq" {
-  name                   = "quarkus-statiq"
+  name                   = "quarkus-roq"
   description            = "An extension to generate/publish static pages from your Quarkus web-app"
   allow_update_branch    = true
   archive_on_destroy     = true
@@ -8,13 +8,13 @@ resource "github_repository" "quarkus_statiq" {
   has_issues             = true
   has_projects           = true
   vulnerability_alerts   = true
-  topics                 = ["quarkus-extension", "web", "static", "generate", "blog"]
+  topics                 = ["quarkus-extension", "web", "static", "ssg", "site", "generator", "generate", "blog"]
 }
 
 # Create team
 resource "github_team" "quarkus_statiq" {
-  name                      = "quarkiverse-statiq"
-  description               = "statiq team"
+  name                      = "quarkiverse-roq"
+  description               = "roq team"
   create_default_maintainer = false
   privacy                   = "closed"
   parent_team_id            = data.github_team.quarkiverse_members.id
@@ -29,7 +29,7 @@ resource "github_team_repository" "quarkus_statiq" {
 
 # Add users to the team
 resource "github_team_membership" "quarkus_statiq" {
-  for_each = { for tm in ["ia3andy"] : tm => tm }
+  for_each = { for tm in ["ia3andy", "melloware", "mcruzdev"] : tm => tm }
   team_id  = github_team.quarkus_statiq.id
   username = each.value
   role     = "maintainer"