diff --git a/defaults/main.yml b/defaults/main.yml
index 460b263..e899edc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 droneci_autoscaler_version: latest
-droneci_autoscaler_image: "drone/autoscaler:latest"
+droneci_autoscaler_image: "drone/autoscaler:{{ droneci_autoscaler_version }}"
 
 droneci_autoscaler_service_directory: /var/lib/docker/services/droneci_autoscaler
 droneci_autoscaler_restart_policy: always
@@ -42,7 +42,8 @@ droneci_autoscaler_db_type: sqlite
 # @var droneci_autoscaler_db_ssl_mode:exaple: $ "disable"
 
 droneci_autoscaler_agent_token: myveryownsecret
-droneci_autoscaler_agent_image: drone/drone-runner-docker:1.5
+droneci_autoscaler_agent_version: latest
+droneci_autoscaler_agent_image: "drone/drone-runner-docker:{{ droneci_autoscaler_agent_version }}"
 droneci_autoscaler_agent_concurrency: 2
 droneci_autoscaler_agent_os: linux
 droneci_autoscaler_agent_architecture: amd64