diff --git a/.github/settings.yml b/.github/settings.yml
index 0e27e65..e85f377 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -5,7 +5,7 @@
 # any change of this settings.yml file is detected by the GitHub App and
 # the settings of this repository are updated immediately.
 #
-_extends: repo-settings:.github/common-settings.yml
+_extends: repo-settings:.github/common-settings-v2.yml
 
 # repo-specific settings
 #
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5013ba2..94e7a4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,21 +1,16 @@
 name: CI-Pipeline
 
-# Controls when the workflow will run
+# Controls when the workflow will run, when comment is created
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
+  issue_comment:
+    types:
+      - created
 jobs:
   call-terraform-ci-pipeline:
-    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci.yml@v1.14.0
+    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.14.0
     secrets: inherit
     with:
+        craSCCv2: true
         craTarget: "examples/new-resource-group"
-        craGoalIgnoreFile: "cra-tf-validate-ignore-goals.json"
+        craRuleIgnoreFile: "cra-tf-validate-ignore-rules.json"
         craEnvironmentVariables: "TF_VAR_resource_group_name=new-resource-group"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dc456e5..33b1634 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,17 +1,12 @@
 name: Release-Pipeline
 
+# Trigger on push(merge) to main branch
 on:
-  workflow_run:
-    workflows: [CI-Pipeline]
-    branches: [main]
-    types:
-      - completed
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   call-terraform-release-pipeline:
-    if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
     uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.14.0
     secrets: inherit
diff --git a/README.md b/README.md
index 8c8c9ae..3c56c52 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 
 <!-- UPDATE BADGE: Update the link for the badge below-->
 [![Stable (With quality checks)](https://img.shields.io/badge/Status-Stable%20(With%20quality%20checks)-green)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
-[![Build Status](https://github.com/terraform-ibm-modules/terraform-ibm-resource-group/actions/workflows/ci.yml/badge.svg)](https://github.com/terraform-ibm-modules/terraform-ibm-resource-group/actions/workflows/ci.yml)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![latest release](https://img.shields.io/github/v/release/terraform-ibm-modules/terraform-ibm-resource-group?logo=GitHub&sort=semver)](https://github.com/terraform-ibm-modules/terraform-ibm-resource-group/releases/latest)
 [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
diff --git a/cra-tf-validate-ignore-goals.json b/cra-tf-validate-ignore-goals.json
deleted file mode 100644
index 0e8ac13..0000000
--- a/cra-tf-validate-ignore-goals.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "scc_goals": []
-}
diff --git a/cra-tf-validate-ignore-rules.json b/cra-tf-validate-ignore-rules.json
new file mode 100644
index 0000000..8ff2fd8
--- /dev/null
+++ b/cra-tf-validate-ignore-rules.json
@@ -0,0 +1,3 @@
+{
+  "scc_rules": []
+}