diff --git a/ccp/ccp-build.sh b/ccp/ccp-build.sh
index f3149e213..0678ed9e2 100755
--- a/ccp/ccp-build.sh
+++ b/ccp/ccp-build.sh
@@ -26,9 +26,12 @@ create_mirantis_mcp_conf() {
 push = False
 
 [registry]
-address = "registry01-bud.ng.mirantis.net:5800"
+address = "registry01-bud.ng.mirantis.net"
 insecure = True
 
+[images]
+namespace = "nextgen"
+
 [kubernetes]
 environment = "openstack"
 
diff --git a/playbooks/ccp-build.yaml b/playbooks/ccp-build.yaml
index bf660a79e..6b1c05c07 100644
--- a/playbooks/ccp-build.yaml
+++ b/playbooks/ccp-build.yaml
@@ -1,3 +1,10 @@
+- hosts: all
+  tasks:
+    - lineinfile:
+        dest: /etc/hosts
+        regexp: 'registry01-bud.ng.mirantis.net'
+        line: '172.16.180.121 registry01-bud.ng.mirantis.net'
+
 - hosts: kube-master
   pre_tasks:
     - name: Rsync CCP repos