diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 7ccf03e363..44e3c5add2 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -1,4 +1,4 @@
-name: push cleanup-bm image
+name: push cleanup-bare-metal image
 
 on:
   pull_request:
@@ -34,6 +34,6 @@ jobs:
           cat <<EOF > justfile.env
           container_registry=${{ env.container_registry }}
           EOF
-      - name: Build and push cleanup-bm image
+      - name: Build and push cleanup-bare-metal image
         run: |
-          just push cleanup-bm
+          just push cleanup-bare-metal
diff --git a/packages/cleanup-bm.sh b/packages/cleanup-bare-metal.sh
similarity index 100%
rename from packages/cleanup-bm.sh
rename to packages/cleanup-bare-metal.sh
diff --git a/packages/containers.nix b/packages/containers.nix
index f3504d7422..80f2d79f46 100644
--- a/packages/containers.nix
+++ b/packages/containers.nix
@@ -156,14 +156,14 @@ let
       };
     };
 
-    cleanup-bm = dockerTools.buildImage {
-      name = "cleanup-bm";
+    cleanup-bare-metal = dockerTools.buildImage {
+      name = "cleanup-bare-metal";
       tag = "v0.0.1";
       copyToRoot = with pkgs; [
         cacert
       ];
       config = {
-        Cmd = [ "${lib.getExe pkgs.scripts.cleanup-bm}" ];
+        Cmd = [ "${lib.getExe pkgs.scripts.cleanup-bare-metal}" ];
       };
     };
   };
diff --git a/packages/scripts.nix b/packages/scripts.nix
index a02ce4608d..830181a100 100644
--- a/packages/scripts.nix
+++ b/packages/scripts.nix
@@ -491,15 +491,15 @@
     '';
   };
 
-  cleanup-bm = writeShellApplication {
-    name = "cleanup-bm";
+  cleanup-bare-metal = writeShellApplication {
+    name = "cleanup-bare-metal";
     runtimeInputs = with pkgs; [
       busybox
       kubectl
       dasel
       scripts.cleanup-images
     ];
-    text = builtins.readFile ./cleanup-bm.sh;
+    text = builtins.readFile ./cleanup-bare-metal.sh;
   };
 
   cleanup-images = writeShellApplication {
diff --git a/tools/bm-maintenance/deployment_tdx_snp.yml b/tools/bm-maintenance/deployment_tdx_snp.yml
index 509d8f855e..03a9535cec 100644
--- a/tools/bm-maintenance/deployment_tdx_snp.yml
+++ b/tools/bm-maintenance/deployment_tdx_snp.yml
@@ -47,7 +47,7 @@ spec:
           serviceAccountName: cleanup-sa
           containers:
             - name: cleanup
-              image: ghcr.io/edgelesssys/contrast/cleanup-bm:v0.0.1
+              image: ghcr.io/edgelesssys/contrast/cleanup-bare-metal:v0.0.1
               env:
                 - name: OPTEDGELESS
                   value: /opt/edgeless