diff --git a/.github/workflows/cleanup_base.yaml b/.github/workflows/cleanup_base.yaml
index 484cf443..8ad4d826 100644
--- a/.github/workflows/cleanup_base.yaml
+++ b/.github/workflows/cleanup_base.yaml
@@ -1,10 +1,12 @@
-# Clean old Docker and Singularity images that are too old periodically.
+# Clean old Docker and Singularity images that are too old periodically or
+# manually.
 
 name: Cleanup base images
 
 on:
   schedule:
     - cron: "0 3 2,16 * *" # every 2nd and 16th of the month at 3am UTC
+  workflow_dispatch:
 
 jobs:
   cleanup:
@@ -16,13 +18,13 @@ jobs:
         with:
           type: container
           names: |
-            base_cuda_main
-            base_cuda_pr
-            base_cuda_singularity_main
-            base_cuda_singularity_pr
-            base_hip_main
-            base_hip_pr
-            base_openmp_main
-            base_openmp_pr
-            base_sycl_main
-            base_sycl_pr
+            base_nvcc_main
+            base_nvcc_pr
+            base_nvcc_singularity_main
+            base_nvcc_singularity_pr
+            base_rocm_main
+            base_rocm_pr
+            base_gcc_main
+            base_gcc_pr
+            base_intel_main
+            base_intel_pr
diff --git a/.github/workflows/pre_build_base.yaml b/.github/workflows/pre_build_base.yaml
index 8c8111ab..091b0e73 100644
--- a/.github/workflows/pre_build_base.yaml
+++ b/.github/workflows/pre_build_base.yaml
@@ -1,7 +1,7 @@
-# Recreate the base images inconditionnaly on a regural basis and on push on
-# the main branch. This is to ensure that anybody using the Docker files for
-# local development does not encounter weird bugs unnoticed by the CI, because
-# the images would be too old.
+# Recreate the base images inconditionnaly on periodically or manually and on
+# push on the main branch. This is to ensure that anybody using the Docker
+# files for local development does not encounter weird bugs unnoticed by the
+# CI, because the images would be too old.
 
 name: Pre-build base images
 
@@ -11,6 +11,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   check_docker_files:
@@ -22,7 +23,7 @@ jobs:
   build_base:
     needs: check_docker_files
 
-    # run inconditionnaly on schedule mode or if Docker files changed on other modes
-    if: ${{ github.event_name == 'schedule' || needs.check_docker_files.outputs.docker_files_have_changed == 'true' }}
+    # run inconditionnaly on schedule or manual mode or if Docker files changed on other modes
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || needs.check_docker_files.outputs.docker_files_have_changed == 'true' }}
 
     uses: ./.github/workflows/__build_base.yaml