diff --git a/bootstrapvz/common/tasks/initd.py b/bootstrapvz/common/tasks/initd.py
index 3de5c17..4669b03 100644
--- a/bootstrapvz/common/tasks/initd.py
+++ b/bootstrapvz/common/tasks/initd.py
@@ -76,9 +76,5 @@ class AdjustGrowpartWorkaround(Task):
 	@classmethod
 	def run(cls, info):
 		from ..tools import sed_i
-		from bootstrapvz.common.releases import jessie
-
 		script = os.path.join(info.root, 'etc/init.d/expand-root')
-
-		if info.manifest.release >= jessie:
-			sed_i(script, '^growpart="growpart"$', 'growpart-workaround')
+		sed_i(script, '^growpart="growpart"$', 'growpart-workaround')
diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 5ea09d0..5fb2cee 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -83,13 +83,13 @@ def resolve_tasks(taskset, manifest):
 
 	if manifest.release >= jessie:
 		taskset.add(tasks.packages.AddWorkaroundGrowpart)
+		taskset.add(initd.AdjustGrowpartWorkaround)
 
 	if manifest.provider.get('install_init_scripts', True):
 		taskset.add(tasks.initd.AddEC2InitScripts)
 
 	if manifest.volume['partitions']['type'] != 'none':
 		taskset.add(initd.AdjustExpandRootScript)
-		taskset.add(initd.AdjustGrowpartWorkaround)
 
 	if manifest.system['bootloader'] == 'pvgrub':
 		taskset.add(grub.AddGrubPackage)