diff --git a/bosh_aws_bootstrap/spec/assets/config.yml b/bosh_aws_bootstrap/spec/assets/config.yml
index 3df345609bc..a99919787a8 100644
--- a/bosh_aws_bootstrap/spec/assets/config.yml
+++ b/bosh_aws_bootstrap/spec/assets/config.yml
@@ -28,7 +28,7 @@ vpc:
   dhcp_options:
     domain_name: dev102.cf.com
     domain_name_servers:
-      - 10.10.0.5
+      - 10.10.0.6
       - 172.16.0.23
   security_groups:
     - name: open
diff --git a/bosh_aws_bootstrap/spec/assets/config_with_override.yml b/bosh_aws_bootstrap/spec/assets/config_with_override.yml
index ee8d32bf362..95224e5db8a 100644
--- a/bosh_aws_bootstrap/spec/assets/config_with_override.yml
+++ b/bosh_aws_bootstrap/spec/assets/config_with_override.yml
@@ -21,7 +21,7 @@ vpc:
   dhcp_options:
     domain_name: dev102.cf.com
     domain_name_servers:
-      - 10.10.0.5
+      - 10.10.0.6
       - 172.16.0.23
   security_groups:
     - name: open
diff --git a/bosh_aws_bootstrap/spec/assets/create_all.yml b/bosh_aws_bootstrap/spec/assets/create_all.yml
index e21049461f2..76187185f3f 100644
--- a/bosh_aws_bootstrap/spec/assets/create_all.yml
+++ b/bosh_aws_bootstrap/spec/assets/create_all.yml
@@ -15,7 +15,7 @@ vpc:
   dhcp_options:
     domain_name: CHANGEME.cf-app.com
     domain_name_servers:
-      - 10.10.0.5
+      - 10.10.0.6
       - 172.16.0.23
   security_groups:
     - name: open
diff --git a/bosh_aws_bootstrap/spec/assets/test-output.yml b/bosh_aws_bootstrap/spec/assets/test-output.yml
index 3f98355972a..2f4578e35f8 100644
--- a/bosh_aws_bootstrap/spec/assets/test-output.yml
+++ b/bosh_aws_bootstrap/spec/assets/test-output.yml
@@ -50,7 +50,7 @@ original_configuration:
     dhcp_options:
       domain_name: dev102.cf.com
       domain_name_servers:
-        - 10.10.0.5
+        - 10.10.0.6
         - 172.16.0.23
     security_groups:
       - name: open
diff --git a/bosh_aws_bootstrap/spec/unit/bosh_manifest_spec.rb b/bosh_aws_bootstrap/spec/unit/bosh_manifest_spec.rb
index 02db13dc44b..8bbc4434333 100644
--- a/bosh_aws_bootstrap/spec/unit/bosh_manifest_spec.rb
+++ b/bosh_aws_bootstrap/spec/unit/bosh_manifest_spec.rb
@@ -31,7 +31,7 @@
   - range: 10.10.0.0/24
     gateway: 10.10.0.1
     dns:
-    - 10.10.0.5
+    - 10.10.0.6
     cloud_properties:
       subnet: subnet-4bdf6c26
 - name: vip_network
diff --git a/bosh_aws_bootstrap/templates/aws_configuration_template.yml.erb b/bosh_aws_bootstrap/templates/aws_configuration_template.yml.erb
index c81e0b95514..90d79585a4a 100644
--- a/bosh_aws_bootstrap/templates/aws_configuration_template.yml.erb
+++ b/bosh_aws_bootstrap/templates/aws_configuration_template.yml.erb
@@ -34,7 +34,7 @@ vpc:
       availability_zone: <%= ENV["BOSH_VPC_SECONDARY_AZ"] || raise("Missing ENV variable BOSH_VPC_SECONDARY_AZ") %>
   dhcp_options:
     domain_name_servers:
-      - 10.10.0.5  # IP of the BOSH DNS server?
+      - 10.10.0.6  # IP of the BOSH DNS server?
       - 10.10.0.2  # local amazon public DNS server
   security_groups:
     - name: open
diff --git a/bosh_aws_bootstrap/templates/bosh.yml.erb b/bosh_aws_bootstrap/templates/bosh.yml.erb
index 8e7b7a53f55..6ad9a02397e 100644
--- a/bosh_aws_bootstrap/templates/bosh.yml.erb
+++ b/bosh_aws_bootstrap/templates/bosh.yml.erb
@@ -9,7 +9,7 @@ networks:
   - range: 10.10.0.0/24
     gateway: 10.10.0.1
     dns:
-    - 10.10.0.5
+    - 10.10.0.6
     cloud_properties:
       subnet: <%= subnet %>
 - name: vip_network
diff --git a/bosh_aws_bootstrap/templates/micro_bosh.yml.erb b/bosh_aws_bootstrap/templates/micro_bosh.yml.erb
index e6e0311e217..1f69a93823d 100644
--- a/bosh_aws_bootstrap/templates/micro_bosh.yml.erb
+++ b/bosh_aws_bootstrap/templates/micro_bosh.yml.erb
@@ -7,7 +7,7 @@ logging:
 network:
   type: manual
   vip:  <%= vip %>
-  ip: 10.10.0.5
+  ip: 10.10.0.6
   cloud_properties:
     subnet: <%= subnet %>
 
@@ -31,12 +31,12 @@ cloud:
 apply_spec:
   agent:
     blobstore:
-      address: 10.10.0.5
+      address: 10.10.0.6
     nats:
-      address: 10.10.0.5
+      address: 10.10.0.6
   properties:
     registry:
-      address: 10.10.0.5
+      address: 10.10.0.6
     aws:
       access_key_id: <%= access_key_id %>
       secret_access_key: <%= secret_access_key %>
diff --git a/spec/assets/aws/deployments/micro/micro_bosh.yml b/spec/assets/aws/deployments/micro/micro_bosh.yml
index 27eb2747b96..66fc50466f7 100644
--- a/spec/assets/aws/deployments/micro/micro_bosh.yml
+++ b/spec/assets/aws/deployments/micro/micro_bosh.yml
@@ -6,7 +6,7 @@ logging:
 
 network:
   type: manual
-  ip: 10.10.0.5
+  ip: 10.10.0.6
   vip:  <%= ENV["MICROBOSH_IP"] %>
   cloud_properties:
     subnet: <%= ENV["BOSH_SUBNET_ID"] %>
diff --git a/spec/external/aws_bootstrap_spec.rb b/spec/external/aws_bootstrap_spec.rb
index 8b4843d0e3a..74d340e95ae 100644
--- a/spec/external/aws_bootstrap_spec.rb
+++ b/spec/external/aws_bootstrap_spec.rb
@@ -96,7 +96,7 @@
     end
 
     it "assigns DHCP options" do
-      vpc.dhcp_options.configuration[:domain_name_servers].should =~ ['10.10.0.5', '10.10.0.2']
+      vpc.dhcp_options.configuration[:domain_name_servers].should =~ ['10.10.0.6', '10.10.0.2']
     end
 
     it "assigns security groups" do