diff --git a/Vagrantfile b/Vagrantfile
index dc25c9914..842df8d5b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,6 +14,7 @@ $user = ENV["USER"]
 $public_subnet = prefix.to_s + ".0"
 $private_subnet = prefix.to_s + ".1"
 $mgmt_cidr = prefix.to_s + ".2.0/24"
+$neutron_subnet = "172.30.250"
 
 $instance_name_prefix = "#{$user}-k8s"
 
@@ -91,6 +92,7 @@ Vagrant.configure("2") do |config|
         :libvirt__forward_mode => "none"
       # "neutron" isolated network
       test_vm.vm.network :private_network,
+        :ip => "#{$neutron_subnet}.#{i+10}",
         :model_type => "e1000",
         :libvirt__network_name => "#{$instance_name_prefix}-neutron",
         :libvirt__dhcp_enabled => false,
diff --git a/playbooks/ccp-build.yaml b/playbooks/ccp-build.yaml
index c3e3d7881..ee28322f2 100644
--- a/playbooks/ccp-build.yaml
+++ b/playbooks/ccp-build.yaml
@@ -1,10 +1,10 @@
 - hosts: kube-master
   pre_tasks:
     - name: Download fuel-ccp
-      shell: git clone https://git.openstack.org/openstack/fuel-ccp
-      args:
-        chdir: /usr/local/src
-        creates: /usr/local/src/fuel-ccp/setup.py
+      git:
+        repo: https://git.openstack.org/openstack/fuel-ccp
+        dest: /usr/local/src/fuel-ccp
+        version: master
     - name: Upload ccp configs to master nodes
       synchronize:
         src: ../ccp/
@@ -36,10 +36,7 @@
       when: get_svc.stdout.find('registry') == -1
     - name: Fetch CCP images
       shell: mcp-microservices --config-file=/root/ccp/ccp.conf fetch
-        chdir: /usr/local/src
       run_once: true
     - name: Build CCP images
       shell: mcp-microservices --config-file=/root/ccp/ccp.conf build
-      args:
-        chdir: /root/ccp
       run_once: true