diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4928be2a2bb..05484a0bfa3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 # Main targets of the project in various subdirectories. Order matters.
 add_subdirectory(Common)
 add_subdirectory(ALICE3)
+add_subdirectory(DPG)
 
 add_subdirectory(PWGCF)
 add_subdirectory(PWGDQ)
@@ -75,7 +76,6 @@ add_subdirectory(PWGHF)
 add_subdirectory(PWGJE)
 add_subdirectory(PWGLF)
 add_subdirectory(PWGMM)
-add_subdirectory(PWGPP)
 add_subdirectory(PWGUD)
 
 add_subdirectory(Tutorials)
diff --git a/CODEOWNERS b/CODEOWNERS
index ef3d6370351..6981c059047 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,9 +8,13 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
 # **DO NOT USE** @AliceO2Group/core for anything else. 
-* @AliceO2Group/core @jgrosseo @iarsene @ktf @alibuild
-/ALICE3  @njacazio @ginnocen @vkucera @alibuild
-/PWGCF @jgrosseo @saganatt @alibuild @victor-gonzalez
-/PWGHF  @ginnocen @vkucera @alibuild
-/EventFiltering @mpuccio @alibuild
-/PWGMM @aalkin @alibuild
+
+# @alibuild has to be in each line to allow self approval of PRs
+
+* @AliceO2Group/core @alibuild @jgrosseo @iarsene @ktf 
+/ALICE3 @alibuild @njacazio @ginnocen @vkucera 
+/DPG @alibuild @mario-krueger
+/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez
+/PWGHF @alibuild @ginnocen @vkucera 
+/EventFiltering @alibuild @mpuccio 
+/PWGMM @alibuild @aalkin 
diff --git a/PWGPP/CMakeLists.txt b/DPG/CMakeLists.txt
similarity index 100%
rename from PWGPP/CMakeLists.txt
rename to DPG/CMakeLists.txt
diff --git a/PWGPP/TableProducer/CMakeLists.txt b/DPG/TableProducer/CMakeLists.txt
similarity index 100%
rename from PWGPP/TableProducer/CMakeLists.txt
rename to DPG/TableProducer/CMakeLists.txt
diff --git a/PWGPP/TableProducer/pidMLProducer.cxx b/DPG/TableProducer/pidMLProducer.cxx
similarity index 100%
rename from PWGPP/TableProducer/pidMLProducer.cxx
rename to DPG/TableProducer/pidMLProducer.cxx
diff --git a/PWGPP/Tasks/CMakeLists.txt b/DPG/Tasks/CMakeLists.txt
similarity index 100%
rename from PWGPP/Tasks/CMakeLists.txt
rename to DPG/Tasks/CMakeLists.txt
diff --git a/PWGPP/Tasks/qaEfficiency.cxx b/DPG/Tasks/qaEfficiency.cxx
similarity index 100%
rename from PWGPP/Tasks/qaEfficiency.cxx
rename to DPG/Tasks/qaEfficiency.cxx
diff --git a/PWGPP/Tasks/qaEventTrack.cxx b/DPG/Tasks/qaEventTrack.cxx
similarity index 100%
rename from PWGPP/Tasks/qaEventTrack.cxx
rename to DPG/Tasks/qaEventTrack.cxx
diff --git a/PWGPP/Tasks/qaImpPar.cxx b/DPG/Tasks/qaImpPar.cxx
similarity index 100%
rename from PWGPP/Tasks/qaImpPar.cxx
rename to DPG/Tasks/qaImpPar.cxx