diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg
index b2cebebccbb072a5327ddc403272f862ac8e6548..1a3bc72471d7323a888acaffbeff11fd42cc850b 100644
--- a/software/kvm/common.cfg
+++ b/software/kvm/common.cfg
@@ -87,7 +87,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 061604d32cc626352dc3d221bdeaf804
+md5sum = d71c718cd5c4c17087bfa44684b7db47
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
diff --git a/software/kvm/instance.cfg.in b/software/kvm/instance.cfg.in
index 2043067cccd77dcab2b87877abb05a0e5b1126e7..d8cb73e95266de1ea9af4038f7ca1ba1243c8664 100644
--- a/software/kvm/instance.cfg.in
+++ b/software/kvm/instance.cfg.in
@@ -106,8 +106,8 @@ context =
     raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
     raw template_monitor ${monitor2-template:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
-template-parts-destination = ${template-parts:destination}
-template-replicated-destination = ${template-replicated:destination}
+template-parts-destination = ${template-parts:target}
+template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
               file replicated :template-replicated-destination
 mode = 0644
diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg
index c5fd80e224cb59eeead14bfaec242f3da4472eab..35f971efa9beba1c3204f479e3a7973f8fb57223 100644
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 06107f93ebe78905c957a4c4fc4edf16
+md5sum = 80aa32f7b691296b688a469e776db5b5
 
 [template-runner]
 filename = instance-runner.cfg
diff --git a/software/slaprunner/instance.cfg b/software/slaprunner/instance.cfg
index 27f38b07f5d32537227177c726c67491d3fbf858..a0504ff4368ae248ba2a8d465786f47e98fd1735 100644
--- a/software/slaprunner/instance.cfg
+++ b/software/slaprunner/instance.cfg
@@ -42,8 +42,8 @@ context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
           key slapparameter_dict slap-configuration:configuration
-template-parts-destination = ${template-parts:destination}
-template-replicated-destination = ${template-replicated:destination}
+template-parts-destination = ${template-parts:target}
+template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
               file replicated :template-replicated-destination
 mode = 0644
@@ -80,4 +80,4 @@ computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
\ No newline at end of file
+cert = $${slap-connection:cert-file}
diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg
index 8f146514bda4e7feb82f52c126c2a5dbbee5526d..befd952d311d2a1216fe36f3014de951fa8ae5f6 100644
--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -69,13 +69,11 @@ mode = 0644
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
 mode = 0644
-destination = ${buildout:directory}/template-replicated.cfg.in
 
 [template-parts]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-parts.cfg.in
 mode = 0644
-destination = ${buildout:directory}/template-parts.cfg.in
 
 [template-resilient-templates]
 recipe = slapos.recipe.template
@@ -96,7 +94,6 @@ output = ${buildout:directory}/instance-frozen.cfg
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/resilient-web-takeover-cgi-script.py.in
 mode = 0644
-destination = ${buildout:directory}/resilient-web-takeover-cgi-script.py.in
 
 # Provide an empty wrapper
 [template-wrapper]
diff --git a/stack/resilient/buildout.hash.cfg b/stack/resilient/buildout.hash.cfg
index 8e64a9c2479ae0d0b5a8649accfa47234464d519..0d7f99e5632782e5393aacf2e3ff29c674973632 100644
--- a/stack/resilient/buildout.hash.cfg
+++ b/stack/resilient/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 809f4b0b3c4976b3dae8d579f6daa615
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
-md5sum = af85dfe8d281f3458be3de46f8e6a2b4
+md5sum = 1a31882707732f224e014c1b744df177
 
 [pbsready-export]
 filename = pbsready-export.cfg.in
diff --git a/stack/resilient/pbsready-import.cfg.in b/stack/resilient/pbsready-import.cfg.in
index 81a4806ad5cdfe662ec72ecf7c7488579e27b638..6d9bc03d0b669c3f912d8932618af7962262fbc2 100644
--- a/stack/resilient/pbsready-import.cfg.in
+++ b/stack/resilient/pbsready-import.cfg.in
@@ -125,7 +125,7 @@ bytes = 8
 
 [resilient-web-takeover-cgi-script]
 recipe = collective.recipe.template
-input = ${resilient-web-takeover-cgi-script-download:destination}
+input = ${resilient-web-takeover-cgi-script-download:target}
 output = $${directory:cgi-bin}/web-takeover.cgi
 password = $${resilient-web-takeover-password:passwd}
 mode = 700