diff --git a/oci/private/registry/crane_launcher.sh.tpl b/oci/private/registry/crane_launcher.sh.tpl
index a7a04f01..9b8a3608 100644
--- a/oci/private/registry/crane_launcher.sh.tpl
+++ b/oci/private/registry/crane_launcher.sh.tpl
@@ -8,12 +8,9 @@ function start_registry() {
     local registry_pid="$1/proc.pid"
 
     mkdir -p "${storage_dir}"
-    # --blobs-to-disk uses go's os.TempDir() function which is equal to TMPDIR under *nix.
-    # https://pkg.go.dev/os#TempDir
-    TMPDIR="${storage_dir}" TMP="${storage_dir}" \
-    "${CRANE_REGISTRY_BIN}" registry serve --blobs-to-disk >> $output 2>&1 &
+    "${CRANE_REGISTRY_BIN}" registry serve --disk="${storage_dir}" --address=localhost:0 >> $output 2>&1 &
     echo "$!" > "${registry_pid}"
-
+    
     local timeout=$((SECONDS+${deadline}))
 
     while [ "${SECONDS}" -lt "${timeout}" ]; do
@@ -34,10 +31,8 @@ function stop_registry() {
     local storage_dir="$1"
     local registry_pid="$1/proc.pid"
     if [[ ! -f "${registry_pid}" ]]; then
-        echo "Registry not started" >&2
         return 0
     fi
-    echo "Stopping registry process" >&2
     kill -9 "$(cat "${registry_pid}")" || true
     return 0
 }
diff --git a/oci/private/registry/zot_launcher.sh.tpl b/oci/private/registry/zot_launcher.sh.tpl
index fe50afa5..7a643512 100644
--- a/oci/private/registry/zot_launcher.sh.tpl
+++ b/oci/private/registry/zot_launcher.sh.tpl
@@ -39,10 +39,8 @@ function stop_registry() {
     local storage_dir="$1"
     local registry_pid="$1/proc.pid"
     if [[ ! -f "${registry_pid}" ]]; then
-        echo "Registry not started" >&2
         return 0
     fi
-    echo "Stopping registry process" >&2
     kill -9 "$(cat "${registry_pid}")" || true
     return 0
 }