diff --git a/.github/actions/config-poetry/config-poetry.sh b/.github/actions/config-poetry/config-poetry.sh
index 98aa7628..64b6b47a 100755
--- a/.github/actions/config-poetry/config-poetry.sh
+++ b/.github/actions/config-poetry/config-poetry.sh
@@ -15,6 +15,8 @@ set_build_env() {
 config_poetry() {
   jf config add repox --artifactory-url "$ARTIFACTORY_URL" --access-token "$ARTIFACTORY_ACCESS_TOKEN"
   jf poetry-config --server-id-resolve repox --repo-resolve "$ARTIFACTORY_PYPI_REPO"
+  # force poetry to use python available in the environment to avoid cached .venv to point to old python version
+  jf poetry env use python --build-name="$PROJECT" --build-number="$BUILD_NUMBER"
   jf poetry install --build-name="$PROJECT" --build-number="$BUILD_NUMBER"
 }
 
diff --git a/.github/workflows/PrCleanup.yml b/.github/workflows/PrCleanup.yml
new file mode 100644
index 00000000..65c756fc
--- /dev/null
+++ b/.github/workflows/PrCleanup.yml
@@ -0,0 +1,13 @@
+name: Cleanup PR Resources
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: github-ubuntu-latest-s
+    permissions:
+      actions: write
+    steps:
+      - uses: SonarSource/ci-github-actions/pr_cleanup@v1