diff --git a/go.mod b/go.mod
index de21b51..14a8dc6 100644
--- a/go.mod
+++ b/go.mod
@@ -16,6 +16,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.27.0
 	google.golang.org/grpc v1.64.0
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/alessio/shellescape.v1 v1.5.0
 	k8s.io/api v0.29.1
 	k8s.io/apimachinery v0.29.1
 	k8s.io/client-go v0.29.1
diff --git a/pkg/slurm/prepare.go b/pkg/slurm/prepare.go
index aa165f0..4568c64 100644
--- a/pkg/slurm/prepare.go
+++ b/pkg/slurm/prepare.go
@@ -17,6 +17,7 @@ import (
 
 	exec2 "github.com/alexellis/go-execute/pkg/v1"
 	"github.com/containerd/containerd/log"
+	"gopkg.in/alessio/shellescape.v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -184,36 +185,63 @@ func (h *SidecarHandler) LoadJIDs() error {
 	return nil
 }
 
-// prepareEnvs reads all Environment variables from a container and append them to a slice of strings.
-// It returns the slice containing all envs in the form of key=value.
+// prepareEnvs reads all Environment variables from a container and append them to a envfile.properties. The values are bash-escaped.
+// It returns the slice containing, if there are Environment variables, the arguments for envfile and its path, or else an empty array.
 func prepareEnvs(Ctx context.Context, container v1.Container) []string {
 	start := time.Now().UnixMicro()
 	span := trace.SpanFromContext(Ctx)
 	span.AddEvent("Preparing ENVs for container " + container.Name)
-	var envs []string
+	var envs []string = []string{}
+	// For debugging purpose only
+	var envs_data []string{} = []string{}
 
 	if len(container.Env) > 0 {
-		log.G(Ctx).Info("-- Appending envs")
-		envs = append(envs, "--env")
-		env_data := ""
-		for _, envVar := range container.Env {
-			tmp := (envVar.Name + "=" + envVar.Value + ",")
-			env_data += tmp
+		envfilePath := (config.DataRootFolder + podData.Pod.Namespace + "-" + string(podData.Pod.UID) + "/" + "envfile.properties")
+		log.G(Ctx).Info("-- Appending envs using envfile " + envfilePath)
+		envs = append(envs, "--env-file")
+		envs = append(envs, envfilePath)
+		
+		envfile, err := os.Create(envfilePath)
+		if err != nil {
+			log.G(Ctx).Error(err)
+			return "", err
 		}
-		if last := len(env_data) - 1; last >= 0 && env_data[last] == ',' {
-			env_data = env_data[:last]
+		defer envfile.Close()
+		
+		for _, envVar := range container.Env {
+			// The environment variable values can contains all sort of simple/double quote and space and any arbitrary values.
+			// singularity reads the env-file and parse it like a bash string, so shellescape will escape any quote properly.
+			tmpValue :=  shellescape.Quote(envVar.Value)
+			tmp := (envVar.Name + "=" + tmpValue)
+			
+			envs_data = append(envs_data, tmp)
+			
+			_, err = envfile.WriteString(tmp + "\n")
+			if err != nil {
+				log.G(Ctx).Error(err)
+				return "", err
+			} else {
+				log.G(Ctx).Debug("---- Written envfile file " + envfilePath + " key " + envVar.Name + " value " + tmpValue)
+			}
 		}
-		if env_data == "" {
-			envs = []string{}
+		
+		// All env variables are written, we flush it now. 
+		err = envfile.Sync()
+		if err != nil {
+			log.G(Ctx).Error(err)
+			return "", err
 		}
-		envs = append(envs, env_data)
+		// Calling Close() in case of error. If not error, the defer will close it again but it should be idempotent.
+		return envfile.Close()
 	}
 
 	duration := time.Now().UnixMicro() - start
 	span.AddEvent("Prepared ENVs for container "+container.Name, trace.WithAttributes(
 		attribute.String("prepareenvs.container.name", container.Name),
 		attribute.Int64("prepareenvs.duration", duration),
-		attribute.StringSlice("prepareenvs.container.envs", envs)))
+		attribute.StringSlice("prepareenvs.container.envs", envs),
+		attribute.StringSlice("prepareenvs.container.envs_data", envs_data)
+	))
 	return envs
 }