diff --git a/.github/actions/test-ruby/action.yml b/.github/actions/test-ruby/action.yml
index 3c261a85..a770d4f5 100644
--- a/.github/actions/test-ruby/action.yml
+++ b/.github/actions/test-ruby/action.yml
@@ -58,10 +58,6 @@ runs:
       env:
         ENV_PATH: ${{ inputs.ENV_PATH }}
 
-    - run: |
-        cat .env
-      shell: bash
-
     - name: Run zeitwerk chek
       if: inputs.ZEITWERK == 'true'
       run: |
@@ -74,35 +70,46 @@ runs:
         bundle exec brakeman --skip-files bundle/ -q -w2 -f json > tmp/brakeman.json || exit 0
       shell: bash
 
-#     - name: Publish report
-#       if: inputs.BRAKEMAN == 'true'
-#       uses: devmasx/brakeman-linter-action@v1.0.0
-#       env:
-#         GITHUB_TOKEN: ${{github.token}}
-#         REPORT_PATH: tmp/brakeman.json
-
-    - name: Install Reviewdog
-      if: inputs.RUBOCOP == 'true'
-      uses: reviewdog/action-setup@v1
+    # - name: Publish report
+    #   if: inputs.BRAKEMAN == 'true'
+    #   uses: devmasx/brakeman-linter-action@v1.0.0
+    #   env:
+    #     GITHUB_TOKEN: ${{github.token}}
+    #     REPORT_PATH: tmp/brakeman.json
+
+    # - name: Install Reviewdog
+    #   if: inputs.RUBOCOP == 'true'
+    #   uses: reviewdog/action-setup@v1
+
+    # - name: Generate RuboCop report
+    #   if: inputs.RUBOCOP == 'true'
+    #   uses: d-lebed/rubocop-run-action@v0.10.0
+    #   with:
+    #     options: --format=RdjsonFormatter --out=reviewdog-report.json --format=progress
+    #     rdjson_formatter: ${{ inputs.REVIEWDOG }}
+    #     preserve_exitcode: false
+
+    # - name: Post Review
+    #   if: inputs.REVIEWDOG == 'true' && inputs.RUBOCOP == 'true'
+    #   env:
+    #     REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
+    #   run: |
+    #     reviewdog \
+    #       -reporter=github-pr-review \
+    #       -filter-mode=added \
+    #       -f=rdjson \
+    #       < reviewdog-report.json
+    #   shell: bash
+
+    - name: Read RuboCop config
+      run: |
+        cat .rubocop.yml
+      shell: bash
 
     - name: Generate RuboCop report
       if: inputs.RUBOCOP == 'true'
-      uses: d-lebed/rubocop-run-action@v0.10.0
-      with:
-        options: --format=RdjsonFormatter --out=reviewdog-report.json --format=progress
-        rdjson_formatter: ${{ inputs.REVIEWDOG }}
-        preserve_exitcode: false
-
-    - name: Post Review
-      if: inputs.REVIEWDOG == 'true' && inputs.RUBOCOP == 'true'
-      env:
-        REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
       run: |
-        reviewdog \
-          -reporter=github-pr-review \
-          -filter-mode=added \
-          -f=rdjson \
-          < reviewdog-report.json
+        bundle exec rubocop
       shell: bash
 
     - name: Split the input variable RUBY_RAKE_COMMANDS into an array and execute
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 7bd9acbc..401189bd 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -196,7 +196,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: signalwire/actions-template
-        ref: main 
+        ref: ryanwi/rubocop
         path: actions
         
     - uses: ./actions/.github/actions/gpg
diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
index 3ee852d4..cb6c1529 100644
--- a/.github/workflows/ci-check.yml
+++ b/.github/workflows/ci-check.yml
@@ -123,7 +123,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: signalwire/actions-template
-        ref: main
+        ref: ryanwi/rubocop
         path: actions
 
     - name: Up Test dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8d932fc..f3e7fee5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -176,7 +176,7 @@ jobs:
 
   CHECK:
     name: CI
-    uses: signalwire/actions-template/.github/workflows/ci-check.yml@main
+    uses: signalwire/actions-template/.github/workflows/ci-check.yml@ryanwi/rubocop
     with:
       ENVIRONMENT: ${{ inputs.ENVIRONMENT }}
       PROJECT_NAME: ${{ inputs.PROJECT_NAME }}
@@ -209,7 +209,7 @@ jobs:
   BUILD:
     name: BUILD
     needs: CHECK
-    uses: signalwire/actions-template/.github/workflows/ci-build.yml@main
+    uses: signalwire/actions-template/.github/workflows/ci-build.yml@ryanwi/rubocop
     with:
       ENVIRONMENT: ${{ inputs.ENVIRONMENT }}
       PROJECT_NAME: ${{ inputs.PROJECT_NAME }}