diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml
index 58c5968..25a0578 100644
--- a/smartgears/dm_pool_manager/defaults/main.yml
+++ b/smartgears/dm_pool_manager/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 dm_pool_manager_install: False
 dm_pool_manager_upgrade: False
-dm_pool_manager_version: 2.1.0-4.7.0-155090
+dm_pool_manager_version: 2.1.0-4.7.0-155107
 dm_pool_manager_name: dataminer-pool-manager
 
 dm_pool_manager_group_id: org.gcube.dataAnalysis
@@ -21,5 +21,5 @@ svn_pass: "{{ vault_svn_pass }}"
 prod_instance: False
 proto_instance: False
 preprod_instance: False
-
+dev_instance: False
 
diff --git a/smartgears/dm_pool_manager/templates/service.properties.j2 b/smartgears/dm_pool_manager/templates/service.properties.j2
index 8efdbd1..d90e264 100644
--- a/smartgears/dm_pool_manager/templates/service.properties.j2
+++ b/smartgears/dm_pool_manager/templates/service.properties.j2
@@ -7,16 +7,25 @@ svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms
 #STAGE
 {% if prod_instance %}
 STAGE_GHOST={{ dm_pool_prod_ghost_instance }}
+svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
+svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/software
+svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/prod/software
 {% elif proto_instance %}
 STAGE_GHOST={{ dm_pool_proto_ghost_instance }}
+svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms
+svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/software
+svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/proto/software
 {% elif preprod_instance %}
 STAGE_GHOST={{ dm_pool_preprod_ghost_instance }}
+svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/algorithms
+svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/software
+svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/preprod/software
 {% else %}
 STAGE_GHOST={{ dm_pool_dev_ghost_instance }}
-{% endif %}
 svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms
 svn.stage.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/software
-svn.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/dev/software
+svn.stage.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/dev/software
+{% endif %}
 svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
 svn.stage.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
 svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt
@@ -28,5 +37,21 @@ svn.stage.deps-python =
 svn.stage.deps-windows-compiled = 
 
 #PROD
+{% if prod_instance %}
+PROD_GHOST={{ dm_pool_prod_ghost_instance }}
+{% else %}
+PROD_GHOST=
+{% endif %}
 svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
 svn.prod.software.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/software
+svn.prod.algo.ghost.repo = /home/gcube/wps_algorithms/algorithms/prod/software
+
+svn.prod.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
+svn.prod.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
+svn.prod.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt
+svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt, /trunk/data-analysis/RConfiguration/RPackagesManagement/r_github_pkgs.txt 
+svn.prod.deps-java =
+svn.prod.deps-knime-workflow = 
+svn.prod.deps-octave = 
+svn.prod.deps-python = 
+svn.prod.deps-windows-compiled =