diff --git a/images/odoo/bin/auto-envsubst b/images/odoo/bin/auto-envsubst
index 76bb903d..dc412dcb 100755
--- a/images/odoo/bin/auto-envsubst
+++ b/images/odoo/bin/auto-envsubst
@@ -19,6 +19,13 @@ export SMTP_USER=${SMTP_USER:=""}
 export SMTP_PASSWORD=${SMTP_PASSWORD:=""}
 export EMAIL_FROM=${EMAIL_FROM:=""}
 
+# Deode SSH private key
+if [ -n "$GIT_SSH_PRIVATE_KEY" ]; then
+    GIT_SSH_PRIVATE_KEY=$(echo -e "$GIT_SSH_PRIVATE_KEY" | base64 -w0)
+fi
+export GIT_SSH_PUBLIC_KEY_PARAM=$([ -n "$GIT_SSH_PUBLIC_KEY" ] && echo "git.ssh.public.key = \"$GIT_SSH_PUBLIC_KEY\"")
+export GIT_SSH_PRIVATE_KEY_PARAM=$([ -n "$GIT_SSH_PRIVATE_KEY" ] && echo "git.ssh.private.key = \"$GIT_SSH_PRIVATE_KEY\"")
+
 TEMPLATE_FILE="${ODOO_ENVSUBST_TEMPLATE_FILE:-/etc/odoo/odoo.conf.template}"
 OUTPUT_FILE="${ODOO_ENVSUBST_OUTPUT_FILE:-/etc/odoo/odoo.conf}"
 FILTER="${ODOO_ENVSUBST_FILTER:-}"
@@ -30,4 +37,4 @@ DEFINED_ENVS=$(printf '${%s} ' $(awk "END { for (name in ENVIRON) { print ( name
 if [[ -f "$TEMPLATE_FILE" ]]; then
     entrypoint-log "Run envsubst on $TEMPLATE_FILE and output: $OUTPUT_FILE"
     envsubst "$DEFINED_ENVS" < "$TEMPLATE_FILE" > "$OUTPUT_FILE"
-fi
\ No newline at end of file
+fi
diff --git a/images/odoo/odoo.conf.template b/images/odoo/odoo.conf.template
index a45e89b2..c8fcfc1f 100644
--- a/images/odoo/odoo.conf.template
+++ b/images/odoo/odoo.conf.template
@@ -35,12 +35,12 @@ email_from = $EMAIL_FROM
 ; osv_memory_age_limit = 1.0
 ; osv_memory_count_limit = False
 ; xmlrpc = True
-; xmlrpc_interface = 
+; xmlrpc_interface =
 ; xmlrpc_port = 8069
 ; xmlrpcs = True
-; xmlrpcs_interface = 
+; xmlrpcs_interface =
 ; xmlrpcs_port = 8071
 
 [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_PARAM
+$GIT_SSH_PRIVATE_KEY_PARAM
diff --git a/task b/task
index 8a43d774..6b8232bd 100755
--- a/task
+++ b/task
@@ -325,6 +325,11 @@ function template-odoo-rc() {
       export $VAR
     done
 
+    # Deode SSH private key
+    if [ -n "$GIT_SSH_PRIVATE_KEY" ]; then
+        GIT_SSH_PRIVATE_KEY=$(echo -e "$GIT_SSH_PRIVATE_KEY" | base64 -w0)
+    fi
+
     export BASE_URL_WEBSITE_PARAM=$([ -n "$BASE_URL_WEBSITE" ] && echo "base_url_website = $BASE_URL_WEBSITE")
     export BASE_URL_APP_PARAM=$([ -n "$BASE_URL_APP" ] && echo "base_url_app = $BASE_URL_APP")
     export GIT_SSH_PUBLIC_KEY_PARAM=$([ -n "$GIT_SSH_PUBLIC_KEY" ] && echo "git.ssh.public.key = \"$GIT_SSH_PUBLIC_KEY\"")
@@ -336,10 +341,6 @@ function template-odoo-rc() {
     export KEYCLOAK_CLIENT_SECRET_PARAM=$([ -n "$KEYCLOAK_CLIENT_SECRET" ] && echo "keycloak.client_secret = $KEYCLOAK_CLIENT_SECRET")
     export KEYCLOAK_REALM_PARAM=$([ -n "$KEYCLOAK_REALM" ] && echo "keycloak.realm = $KEYCLOAK_REALM")
 
-    if [ -n "$GIT_SSH_PRIVATE_KEY" ]; then
-        GIT_SSH_PRIVATE_KEY=$(echo -e "$GIT_SSH_PRIVATE_KEY" | base64 -w0)
-    fi
-
     envsubst < "odoo.conf.template" > "$ODOO_RC"
 }