diff --git a/KubeOS-Rust/kbimg/src/custom.rs b/KubeOS-Rust/kbimg/src/custom.rs
index 55071bfa1628d50de2f3cf5034d99f495c953ddf..85d100239272d3768220dbb4ed61be3b65b8a490 100644
--- a/KubeOS-Rust/kbimg/src/custom.rs
+++ b/KubeOS-Rust/kbimg/src/custom.rs
@@ -78,7 +78,11 @@ impl ChrootScript {
 "#,
             absolute_path.as_path().to_str().unwrap(),
             script_name.to_str().unwrap(),
-            if self.rm.unwrap_or(false) { format!("rm -f /{}", script_name.to_str().unwrap()) } else { "".to_string() }
+            if self.rm.unwrap_or(false) {
+                format!("rm -f \"${{RPM_ROOT}}\"/{}", script_name.to_str().unwrap())
+            } else {
+                "".to_string()
+            }
         )?;
         Ok(())
     }
diff --git a/KubeOS-Rust/kbimg/src/values.rs b/KubeOS-Rust/kbimg/src/values.rs
index 3986c13f963953eb7a27422d00db01b0d39ef9c7..7cf322e19018defb055ee69e2cda659c6d3b72ce 100644
--- a/KubeOS-Rust/kbimg/src/values.rs
+++ b/KubeOS-Rust/kbimg/src/values.rs
@@ -508,6 +508,7 @@ function GetDisk() {
             echo "${disk} exists, start partition"  | tee -a ${log}
         else
             echo "disk not exist, please choose correct disk"  | tee -a ${log}
+            return 1
         fi
     else
         echo "no disk found" | tee -a ${log}
@@ -844,7 +845,7 @@ CMD ["/bin/sh"]"#;
 
 pub const ADMIN_DOCKERFILE_CONTENT: &str = r#"FROM openeuler/openeuler:24.03-lts
 RUN dnf upgrade -y && dnf -y install openssh-clients util-linux sysmaster
-COPY ./set-ssh-pub-key.sh ./hostshell /usr/local/bin
+COPY ./set-ssh-pub-key.sh ./hostshell /usr/local/bin/
 COPY ./set-ssh-pub-key.service /usr/lib/sysmaster/system
 EXPOSE 22
 RUN ln -s /usr/lib/sysmaster/system/set-ssh-pub-key.service /etc/sysmaster/system/multi-user.target.wants/set-ssh-pub-key.service