diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 80713cc14c..034c70c7a3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,8 +15,8 @@
 #  *.js    @octocat @github/js
 
 
-app/Importer/*  @dmeltzer
 app/Http/Controllers/CustomFields* @uberbrady
 app/Http/Controllers/Api/CustomFields* @uberbrady
 resources/views/custom_fields/* @uberbrady
 docker/* @uberbrady
+app/Providers/SamlServiceProvider.php @uberbrady
diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
index 8b294bb741..9320437c78 100644
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -1,4 +1,18 @@
-frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*"]
-backend: ["/app", "*.php"]
-legal: ["LICENSE*", "NOTICES*"]
+frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*", "*livewire*"]
+skins: ["*.js", "*.css", "*.scss", "*.less"]
+css: ["*.css","*.scss", "*.less"]
+backend: ["/app/*", "*.php"]
+backups: ["*backup*"]
+restore: ["*restore*"]
+saml: ["*saml*"]
+scim: ["*scim*"]
+custom fields: ["*fields*", "*fieldsets*"]
+dependencies: ["composer.json"]
+consumables: ["*consumables*"]
+api: ["/app/Http/Controllers/api/*"]
+notifications: ["/app/Notifications/*"]
+importer: ["/app/Importer/*"]
+cli / artisan: ["/app/Console/*"]
+LDAP: ["*LDAP*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
+docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
 config: .github