diff --git a/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml b/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
index 4d3896d..a47d75e 100644
--- a/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
+++ b/kubernetes/files/kube-addons/externaldns/externaldns-deploy.yml
@@ -69,4 +69,3 @@
         secret:
           secretName: google-secret
       {%- endif %}
->>>>>>> Add Google CloudDNS support to external-dns
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 9855591..b112336 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -94,6 +94,7 @@
         --token-auth-file=/srv/kubernetes/known_tokens.csv
         --apiserver-count={{ master.apiserver.get('count', 1) }}
         --v={{ master.get('verbosity', 2) }}
+        --advertise-address={{ master.apiserver.address }}
         --etcd-servers=
 {%- for member in master.etcd.members -%}
           http{% if master.etcd.get('ssl', {}).get('enabled') %}s{% endif %}://{{ member.host }}:{{ member.get('port', 4001) }}{% if not loop.last %},{% endif %}
diff --git a/kubernetes/master/federation.sls b/kubernetes/master/federation.sls
index ca3228c..48b8d0e 100644
--- a/kubernetes/master/federation.sls
+++ b/kubernetes/master/federation.sls
@@ -73,7 +73,7 @@
     - KUBECONFIG: /etc/kubernetes/federation/federation.kubeconfig
   - require:
     - cmd: kubefed_init
-  - unless: kubectl config current-context | grep {{ master.federation.name }}
+  - unless: kubectl config current-context | grep -w {{ master.federation.name }}
   {%- if grains.get('noservices') %}
   - onlyif: /bin/false
   {%- endif %}
@@ -85,7 +85,7 @@
     - KUBECONFIG: /etc/kubernetes/federation/federation.kubeconfig
   - require:
     - cmd: kubefed_init
-  - unless: kubectl --context={{ master.federation.name }} get clusters | grep {{ common.cluster_name }}
+  - unless: kubectl --context={{ master.federation.name }} get cluster {{ common.cluster_name }}
   {%- if grains.get('noservices') %}
   - onlyif: /bin/false
   {%- endif %}
@@ -100,7 +100,7 @@
   cmd.run:
   - name: kubectl config set-cluster {{ childcluster }} --insecure-skip-tls-verify=true
   - env:
-    - KUBECONFIG: /etc/kubernetes/federation/childclusters.kubeconfig
+    - KUBECONFIG: /etc/kubernetes/federation/federation.kubeconfig
   - require:
     - cmd: kubefed_init
   {%- if grains.get('noservices') %}
@@ -108,15 +108,15 @@
   {%- else %}
   - unless: kubectl --context {{ childcluster }} config view --minify | egrep "insecure-skip-tls-verify. true"
   {%- endif %}
-   
+
 federation_join_cluster_{{ childcluster }}:
   cmd.run:
   - name: kubefed join {{ childcluster }} --host-cluster-context=local --context={{ master.federation.name }}
   - env:
-    - KUBECONFIG: /etc/kubernetes/federation/childclusters.kubeconfig:/etc/kubernetes/federation/federation.kubeconfig
+    - KUBECONFIG: /etc/kubernetes/federation/federation.kubeconfig
   - require:
     - cmd: federation_set_insecure_{{ childcluster }}
-  - unless: kubectl --context {{ master.federation.name }} get clusters | grep {{ childcluster }}
+  - unless: kubectl --context {{ master.federation.name }} get cluster {{ childcluster }}
 
 {%- endfor %}
 {%- endif %}