diff --git a/defaults/main.yml b/defaults/main.yml
index 276360e..33f8137 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,6 +10,8 @@ renovate_config: []
 
 renovate_dir: /srv/docker/renovate
 
+renovate_docker_compose_bin: /usr/bin/docker-compose
+
 renovate_container_environment: []
   # GITHUB_COM_TOKEN: ""
   # NODE_TLS_REJECT: ""
diff --git a/templates/etc/systemd/system/renovate.service.j2 b/templates/etc/systemd/system/renovate.service.j2
index 0c88284..90865b1 100644
--- a/templates/etc/systemd/system/renovate.service.j2
+++ b/templates/etc/systemd/system/renovate.service.j2
@@ -12,5 +12,5 @@ OnFailure=status-email@%n.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/docker-compose up
+ExecStart={{ renovate_docker_compose_bin }} up
 WorkingDirectory={{ renovate_dir }}
\ No newline at end of file
diff --git a/templates/srv/docker/renovate/docker-compose.yml.j2 b/templates/srv/docker/renovate/docker-compose.yml.j2
index d180d19..80dfb8f 100644
--- a/templates/srv/docker/renovate/docker-compose.yml.j2
+++ b/templates/srv/docker/renovate/docker-compose.yml.j2
@@ -4,9 +4,11 @@ services:
   renovate:
     environment:
       RENOVATE_CONFIG_FILE: /usr/src/app/config.json
+{% if renovate_container_environment is defined and renovate_container_environment | length > 0 %}
 {% for key, value in renovate_container_environment.items() %}
       {{ key | upper }}: {{ value | quote }}
 {% endfor %}
+{% endif %}
     image: {{ renovate_container_image }}
     user: {{ renovate_container_user | default('1000:977') }}
     volumes: