diff --git a/defaults/main.yml b/defaults/main.yml
index 5ebf4de..36aa1b9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,7 +3,6 @@ droneci_autoscaler_version: latest
 droneci_autoscaler_image: "drone/autoscaler:latest"
 
 droneci_autoscaler_service_directory: /var/lib/docker/services/droneci_autoscaler
-droneci_autoscaler_container_name: droneci_autoscaler
 droneci_autoscaler_restart_policy: always
 droneci_autoscaler_service_stopped: False
 
diff --git a/tasks/setup.yml b/tasks/setup.yml
index e510f89..e63843d 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -5,7 +5,7 @@
 
 - name: Register SSH key
   set_fact:
-    __droneci_autoscaler_sshkey: "{{ inst.ssh_key | default(droneci_autoscaler_sshkey) | default(False) }}"
+    __droneci_autoscaler_sshkey: "{{ inst.sshkey | default(droneci_autoscaler_sshkey) | default(False) }}"
 
 - block:
     - name: Ensure service directory exists
diff --git a/templates/services/droneci_autoscaler_compose.yml.j2 b/templates/services/droneci_autoscaler_compose.yml.j2
index f579b75..227be4f 100644
--- a/templates/services/droneci_autoscaler_compose.yml.j2
+++ b/templates/services/droneci_autoscaler_compose.yml.j2
@@ -4,7 +4,7 @@ version: "2.4"
 
 services:
   droneci_autoscaler_{{ inst.name }}:
-    container_name: {{ droneci_autoscaler_container_name }}
+    container_name: {{ inst.name }}
     image: {{ droneci_autoscaler_image }}
     restart: {{ droneci_autoscaler_restart_policy }}
     volumes: