diff --git a/configure b/configure
index 3c8779269ec..05dcbd419ca 100755
--- a/configure
+++ b/configure
@@ -46,12 +46,11 @@ CLEANABLE="
     pip-selfcheck.json
     src/scancode_toolkit.egg-info
     src/scancode_toolkit_mini.egg-info
-    scancode_toolkit.egg-info
-    scancode_toolkit_mini.egg-info
     SCANCODE_DEV_MODE
     man
     Scripts"
 
+
 # extra  arguments passed to pip
 PIP_EXTRA_ARGS=" "
 
diff --git a/etc/release/scancode-create-release.sh b/etc/release/scancode-create-release.sh
index da6f89bec5a..e64a88fa501 100755
--- a/etc/release/scancode-create-release.sh
+++ b/etc/release/scancode-create-release.sh
@@ -185,8 +185,15 @@ function backup_previous_release {
     fi
 }
 
+
+function clean_egg_info {
+	rm -rf .eggs src/scancode_toolkit.egg-info src/scancode_toolkit_mini.egg-info
+}
+
+
 function clean_build {
     rm -rf build dist thirdparty PYTHON_EXECUTABLE SCANCODE_DEV_MODE
+    clean_egg_info
 }
 
 backup_previous_release
@@ -213,12 +220,15 @@ bin/pip install $QUIET -r etc/release/requirements.txt
 ################################
 echo " "
 echo "## RELEASE: Building a wheel and a source distribution"
+clean_egg_info
 bin/python setup.py $QUIET sdist bdist_wheel
 
 mv dist release/pypi
 
+
 echo " "
 echo "## RELEASE: Building a mini wheel and a source distribution"
+clean_egg_info
 mv setup.cfg setup-full.cfg
 cp setup-mini.cfg setup.cfg
 rm -rf build
@@ -227,6 +237,7 @@ mv setup-full.cfg setup.cfg
 
 cp dist/* release/pypi/
 
+clean_egg_info
 echo "## RELEASE: full and mini, wheel and source distribution(s) built and ready for PyPI upload"
 find release -ls