diff --git a/kubernetes/files/basic_auth.csv b/kubernetes/files/basic_auth.csv
index 69740b5..00ee9c6 100644
--- a/kubernetes/files/basic_auth.csv
+++ b/kubernetes/files/basic_auth.csv
@@ -1,2 +1,2 @@
 {%- from "kubernetes/map.jinja" import master with context %}
-{{ master.admin.username }},{{ master.admin.password }},admin
\ No newline at end of file
+{{ master.admin.password }},{{ master.admin.username }},admin
\ No newline at end of file
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index d81695e..6359e40 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -11,18 +11,18 @@
       registry: tcpcloud
       service_addresses: 10.254.0.0/16
       admin:
-        username: admin
-        password: password
+        username: ${_param:kubernetes_admin_user}
+        password: ${_param:kubernetes_admin_password}
       kubelet:
         allow_privileged: True
       apiserver:
-        address: ${_param:apiserver_address}
+        address: ${_param:cluster_local_address}
         insecure_address: 0.0.0.0
       etcd:
-        host: 10.10.6.187
+        host: ${_param:cluster_local_address}
         registry: quay.io/coreos
-        version: v3.0.1
-        token: ca939ec9c2a17b0786f6d411fe019e9b
+        version: ${_param:etcd_version}
+        token: ${_param:etcd_initial_token}
         name: ${linux:system:name}
         members:
           - host: ${_param:cluster_node01_address}
@@ -37,21 +37,13 @@
           replicas: 1
           domain: cluster.local
           server: 10.254.0.10
-        ui:
-          enabled: true
-          public_ip: 185.22.97.131
-        heapster_influxdb:
-          enabled: true
-          public_ip: 185.22.97.132
       token:
-        admin: DFvQ8GJ9JD4fKNfuyEddw3rjnFTkUKsv
-        kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
-        kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
-        scheduler: HY1UUxEPpmjW4a1dDLGIANYQp1nZkLDk
-        controller_manager: EreGh6AnWf8DxH8cYavB2zS029PUi7vx
-        logging: MJkXKdbgqRmTHSa2ykTaOaMykgO6KcEf
-        monitoring: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
-        dns: RAFeVSE4UvsCz4gk3KYReuOI5jsZ1Xt3
+        admin: ${_param:kubernetes_admin_token}
+        kubelet: ${_param:kubernetes_kubelet_token}
+        kube_proxy: ${_param:kubernetes_kube-proxy_token}
+        scheduler: ${_param:kubernetes_scheduler_token}
+        controller_manager: ${_param:kubernetes_controller-manager_token}
+        dns: ${_param:kubernetes_dns_token}
       ca: kubernetes
       storage:
         engine: none
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 0289d32..c145469 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -11,21 +11,21 @@
       registry: tcpcloud
       service_addresses: 10.254.0.0/16
       admin:
-        username: admin
-        password: password
+        username: ${_param:kubernetes_admin_user}
+        password: ${_param:kubernetes_admin_password}
       kubelet:
         allow_privileged: True
       apiserver:
-        address: ${_param:apiserver_address}
+        address: ${_param:single_address}
         insecure_address: 0.0.0.0
       etcd:
-        host: 127.0.0.1
+        host: ${_param:single_address}
         registry: quay.io/coreos
-        version: v3.0.1
-        token: ca939ec9c2a17b0786f6d411fe019e9b
+        version: ${_param:etcd_version}
+        token: ${_param:etcd_initial_token}
         name: ${linux:system:name}
         members:
-          - host: ${_param:apiserver_address}
+          - host: ${_param:single_address}
             name: ${linux:system:name}
       addons:
         dns:
@@ -33,21 +33,13 @@
           replicas: 1
           domain: cluster.local
           server: 10.254.0.10
-        ui:
-          enabled: true
-          public_ip: 185.22.97.131
-        heapster_influxdb:
-          enabled: true
-          public_ip: 185.22.97.132
       token:
-        admin: DFvQ8GJ9JD4fKNfuyEddw3rjnFTkUKsv
-        kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
-        kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
-        scheduler: HY1UUxEPpmjW4a1dDLGIANYQp1nZkLDk
-        controller_manager: EreGh6AnWf8DxH8cYavB2zS029PUi7vx
-        logging: MJkXKdbgqRmTHSa2ykTaOaMykgO6KcEf
-        monitoring: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
-        dns: RAFeVSE4UvsCz4gk3KYReuOI5jsZ1Xt3
+        admin: ${_param:kubernetes_admin_token}
+        kubelet: ${_param:kubernetes_kubelet_token}
+        kube_proxy: ${_param:kubernetes_kube-proxy_token}
+        scheduler: ${_param:kubernetes_scheduler_token}
+        controller_manager: ${_param:kubernetes_controller-manager_token}
+        dns: ${_param:kubernetes_dns_token}
       ca: kubernetes
       storage:
         engine: none
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 2af7759..dc87cbb 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -31,6 +31,6 @@
         allow_privileged: True
         frequency: 5s
       token:
-        kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
-        kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
+        kubelet: ${_param:kubernetes_kubelet_token}
+        kube_proxy: ${_param:kubernetes_kube-proxy_token}
       ca: kubernetes
\ No newline at end of file
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index 863c48d..ac4254e 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -28,6 +28,6 @@
         allow_privileged: True
         frequency: 5s
       token:
-        kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
-        kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
+        kubelet: ${_param:kubernetes_kubelet_token}
+        kube_proxy: ${_param:kubernetes_kube-proxy_token}
       ca: kubernetes
\ No newline at end of file