diff --git a/.github/workflows/list_components.yml b/.github/workflows/list_components.yml
index 399b6fa7..097a2804 100644
--- a/.github/workflows/list_components.yml
+++ b/.github/workflows/list_components.yml
@@ -78,7 +78,7 @@ jobs:
       with:
         python-version: '3.x'
     - name: Intel® AI Tools Toolkit
-      run: scripts/list_components_linux_aitools.sh $LINUX_AIKIT_URL doc/source/${{ github.workflow }}/${{ github.job }}_aitools.txt
+      run: scripts/list_components_linux_aitools.sh $LINUX_AIKIT_URL doc/source/${{ github.workflow }}/${{ github.job }}_aikit.txt
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
diff --git a/scripts/list_components_linux_aitools.sh b/scripts/list_components_linux_aitools.sh
index 53cdc5fa..9211bbde 100755
--- a/scripts/list_components_linux_aitools.sh
+++ b/scripts/list_components_linux_aitools.sh
@@ -17,7 +17,6 @@ sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 rm -rf webimage.sh
 source "$HOME"/work/oneapi-ci/oneapi-ci/webimage_extracted/bin/activate base
 installer_exit_code=$?
-conda env list > "$FILENAME"
-cat "$FILENAME"
+conda env list | tee "$FILENAME"
 sudo rm -rf webimage_extracted
 exit $installer_exit_code
diff --git a/scripts/list_components_windows.bat b/scripts/list_components_windows.bat
index ab5f8a0c..1e73d8a4 100644
--- a/scripts/list_components_windows.bat
+++ b/scripts/list_components_windows.bat
@@ -11,4 +11,5 @@ del webimage.exe
 webimage_extracted\bootstrapper.exe --list-components > %FILENAME%
 set installer_exit_code=%ERRORLEVEL%
 type %FILENAME%
+rmdir /s /q webimage_extracted
 exit /b %installer_exit_code%