diff --git a/roles/runtime/tasks/setup_aws.yml b/roles/runtime/tasks/setup_aws.yml
index b53c18ae..31998f43 100644
--- a/roles/runtime/tasks/setup_aws.yml
+++ b/roles/runtime/tasks/setup_aws.yml
@@ -44,8 +44,8 @@
         env: "{{ run__env_name }}"
         overlay: no
         # TODO - Allow direct assignment (will need to coordinate with infra role)
-        aws_public_subnets: "{{ run__datahub_public_subnet_ids }}"
-        aws_private_subnets: "{{ run__datahub_private_subnet_ids }}"
+        aws_public_subnets: "{{ run__public_subnet_ids }}"
+        aws_private_subnets: "{{ run__private_subnet_ids }}"
         state: present
         wait: yes
       async: 3600 # 1 hour timeout