diff --git a/.gitlab/issue_templates/deploy-new-stack-in-staging.md b/.gitlab/issue_templates/deploy-new-stack-in-staging.md
index 019cef1..86938d7 100644
--- a/.gitlab/issue_templates/deploy-new-stack-in-staging.md
+++ b/.gitlab/issue_templates/deploy-new-stack-in-staging.md
@@ -1,18 +1,18 @@
 /title staging: Deploy new <project> stack
 
 /milestone %<milestone>
 
 /label ~"activity::deployment"
 
 - [ ] [swh-apps](https://gitlab.softwareheritage.org/swh/infra/swh-apps/-/tree/master/apps?ref_type=heads): Build image (if required)
 - [ ] [swh-charts](https://gitlab.softwareheritage.org/swh/infra/ci-cd/swh-charts/-/blob/staging/values-swh-application-versions.yaml?ref_type=heads): Reference new image (if required)
 - [ ] [swh-charts](https://gitlab.softwareheritage.org/swh/infra/ci-cd/swh-charts/-/blob/staging/swh/values/staging.yaml?ref_type=heads#L126): Adapt values to reference the new lister and loader
 - [ ] Deploy (push branch and let argocd do its job)
-- [ ] Checks pods are doing their jobs
 - [ ] Tag grafana with "deployment service=loader-<project> service=<lister-project> environment=staging" [1]
+- [ ] Checks pods are doing their jobs
 
 Dashboard to follow [1]
 
 [1] https://grafana.softwareheritage.org/goto/e-c3EAWIz?orgId=1
 
 Refs. <issue>
diff --git a/.gitlab/issue_templates/deploy-new-stack-version.md b/.gitlab/issue_templates/deploy-new-stack-version.md
index 36b3aff..6016b44 100644
--- a/.gitlab/issue_templates/deploy-new-stack-version.md
+++ b/.gitlab/issue_templates/deploy-new-stack-version.md
@@ -1,24 +1,24 @@
 /title Deploy new <project> <version>
 
 /milestone %<milestone>
 
 /label ~"activity::deployment"
 
 staging:
 - [ ] [swh-apps](https://gitlab.softwareheritage.org/swh/infra/swh-apps/-/tree/master/apps?ref_type=heads): Build image (if required because of new deps for example)
 - [ ] [swh-charts](https://gitlab.softwareheritage.org/swh/infra/ci-cd/swh-charts/-/merge_requests): Merge MR with image versions updates triggered by the CI
 - [ ] Push branch 'staging' && Let argocd deploy and do its job
 - [ ] Checks pods are doing their jobs without crashing
 - [ ] Tag grafana with "deployment service=<service> service=<service2> ... environment=staging" [1] [2]
 
 production:
 - [ ] Merge 'staging' branch into 'production' (it should/must be a fast-forward)
 - [ ] Push branch 'production' && Let argocd deploy and do its job
-- [ ] Checks pods are doing their jobs without crashing
 - [ ] Tag grafana with "deployment service=<service> service=<service2> ... environment=production" [1] [2]
+- [ ] Checks pods are doing their jobs without crashing
 
 [1] https://grafana.softwareheritage.org/goto/e-c3EAWIz?orgId=1
 
 [2] Only reference impacted services (e.g. storage, lister-cran, loader-git, scheduler, vault, ...)
 
 Refs. <issue>
diff --git a/.gitlab/issue_templates/deploy-next-swh-version.md b/.gitlab/issue_templates/deploy-next-swh-version.md
index 9e42fa8..f88e0e0 100644
--- a/.gitlab/issue_templates/deploy-next-swh-version.md
+++ b/.gitlab/issue_templates/deploy-next-swh-version.md
@@ -1,28 +1,30 @@
 /title Deploy next swh version
 
 /milestone %"MRO 2023"
 
 /label ~"activity::deployment"
 
 Actions:
 - [ ] Tags all impacted modules
 
 Includes:
 - <insert-new-version-packages-with-small-summary>
 - ...
 
 Dependency:
 - <insert-blocking-dependency>
 - ...
 
 staging:
 - [ ] storage1.staging: Upgrade package & Restart gunicorn-swh-storage (if storage is impacted)
 - [ ] <insert-mr-link> swh-charts: Merge new versions
 - [ ] Let argocd deploy
+- [ ] Tag grafana with "deployment service=<service> service=<service2> ... environment=staging" [1] [2]
 - [ ] Checks
 
 production:
 - [ ] saam, moma, webapp1: Upgrade swh.storage package & Restart gunicorn-swh-storage (if storage is impacted)
 - [ ] swh-charts: Merge staging branch into production
 - [ ] Let argocd deploy
+- [ ] Tag grafana with "deployment service=<service> service=<service2> ... environment=production" [1] [2]
 - [ ] Checks