diff --git a/terraform-scripts/main.tf b/terraform-scripts/main.tf
index 806dcd2..f5258c3 100644
--- a/terraform-scripts/main.tf
+++ b/terraform-scripts/main.tf
@@ -96,4 +96,8 @@ module "onecx-admin" {
 
 module "onecx-hello-world" {
   source = "./products/onecx-hello-world"
+}
+
+module "onecx-service" {
+  source = "./products/onecx-service"
 }
\ No newline at end of file
diff --git a/terraform-scripts/products/onecx-local/product.tf b/terraform-scripts/products/onecx-local/product.tf
index 6044942..0009c3e 100644
--- a/terraform-scripts/products/onecx-local/product.tf
+++ b/terraform-scripts/products/onecx-local/product.tf
@@ -13,7 +13,7 @@ module "onecx-local-env" {
   source = "../../modules/base"
   repository_name        = "onecx-local-env"
   repository_description = "OneCX Local Environment Setup"
-  homepage_url           = "https://onecx.github.io/docs/onecx-local-env/current/general"
+  homepage_url           = "https://onecx.github.io/docs/documentation/current/onecx-local-env/index.html"
   topics                 = ["docker", "local-env", "local", "environment"]
   team_id                = module.onecx-local.team_id
   team_name              = module.onecx-local.team_name
@@ -24,6 +24,7 @@ module "onecx-local-env-cli" {
   source = "../../modules/base"
   repository_name        = "onecx-local-env-cli"
   repository_description = "OneCX Local Environment CLI"
+  homepage_url           = "https://onecx.github.io/docs/documentation/current/onecx-local-env/index.html"
   topics                 = ["cli", "local-env", "local", "environment"]
   team_id                = module.onecx-local.team_id
   team_name              = module.onecx-local.team_name
diff --git a/terraform-scripts/products/onecx-service/product.tf b/terraform-scripts/products/onecx-service/product.tf
new file mode 100644
index 0000000..5237634
--- /dev/null
+++ b/terraform-scripts/products/onecx-service/product.tf
@@ -0,0 +1,47 @@
+
+# TEAM ONECX-SERVICE
+module "onecx-service-team" {
+  source = "../../modules/github/team"
+  team_name        = "onecx-service"
+  team_description = "OneCX Service team"
+  team_members_file_path   = "products/onecx-service/team.csv"
+}
+
+# ONECX-SERVICE
+module "onecx-service" {
+  source = "../../modules/product"
+  repository_name        = "onecx-service"
+  repository_description = "OneCX Service"
+  homepage_url           = "https://onecx.github.io/docs/onecx-service/current/general"
+  topics                 = ["product", "service"]
+  team_id                = module.onecx-service-team.team_id
+  team_name              = module.onecx-service-team.team_name
+}
+
+# ONECX-SERVICE-REDIRECT
+module "onecx-service-redirect" {
+  source = "../../modules/quarkus"
+  repository_name        = "onecx-service-redirect"
+  repository_description = "OneCX Service Smart Redirect"
+  homepage_url           = "https://onecx.github.io/docs/onecx-service/current/onecx-service-redirect"
+  topics                 = ["java", "quarkus", "redirect", "service"]
+  team_id                = module.onecx-service-team.team_id
+}
+
+# ONECX-SERVICE-AUTH-UI
+module "onecx-service-auth-ui" {
+  source = "../../modules/angular"
+  repository_name        = "onecx-service-auth-ui"
+  repository_description = "OneCX Service Custom Auth UI"
+  topics                 = ["angular", "ui", "service", "auth"]
+  team_id                = module.onecx-service-team.team_id
+}
+
+# ONECX-SERVICE-AUTH-BFF
+module "onecx-service-auth-bff" {
+  source = "../../modules/quarkus"
+  repository_name        = "onecx-service-auth-bff"
+  repository_description = "OneCX Service Custom Auth Backend-For-Frontend"
+  topics                 = ["java", "quarkus", "bff", "service", "auth"]
+  team_id                = module.onecx-service-team.team_id
+}
\ No newline at end of file
diff --git a/terraform-scripts/products/onecx-service/team.csv b/terraform-scripts/products/onecx-service/team.csv
new file mode 100644
index 0000000..db4d362
--- /dev/null
+++ b/terraform-scripts/products/onecx-service/team.csv
@@ -0,0 +1,7 @@
+username,role
+andrejpetras,maintainer
+milanhorvath,maintainer
+HenryTaeschner,maintainer
+michaelgloeckner,maintainer
+SchettlerKoehler,maintainer
+JordenReuter,maintainer
\ No newline at end of file