diff --git a/defaults/main.yml b/defaults/main.yml
index ceb4b02..8085f8e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,8 +11,9 @@ droneci_runner_docker_service_stopped: False
 droneci_runner_docker_capacity: 2
 droneci_drone_runner_labels: []
 
-droneci_runner_docker_server: droneci
-droneci_runner_docker_secret: myveryownsecret
+droneci_runner_docker_server_proto: http
+droneci_runner_docker_server_host: droneci
+droneci_runner_docker_server_secret: myveryownsecret
 
 # @var droneci_runner_docker_memory_limit:example: $ "512m"
 # @var droneci_runner_docker_memory_limit: $ "_unset_"
diff --git a/templates/services/droneci_runner_compose.yml.j2 b/templates/services/droneci_runner_compose.yml.j2
index ecb2031..76f1d70 100644
--- a/templates/services/droneci_runner_compose.yml.j2
+++ b/templates/services/droneci_runner_compose.yml.j2
@@ -17,9 +17,9 @@ services:
     {% endif %}
     privileged: true
     environment:
-      - DRONE_RPC_PROTO=http
-      - DRONE_RPC_HOST={{ droneci_runner_docker_server }}
-      - DRONE_RPC_SECRET={{ droneci_runner_docker_secret }}
+      - DRONE_RPC_PROTO={{ droneci_runner_docker_server_proto }}
+      - DRONE_RPC_HOST={{ droneci_runner_docker_server_host }}
+      - DRONE_RPC_SECRET={{ droneci_runner_docker_server_secret }}
       - DRONE_RUNNER_CAPACITY={{ droneci_runner_docker_capacity }}
       {% if droneci_drone_runner_labels | default([]) | length > 0 %}
       - DRONE_RUNNER_LABELS={{ droneci_drone_runner_labels | join(",") }}