diff --git a/.gitlab/issue_templates/new-physical-server.md b/.gitlab/issue_templates/new-physical-server.md
index b983b8a..2307c15 100644
--- a/.gitlab/issue_templates/new-physical-server.md
+++ b/.gitlab/issue_templates/new-physical-server.md
@@ -1,25 +1,28 @@
 /title Install the new bare metal server(s) for <project>
 
-/milestone %"MRO 2023"
-
 /labels ~"activity::Deployment"
 
 Orders: <link to the mybox directory containing the order/delivery orders/...>
 
 Inventory: <link to the inventory page>
 
+Environment: admin|production|staging|test-staging
+
 Summary:
 - Management address (DNS): XXX.XXX.XXX.XXX (abcd.inria.fr)
 - VLAN configuration: VLANXXXX/VLANXXX
 - Management Port:
 - Access Ports:
 - Internal IP(s): xxx.xxx.xxx.xxx
-- Internal DNS name(s): xxx.internal.(softwareheritage.org|<environment>.swh.network
+- Internal DNS name(s): xxx.internal.(softwareheritage.org|`<environment>`.swh.network
 
 Tasks:
 - [ ] Declare the servers in the [inventory](https://inventory.internal.admin.swh.network)
 - [ ] Add the management info in the credential store
 - [ ] Install the OS
-- [ ] Add puppet configuration (if needed)
-- [ ] Configure firewall rules (if needed)
+- [ ] (if needed) Add puppet configuration
+- [ ] Register node in rancher cluster
+- [ ] Create the required kubernetes labels (e.g. swh/journal_client=true, ...)
+- [ ] Create a swap at least the size of the machine's memory
+- [ ] Update firewall rules with the new machine's ip (e.g. swh_$environment_kube_workers, ...)
 - [ ] (other actions if needed, drop unneeded actions)
diff --git a/.gitlab/issue_templates/recycle-physical-server.md b/.gitlab/issue_templates/recycle-physical-server.md
new file mode 100644
index 0000000..391c3de
--- /dev/null
+++ b/.gitlab/issue_templates/recycle-physical-server.md
@@ -0,0 +1,30 @@
+/title Recycle old bare metal server(s) into a rancher node for <project>
+
+/labels ~"activity::Deployment"
+
+Orders: <link to the mybox directory containing the order/delivery orders/...>
+
+Inventory: <link to the inventory page>
+
+Environment: admin|production|staging|test-staging
+
+Summary:
+- Management address (DNS): XXX.XXX.XXX.XXX (abcd.inria.fr)
+- VLAN configuration: VLANXXXX/VLANXXX
+- Management Port:
+- Access Ports:
+- Internal IP(s): xxx.xxx.xxx.xxx
+- Internal DNS name(s): xxx.internal.(softwareheritage.org|`<environment>`.swh.network
+
+Tasks:
+- [ ] Decommission `old-fqdn` on pergamon
+- [ ] Remove `<old-fqdn>.yaml` from the puppet repository
+- [ ] Update the node's information in the inventory
+- [ ] Create `<new-fqdn>.yaml` in the puppet repository
+- [ ] Reinstall Debian bullseye with IPXE
+- [ ] Register the new node in the cluster `<target-environment-cluster>`
+- [ ] Create the required kubernetes labels (e.g. swh/journal_client=true, ...)
+- [ ] Create a swap at least the size of the machine's memory
+- [ ] Update firewall rules with the new machine's ip (e.g. swh_$environment_kube_workers, ...)
+- [ ] (other actions if needed, drop unneeded actions)
+