diff --git a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/LegacyAwsInfrastructure.kt b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/LegacyAwsInfrastructure.kt
index 1a1eb891..a860716a 100644
--- a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/LegacyAwsInfrastructure.kt
+++ b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/LegacyAwsInfrastructure.kt
@@ -100,7 +100,7 @@ class LegacyAwsInfrastructure private constructor(
                     .withParameterValue(network.subnet.subnetId),
                 Parameter()
                     .withParameterKey("AccessCidr")
-                    .withParameterValue("0.0.0.0/0")
+                    .withParameterValue(network.vpc.cidrBlock)
             ),
             aws = aws,
             pollingTimeout = provisioningTimout
diff --git a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/loadbalancer/ApacheEc2LoadBalancerFormula.kt b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/loadbalancer/ApacheEc2LoadBalancerFormula.kt
index 8c078371..3eb8a16c 100644
--- a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/loadbalancer/ApacheEc2LoadBalancerFormula.kt
+++ b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/loadbalancer/ApacheEc2LoadBalancerFormula.kt
@@ -49,7 +49,7 @@ class ApacheEc2LoadBalancerFormula : LoadBalancerFormula {
         )
         key.file.facilitateSsh(ssh.host.ipAddress)
         val loadBalancer = ApacheProxyLoadBalancer.Builder(ssh)
-            .nodes(instances.map { URI("http://${it.publicIpAddress}:8080/") })
+            .nodes(instances.map { URI("http://${it.privateIpAddress}:8080/") })
             .ipAddress(instance.publicIpAddress)
             .build()
         loadBalancer.provision()