diff --git a/templates/etc/dhrep/pid/textgrid/pid.properties.erb b/templates/etc/dhrep/pid/textgrid/pid.properties.erb
index 05362af727505ed02cfc829f07fc508ab2096864..e4fe9eb6d88f6ccabc04c501be6a32eb0cedb28a 100644
--- a/templates/etc/dhrep/pid/textgrid/pid.properties.erb
+++ b/templates/etc/dhrep/pid/textgrid/pid.properties.erb
@@ -22,15 +22,18 @@
 ###
 
 # EPIC PID service settings (GWDG)
-# TODO Remove endpooint and path as soon as pid service is merged and deployed to develop!
+# TODO Remove handleservice settings as soon as new pid service is merged and deployed to develop!
 handleservice.endpoint = <%= scope.lookupvar('dhrep::services::pid::endpoint') %>
 handleservice.path = <%= scope.lookupvar('dhrep::services::pid::path') %>
-# Handle resolver
 handleservice.prefix = <%= scope.lookupvar('dhrep::services::pid::prefix') %>
-handleservice.user = <%= scope.lookupvar('dhrep::services::pid::user') %>
-handleservice.index= <%= scope.lookupvar('dhrep::services::pid::index') %>
+handleservice.user = tgpid-test
 handleservice.pw = <%= scope.lookupvar('dhrep::services::pid::passwd') %>
 
+hs.prefix = <%= scope.lookupvar('dhrep::services::pid::prefix') %>
+hs.user = <%= scope.lookupvar('dhrep::services::pid::user') %>
+hs.index = <%= scope.lookupvar('dhrep::services::pid::index') %>
+hs.pw = <%= scope.lookupvar('dhrep::services::pid::passwd') %>
+
 # Handle resolver (read-only)
 # TODO Also remove resolver endpooint and path as soon as pid service is merged and deployed to develop!
 resolver.endpoint = https://hdl.handle.net