diff --git a/cmd/werf/common/container_backend.go b/cmd/werf/common/container_backend.go
index 0ae2dfd320..1789ee67b7 100644
--- a/cmd/werf/common/container_backend.go
+++ b/cmd/werf/common/container_backend.go
@@ -16,6 +16,14 @@ import (
 )
 
 func ContainerBackendProcessStartupHook() (bool, error) {
+	switch {
+	case strings.HasPrefix(os.Args[0], "buildah-") || strings.HasPrefix(os.Args[0], "chrootuser-") || strings.HasPrefix(os.Args[0], "storage-"):
+	case os.Getenv("WERF_ORIGINAL_EXECUTABLE") == "":
+		if err := os.Setenv("WERF_ORIGINAL_EXECUTABLE", os.Args[0]); err != nil {
+			return false, fmt.Errorf("error setting werf original args env var: %w", err)
+		}
+	}
+
 	buildahMode, _, err := GetBuildahMode()
 	if err != nil {
 		return false, fmt.Errorf("unable to determine buildah mode: %w", err)
diff --git a/pkg/werf/main.go b/pkg/werf/main.go
index 81e704561b..a331045621 100644
--- a/pkg/werf/main.go
+++ b/pkg/werf/main.go
@@ -165,11 +165,5 @@ func Init(tmpDirOption, homeDirOption string) error {
 		return fmt.Errorf("error setting werf last run at timestamp: %w", err)
 	}
 
-	if os.Getenv("WERF_ORIGINAL_EXECUTABLE") == "" {
-		if err := os.Setenv("WERF_ORIGINAL_EXECUTABLE", os.Args[0]); err != nil {
-			return fmt.Errorf("error setting werf original args env var: %w", err)
-		}
-	}
-
 	return nil
 }