diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
new file mode 100644
index 0000000000..f8fb3e1b5f
--- /dev/null
+++ b/.github/workflows/close-stale.yml
@@ -0,0 +1,23 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 35 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-pr-message: 'This pull request is stale because it has been open 35 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          days-before-stale: 60
+          days-before-close: 14
+          exempt-all-milestones: true
+          exempt-issue-labels: no-stale
+          exempt-pr-labels: no-stale
+          delete-branch: true
diff --git a/Dockerfile b/Dockerfile
index cb6e537a46..838507fe80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build golang dependencies and binaries
-FROM ubuntu:24.10 AS build
+FROM ubuntu:25.04 AS build
 
 ARG VM_DEBUG
 
@@ -20,7 +20,7 @@ RUN bash -c 'source ~/.cargo/env && VM_DEBUG=${VM_DEBUG} make juno'
 RUN upx-ucl /app/build/juno
 
 # Stage 2: Build Docker image
-FROM ubuntu:24.10 AS runtime
+FROM ubuntu:25.04 AS runtime
 
 RUN apt-get update && apt-get install -y ca-certificates curl gawk grep libjemalloc-dev libjemalloc2