diff --git a/maas/cluster.sls b/maas/cluster.sls
index 072322f..e84392e 100644
--- a/maas/cluster.sls
+++ b/maas/cluster.sls
@@ -1,17 +1,17 @@
 {%- from "maas/map.jinja" import cluster with context %}
 {%- if cluster.enabled %}
 
-mass_cluster_packages:
+maas_cluster_packages:
   pkg.installed:
     - names: {{ cluster.pkgs }}
 
 {{ cluster.config.cluster }}:
   file.line:
-  - content: 'maas_url: http://10.200.50.13/'
+  - content: 'maas_url: {{ cluster.region.host }}:{{ cluster.region.port }}'
   - match: 'maas_url*'
   - mode: replace
   - location: end
   - require:
-    - pkg: mass_cluster_packages
+    - pkg: maas_cluster_packages
 
 {%- endif %}
diff --git a/maas/map.jinja b/maas/map.jinja
index dfeb47c..a0a8ef4 100644
--- a/maas/map.jinja
+++ b/maas/map.jinja
@@ -35,8 +35,8 @@
   - maas-region-controller
   service: maas
   bind:
-    host: {{ grains.item.ivp4.0 }}
+    host: {{ grains.ipv4[0] }}
     port: 80
 {%- endload %}
 
-{%- set region = salt['grains.filter_by'](region_defaults, merge=salt['pillar.get']('maas:region', {})) %}
\ No newline at end of file
+{%- set region = salt['grains.filter_by'](region_defaults, merge=salt['pillar.get']('maas:region', {})) %}
diff --git a/maas/region.sls b/maas/region.sls
index 06f8bb4..e1e7204 100644
--- a/maas/region.sls
+++ b/maas/region.sls
@@ -1,7 +1,7 @@
 {%- from "maas/map.jinja" import region with context %}
 {%- if region.enabled %}
 
-mass_region_packages:
+maas_region_packages:
   pkg.installed:
     - names: {{ region.pkgs }}
 
@@ -10,7 +10,7 @@
   - source: salt://maas/files/region.conf
   - template: jinja
   - require:
-    - pkg: mass_region_packages
+    - pkg: maas_region_packages
 
 /etc/maas/preseeds/curtin_userdata_amd64_generic_trusty:
   file.managed:
@@ -20,6 +20,8 @@
   - group: root
   - mode: 644
   - require:
-    - pkg: mass_region_packages
+    - pkg: maas_region_packages
 
 {%- endif %}
+
+
diff --git a/metadata/service/server/vendor_repo.yml b/metadata/service/server/vendor_repo.yml
index a53375a..bf37918 100644
--- a/metadata/service/server/vendor_repo.yml
+++ b/metadata/service/server/vendor_repo.yml
@@ -3,5 +3,5 @@
     system:
       repo:
         maas:
-          source: deb http://ppa.launchpad.net/maas/stable/ubuntu trusty main
+          source: deb http://ppa.launchpad.net/maas/stable/ubuntu xenial main
           key_url: salt://maas/files/vendor_key.gpg