diff --git a/generator/deployment.go b/generator/deployment.go
index d39c8e8..a4dc0bd 100644
--- a/generator/deployment.go
+++ b/generator/deployment.go
@@ -405,7 +405,11 @@ func (d *Deployment) Yaml() ([]byte, error) {
 
 		if strings.Contains(volume, "mountPath: ") {
 			spaces = strings.Repeat(" ", utils.CountStartingSpaces(volume))
-			varName := d.volumeMap[volumeName]
+			varName, ok := d.volumeMap[volumeName]
+			if !ok {
+				// this case happens when the volume is a "bind" volume comming from a "same-pod" service.
+				continue
+			}
 			varName = strings.ReplaceAll(varName, "-", "_")
 			content[line] = spaces + `{{- if .Values.` + serviceName + `.persistence.` + varName + `.enabled }}` + "\n" + volume
 			changing = true
diff --git a/generator/generator.go b/generator/generator.go
index dc521dd..0ba4746 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -87,6 +87,7 @@ func Generate(project *types.Project) (*HelmChart, error) {
 			if target, ok := deployments[samepod]; ok {
 				target.AddContainer(*service)
 				target.BindFrom(*service, deployments[service.Name])
+				target.SetEnvFrom(*service, appName)
 				delete(deployments, service.Name)
 			} else {
 				log.Printf("service %[1]s is declared as %[2]s, but %[2]s is not defined", service.Name, labels.LabelSamePod)