diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd930f63..80972cf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 * Check grep vs ggrep for Mac OS.
+* Wrap system param env vars in odoo conf template.
 
 ### Updated
 
diff --git a/odoo.conf.template b/odoo.conf.template
index f7dc3714..f805e946 100644
--- a/odoo.conf.template
+++ b/odoo.conf.template
@@ -17,5 +17,5 @@ smtp_password = $SMTP_PASSWORD
 email_from = $EMAIL_FROM
 
 [ir.config_parameter]
-git.ssh_public_key = $GIT_SSH_PUBLIC_KEY
-git.ssh_private_key = $GIT_SSH_PRIVATE_KEY
\ No newline at end of file
+git.ssh_public_key = "$GIT_SSH_PUBLIC_KEY"
+git.ssh_private_key = "$GIT_SSH_PRIVATE_KEY"
\ No newline at end of file