diff --git a/.github/workflows/cleanup-artifacts.yml b/.github/workflows/cleanup-artifacts.yml
new file mode 100644
index 0000000..b638507
--- /dev/null
+++ b/.github/workflows/cleanup-artifacts.yml
@@ -0,0 +1,22 @@
+name: Remove old artifacts
+
+on:
+  workflow_call:
+
+  # schedule:
+  #   # Every day at 1am
+  #   - cron: '0 1 * * *'
+  # workflow_dispatch:
+
+
+jobs:
+  remove-old-artifacts:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - name: Remove old artifacts
+      uses: c-hive/gha-remove-artifacts@v1
+      with:
+        age: '1 month' # '<number> <unit>', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js
+        skip-recent: 1
diff --git a/.github/workflows/cleanup-cache.yml b/.github/workflows/cleanup-cache.yml
new file mode 100644
index 0000000..7335888
--- /dev/null
+++ b/.github/workflows/cleanup-cache.yml
@@ -0,0 +1,33 @@
+name: cleanup caches by a branch
+
+
+on:
+  workflow_call:
+
+#   pull_request:
+#     types:
+#       - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge