diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 78b6781ee..bdb3124de 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -57,10 +57,9 @@ SonarExecuteScan*                               @CCFenner
 
 abapAddonAssemblyKit*                           @SAP/jenkins-library-abap
 AbapAddonAssemblyKit*                           @SAP/jenkins-library-abap
-abapEnvironmentAssemble*                        @SAP/jenkins-library-abap
-AbapEnvironmentAssemble*                        @SAP/jenkins-library-abap
-abapEnvironmentBuild*                           @SAP/jenkins-library-abap
-AbapEnvironmentBuild*                           @SAP/jenkins-library-abap
+abapEnvironment*                                @SAP/jenkins-library-abap
+AbapEnvironment*                                @SAP/jenkins-library-abap
+
 
 #####################
 # Integration tests #
@@ -83,6 +82,7 @@ integration/testdata/TestCnbIntegration/        @SAP/jenkins-library-cnb
 /pkg/orchestrator/                              @inf2381
 
 /pkg/abap/                                      @SAP/jenkins-library-abap
+/pkg/abaputils/                                 @SAP/jenkins-library-abap
 
 ####################
 # Misc             #