diff --git a/software/DrupalDataPublic/instance-custom.cfg.in b/software/DrupalDataPublic/instance-custom.cfg.in
index 3da61ff481020bac4dd175da4014bb847a0e98d7..562cbf95f21f233cfc27186930c1e884df0d4d88 100644
--- a/software/DrupalDataPublic/instance-custom.cfg.in
+++ b/software/DrupalDataPublic/instance-custom.cfg.in
@@ -26,8 +26,7 @@ bytes = 16
 
 
 [drupal-init]
-recipe = iw.recipe.cmd
-on_install = True
-cmds =
+recipe = cp.recipe.cmd
+install_cmd =
    $${drupal-init-base:drush-binary} make ${datapublic:location}/build-datapublic.make DrupalDataPublic
 
diff --git a/software/DrupalDataPublic/software.cfg b/software/DrupalDataPublic/software.cfg
index 18fab94295ee5deca521419d8970ea36ebd730d1..a978015f5d86bf783c6fc17f7de87c6905006519 100644
--- a/software/DrupalDataPublic/software.cfg
+++ b/software/DrupalDataPublic/software.cfg
@@ -12,15 +12,10 @@ parts +=
   slapos-cookbook
   check-recipe
   instance
-  eggs-cmd
 
 develop =
   ${:parts-directory}/slapos.cookbook-repository
 
-[eggs-cmd]
-recipe = zc.recipe.egg
-eggs = iw.recipe.cmd
-
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
@@ -54,7 +49,7 @@ part-list = drupal-init publish-drupal-admin-password
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = bb5e657c6e49ee18e876d95f99acfca3
+md5sum = 8f9020276a584e3ed41a246d7bacfc74
 mode = 0644
 
 
@@ -64,9 +59,8 @@ url = http://ftp.drupal.org/files/projects/datapublic-7.x-1.0-beta2.tar.gz
 md5sum = fcd038ee4cc4409f21e3f99787b7ed0e
 
 [datapublic-patch]
-recipe = iw.recipe.cmd
-on_install = True
-cmds =
+recipe = cp.recipe.cmd
+install_cmd =
     sed -i "s|git@github.com:\(.*\)|https://github.com/\1|g" ${datapublic:location}/build-datapublic.make
     sed -i "s|git@github.com:\(.*\)|https://github.com/\1|g" ${datapublic:location}/datapublic.make
 
diff --git a/software/DrupalOpenPublic/instance-custom.cfg.in b/software/DrupalOpenPublic/instance-custom.cfg.in
index 9332161b801ea0d947d60e972b35da5f8cf06952..228af573f6aaca6f6174c0261391455f9f18c1e6 100644
--- a/software/DrupalOpenPublic/instance-custom.cfg.in
+++ b/software/DrupalOpenPublic/instance-custom.cfg.in
@@ -26,8 +26,7 @@ bytes = 16
 
 
 [drupal-init]
-recipe = iw.recipe.cmd
-on_install = True
-cmds =
+recipe = cp.recipe.cmd
+install_cmd =
    $${drupal-init-base:drush-binary} make --prepare-install ${openpublic:location}/profiles/openpublic/build-openpublic.make DrupalOpenPublic
 
diff --git a/software/DrupalOpenPublic/software.cfg b/software/DrupalOpenPublic/software.cfg
index 12de495a50d4832cd56a2c80cd3d0eb4c559dba4..1d32c301d0b92f565fe49ad43e7e6c7b7a6725de 100644
--- a/software/DrupalOpenPublic/software.cfg
+++ b/software/DrupalOpenPublic/software.cfg
@@ -11,15 +11,10 @@ parts +=
   slapos-cookbook
   check-recipe
   instance
-  eggs-cmd
 
 develop =
   ${:parts-directory}/slapos.cookbook-repository
 
-[eggs-cmd]
-recipe = zc.recipe.egg
-eggs = iw.recipe.cmd
-
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
@@ -53,7 +48,7 @@ part-list = drupal-init publish-drupal-admin-password
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = 1f2700b3c90cde04c573697cbe5f73c7
+md5sum = c7525d7136348ad4dbd6d6868099846d
 mode = 0644