diff --git a/packages/util/secrets.go b/packages/util/secrets.go
index 0dd69c05..a329a087 100644
--- a/packages/util/secrets.go
+++ b/packages/util/secrets.go
@@ -65,7 +65,17 @@ func GetPlainTextSecretsViaServiceToken(fullServiceToken string, environment str
 	plainTextSecrets := []models.SingleEnvironmentVariable{}
 
 	for _, secret := range rawSecrets.Secrets {
-		plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
+		plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{
+			Key:                   secret.SecretKey,
+			WorkspaceId:           secret.Workspace,
+			Value:                 secret.SecretValue,
+			Type:                  secret.Type,
+			ID:                    secret.ID,
+			Comment:               secret.SecretComment,
+			SecretPath:            secret.SecretPath,
+			SkipMultilineEncoding: secret.SkipMultilineEncoding,
+			Tags:                  secret.Tags,
+		})
 	}
 
 	if includeImports {
@@ -110,7 +120,17 @@ func GetPlainTextSecretsV3(accessToken string, workspaceId string, environmentNa
 	plainTextSecrets := []models.SingleEnvironmentVariable{}
 
 	for _, secret := range rawSecrets.Secrets {
-		plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SecretPath: secret.SecretPath, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
+		plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{
+			Key:                   secret.SecretKey,
+			WorkspaceId:           secret.Workspace,
+			Value:                 secret.SecretValue,
+			Type:                  secret.Type,
+			ID:                    secret.ID,
+			Comment:               secret.SecretComment,
+			SecretPath:            secret.SecretPath,
+			SkipMultilineEncoding: secret.SkipMultilineEncoding,
+			Tags:                  secret.Tags,
+		})
 	}
 
 	if includeImports {
@@ -239,6 +259,8 @@ func InjectRawImportedSecret(secrets []models.SingleEnvironmentVariable, importe
 					Value:       sec.SecretValue,
 					Type:        sec.Type,
 					ID:          sec.ID,
+					Comment:     sec.SecretComment,
+					SecretPath:  importSec.SecretPath,
 				})
 				hasOverriden[sec.SecretKey] = true
 			}