diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 790bf810f..8d0f5f420 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-* @stackrox/infra
+* @stackrox/infra @rhacs-bot
 ui/ @stackrox/ui
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9dcbb8ade..893142f6c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,36 +10,36 @@ updates:
     schedule:
       interval: weekly
       day: wednesday
-    assignees:
-      - stackrox/ui-dep-updaters
-      - stackrox/infra
 
   - package-ecosystem: gomod
     directory: /
     schedule:
       interval: weekly
       day: wednesday
-    assignees:
-      - stackrox/infra
+    # Overriding the default labels plus auto-merge
     labels:
       - auto-merge
+      - dependencies
+      - go
 
   - package-ecosystem: docker
     directory: image/
     schedule:
       interval: weekly
       day: wednesday
-    assignees:
-      - stackrox/infra
+    # Overriding the default labels plus auto-merge
     labels:
       - auto-merge
+      - dependencies
+      - docker
 
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly
       day: wednesday
-    assignees:
-      - stackrox/infra
+    # Overriding the default labels plus auto-merge
     labels:
       - auto-merge
+      - dependencies
+      - github-actions