diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0efdb51aca9ae54739baaf7e6b4ba2803a12a7f2..8cf7f978d984406ad5b599112428ef12a9b75af3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,8 +17,8 @@ repos:
         stages: [manual]
         additional_dependencies: ['@commitlint/config-conventional@8.3.4']
         always_run: true
-  - repo: https://github.com/adithyabsk/mirrors-rubocop
-    rev: v0.91.0
+  - repo: https://github.com/rubocop-hq/rubocop
+    rev: v1.9.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -33,7 +33,7 @@ repos:
         files: ^.*\.(sh|bash|ksh)$
         types: []
         args: []
-  - repo: https://github.com/adrienverge/yamllint.git
+  - repo: https://github.com/adrienverge/yamllint
     rev: v1.23.0
     hooks:
       - id: yamllint
diff --git a/CODEOWNERS b/CODEOWNERS
index ef5bffab8c256b2fa00a7117923eb933b8c2569b..91d61559bbefbf57f6932ff950119d4f5575e7b7 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,8 +19,11 @@
 /docs/AUTHORS.rst                           @saltstack-formulas/ssf
 /docs/CHANGELOG.rst                         @saltstack-formulas/ssf
 /docs/TOFS_pattern.rst                      @saltstack-formulas/ssf
+/*/_mapdata/                                @saltstack-formulas/ssf
 /*/libsaltcli.jinja                         @saltstack-formulas/ssf
 /*/libtofs.jinja                            @saltstack-formulas/ssf
+/test/integration/**/_mapdata_spec.rb       @saltstack-formulas/ssf
+/test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf