diff --git a/component/cloudooo/buildout.cfg b/component/cloudooo/buildout.cfg
old mode 100755
new mode 100644
index 724e3d692b6bb051ac80619cbd35132f187e3c5c..f601aaec8d7cafc4a1257da286d7612506d49716
--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
@@ -22,7 +22,6 @@ git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
diff --git a/component/lxml-python/buildout.cfg b/component/lxml-python/buildout.cfg
index 22e17f3f2ac132796f6fc6416b4b09fd712776b8..763fea5569a113deb88715a96e7275273957ac15 100644
--- a/component/lxml-python/buildout.cfg
+++ b/component/lxml-python/buildout.cfg
@@ -12,7 +12,6 @@ PATH = ${libxslt:location}/bin:%(PATH)s
 
 [lxml-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = lxml
 
 rpath =
diff --git a/component/m2crypto/buildout.cfg b/component/m2crypto/buildout.cfg
index 7236e66f44417c119a34bff6d5364dcc1187cee6..1895f618f93924c60f3dd7f428ecf66e976c2f0a 100644
--- a/component/m2crypto/buildout.cfg
+++ b/component/m2crypto/buildout.cfg
@@ -10,7 +10,6 @@ parts =
 
 [M2Crypto]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = M2Crypto
 environment = M2Crypto-env
 rpath =
diff --git a/component/mysql-python/buildout.cfg b/component/mysql-python/buildout.cfg
index ffe3bcfc07088dad8582f23735c3e4c8ef5b6529..65961c9ffce5a0a1a97309a893baf6acf2de5843 100644
--- a/component/mysql-python/buildout.cfg
+++ b/component/mysql-python/buildout.cfg
@@ -12,7 +12,6 @@ PATH =${mariadb:location}/bin:%(PATH)s
 
 [mysql-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = MySQL-python
 depends =
   ${mariadb:version}
diff --git a/component/pil-python/buildout.cfg b/component/pil-python/buildout.cfg
index c5255eb4d8469d8aac94bace9a31b2ea36246a60..95cca15b6ef7441133e0e9fa87d3907b35a3a055 100644
--- a/component/pil-python/buildout.cfg
+++ b/component/pil-python/buildout.cfg
@@ -9,7 +9,6 @@ parts =
 
 [pil-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = PIL
 include-dirs =
   ${freetype:location}/include
diff --git a/component/pycrypto-python/buildout.cfg b/component/pycrypto-python/buildout.cfg
index 8ff4a95687a0972d5b9969a8f5ddbd781c1006cb..835f9c884f6380ce57f1962da49c5c957850c685 100644
--- a/component/pycrypto-python/buildout.cfg
+++ b/component/pycrypto-python/buildout.cfg
@@ -9,7 +9,6 @@ versions = versions
 
 [pycrypto-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = pycrypto
 include-dirs =
   ${gmp:location}/include
diff --git a/component/pysvn-python/buildout.cfg b/component/pysvn-python/buildout.cfg
index c1603f1584b43b82b219be4f5c3d11498cb6ed90..f128a61108269a50afd1393957d0816faf4f7f45 100644
--- a/component/pysvn-python/buildout.cfg
+++ b/component/pysvn-python/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 
 [pysvn-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg =
   pysvn
 include-dirs =
diff --git a/component/python-cffi/buildout.cfg b/component/python-cffi/buildout.cfg
index 85f73e43d22dcb402878ecc3c17334204dc5057b..0662d91658bf2f4a4f58192929784e84d2f6ec5b 100644
--- a/component/python-cffi/buildout.cfg
+++ b/component/python-cffi/buildout.cfg
@@ -8,7 +8,6 @@ parts =
 
 [python-cffi]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = cffi
 environment = python-cffi-env
 library-dirs =
diff --git a/component/python-cryptography/buildout.cfg b/component/python-cryptography/buildout.cfg
index 24a65ace16b0bc8100652ed67a8a940716a6cc66..b1f8ca604b6fb840e0c1a8ee037da1d83d3e36c3 100644
--- a/component/python-cryptography/buildout.cfg
+++ b/component/python-cryptography/buildout.cfg
@@ -9,7 +9,6 @@ parts =
 
 [python-cryptography]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = cryptography
 environment = python-cryptography-env
 
diff --git a/component/python-ldap-python/buildout.cfg b/component/python-ldap-python/buildout.cfg
index 97e0281bfcebd55f5be261dd1daf19f9a500c3b9..048805311a151a499720f64c2a2626b89128c1e3 100644
--- a/component/python-ldap-python/buildout.cfg
+++ b/component/python-ldap-python/buildout.cfg
@@ -8,7 +8,6 @@ extends =
 
 [python-ldap-python]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = python-ldap
 rpath =
   ${openldap:location}/lib
diff --git a/component/rdiff-backup/buildout.cfg b/component/rdiff-backup/buildout.cfg
index 603af3b02cb4402fd31e8a1da8bc523e102368fd..ea4206417da0efc00294773d6da304b721ecb2fb 100644
--- a/component/rdiff-backup/buildout.cfg
+++ b/component/rdiff-backup/buildout.cfg
@@ -7,7 +7,6 @@ parts =
 
 [rdiff-backup-build]
 recipe = zc.recipe.egg:custom
-python = ${buildout:python}
 egg = rdiff-backup
 include-dirs =
   ${librsync:location}/include/
@@ -20,7 +19,6 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
 [rdiff-backup]
 # Scripts only generation part for rdiff-backup
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${rdiff-backup-build:egg}
 entry-points =
diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg
index 7bc6b1b77390d70a8a945e91ea4fa960774bd71a..8f5fb126cc201ce8daba852844dd64b2e0d745e4 100644
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -91,7 +91,6 @@ output = ${buildout:directory}/environment.sh
 
 [slapos]
 recipe = z3c.recipe.scripts
-python = ${buildout:python}
 eggs =
   ${python-cffi:egg}
   ${python-cryptography:egg}
@@ -125,7 +124,6 @@ scripts =
 
 [py]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = 
     ${slapos:eggs}
 interpreter = py
diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg
index 744848a2a2e70983c01ed356d52d8c43025e80d3..a7e0219bda9b755f631b02bd43fe91c94c2f596e 100644
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -64,7 +64,6 @@ scripts =
   slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
   slapproxy = slapos.proxy:main
 
-python = ${buildout:python}
 
 [template]
 recipe = slapos.recipe.template
diff --git a/software/etherpad-lite/common.cfg b/software/etherpad-lite/common.cfg
index 65b4ffaf3501be482e63b8d8b11809eca8013314..bbca202993ff57ff133bf287e8672f434ecebebc 100644
--- a/software/etherpad-lite/common.cfg
+++ b/software/etherpad-lite/common.cfg
@@ -39,7 +39,6 @@ module = etherpad-lite
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = ${instance-recipe:egg}
 
 [etherpad-lite-repository]
diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg
index c1f2e31875cf4f8196e09972a8d73fa01d9bdcdc..7b59d4a7a77cdc0e86df1c4e1a750869c5a3284a 100644
--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
@@ -29,12 +29,10 @@ module = seleniumrunner
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = ${instance-recipe:egg}
 
 [eggs]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${lxml-python:egg}
 
diff --git a/software/silverstripe/software.cfg b/software/silverstripe/software.cfg
index ce382bbe5709134a4ded0c2251b3afa899ffecb4..9aa731893e4c04e6ccf56176e42877830c6bfee8 100644
--- a/software/silverstripe/software.cfg
+++ b/software/silverstripe/software.cfg
@@ -31,7 +31,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = 
     ${mysql-python:egg}
     ${instance-recipe:egg}
diff --git a/software/trac-svn/software.cfg b/software/trac-svn/software.cfg
index 6e697ac45b71f70c69d74460fdc4bb6f8802d0f3..9c0b2a783bd07a2b1ebb72a1d63429412c7e59bb 100644
--- a/software/trac-svn/software.cfg
+++ b/software/trac-svn/software.cfg
@@ -50,7 +50,6 @@ allow-hosts +=
   
 [instance-egg]
 recipe = z3c.recipe.scripts
-python = ${buildout:python}
 eggs =
   ${mysql-python:egg}
   slapos.toolbox
diff --git a/software/varnish/software.cfg b/software/varnish/software.cfg
index 770dac6a721dc7edffedc549fede597ffef8ff7c..5784a1de3e29ba0b84e66c180d7a571e06ddca15 100644
--- a/software/varnish/software.cfg
+++ b/software/varnish/software.cfg
@@ -92,7 +92,6 @@ mode = 640
 
 [eggs]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${lxml-python:egg}
   erp5.util
@@ -104,7 +103,6 @@ scripts =
 
 [slapos-toolbox]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${lxml-python:egg}
   slapos.toolbox
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 0d180b350e428c92ecbaeee787924160036b269a..cec0cee00538511703d52bae5b67b11be8a6d6d9 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -360,7 +360,6 @@ update-command = ${:command}
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
 entry-points =
@@ -398,7 +397,6 @@ initialization =
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
 entry-points =
@@ -417,7 +415,6 @@ initialization =
 
 [patched-eggs]
 recipe = minitage.recipe.egg
-python = ${buildout:python}
 eggs =
   Acquisition
   Products.DCWorkflow
@@ -434,7 +431,6 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
 
 [eggs]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${mysql-python:egg}
   ${lxml-python:egg}
@@ -539,7 +535,6 @@ extra-paths =
 
 [zodbanalyze]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ZODB3
   erp5.util
@@ -553,7 +548,6 @@ revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
 
 [slapos-toolbox]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${lxml-python:egg}
   slapos.toolbox
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 976f0b1c1a454c74a98c6ec7870bdf9e97d12d5e..7c40164c9ee4da05b38bb883071b68548c1d4f21 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -64,7 +64,6 @@ networkcache-section = networkcache
 # if using "develop"
 [slapos-cookbook]
 recipe = zc.recipe.egg
-python = ${buildout:python}
 eggs =
   ${lxml-python:egg}
   ${python-cffi:egg}