diff --git a/chroot-tasks.py b/chroot-tasks.py
index 3d422e5..4c10dd0 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -96,7 +96,6 @@ def boottoolsSoftwareCompile():
         os.chdir ('python-libfdisk')
         utils.run (['python3', 'setup.py', 'install'])
         os.chdir ('..')
-        apt.remove (['python3-dev', 'python3-setuptools'])
 
     os.environ['LANGUAGE'] = env_language
     os.environ['LC_ALL']   = env_lc_all
@@ -105,6 +104,9 @@ def boottoolsSoftwareCompile():
 def boottoolsPythonModules():
     utils.run (['pip3', 'install', 'pyblkid'])
 
+def boottoolsRemovePackages():
+    apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])
+
 def boottoolsInitrdGenerate (osrelease):
     print ('boottoolsInitrdGenerate', file=sys.stderr)
     for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@@ -143,4 +145,5 @@ if __name__ == '__main__':
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
+    boottoolsRemovePackages()
     boottoolsInitrdGenerate (args.osrelease)