diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 9f9dacf..5f52209 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -28,15 +28,14 @@ meta:
     email:  (( param "Please provide the git email for automated commits" ))
     name:   (( param "Please provide the git name for automated commits" ))
 
-  kubernetes:
-    pool:
-      uri: (( param "Please provide kubernetes pool uri" ))
-      branch: (( param "Please provide kubernetes pool branch" ))
-      private_key: (( param "Please provide kubernetes pool private_key" ))
-      name: (( param "Please provide kubernetes pool pool" ))
-
   google:
     serviceaccount: (( param "Please provide GCP Service Account JSON" ))
+    gcloud_project: (( param "Please provide GKE gcloud_project" ))
+    gcloud_cluster: (( param "Please provide GKE gcloud_cluster" ))
+    gcloud_zone:    (( param "Please provide GKE gcloud_zone" ))
+    ca_cert:        (( param "Please provide GKE ca_cert" ))
+    client_cert:    (( param "Please provide GKE client_cert" ))
+    client_key:     (( param "Please provide GKE client_key" ))
 
   aws:
     bucket:     (( concat meta.name "-pipeline" ))
@@ -341,22 +340,22 @@ resources:
     type: helm
     source:
       release: (( concat "ci-test-" meta.name ))
-      gcloud_auth: ((gcp-service-account-knative-experiments))
-      gcloud_project: ((gke-project-name))
-      gcloud_cluster: ((gke-cluster-name))
-      gcloud_zone:    ((gke-cluster-zone))
-      ca_cert:        ((helm-ca))
-      client_cert:    ((helm-tiller-cert))
-      client_key:     ((helm-tiller-key))
+      gcloud_auth:    (( grab meta.google.serviceaccount ))
+      gcloud_project: (( grab meta.google.gcloud_project ))
+      gcloud_cluster: (( grab meta.google.gcloud_cluster ))
+      gcloud_zone:    (( grab meta.google.gcloud_zone ))
+      ca_cert:        (( grab meta.google.ca_cert ))
+      client_cert:    (( grab meta.google.client_cert ))
+      client_key:     (( grab meta.google.client_key ))
 
   - name: helm-install-latest
     type: helm
     source:
       release: (( concat "ci-latest-" meta.name ))
-      gcloud_auth: ((gcp-service-account-knative-experiments))
-      gcloud_project: ((gke-project-name))
-      gcloud_cluster: ((gke-cluster-name))
-      gcloud_zone:    ((gke-cluster-zone))
-      ca_cert:        ((helm-ca))
-      client_cert:    ((helm-tiller-cert))
-      client_key:     ((helm-tiller-key))
+      gcloud_auth:    (( grab meta.google.serviceaccount ))
+      gcloud_project: (( grab meta.google.gcloud_project ))
+      gcloud_cluster: (( grab meta.google.gcloud_cluster ))
+      gcloud_zone:    (( grab meta.google.gcloud_zone ))
+      ca_cert:        (( grab meta.google.ca_cert ))
+      client_cert:    (( grab meta.google.client_cert ))
+      client_key:     (( grab meta.google.client_key ))
diff --git a/ci/settings.yml b/ci/settings.yml
index 504a4b0..7f1de98 100644
--- a/ci/settings.yml
+++ b/ci/settings.yml
@@ -11,15 +11,14 @@ meta:
     email:  ((git-commit-email))
     name:   ((git-commit-name))
 
-  kubernetes:
-    pool:
-      uri: git@github.com:drnic/example-concourse-kubenetes-pool.git
-      branch: master
-      private_key: ((github-private-key))
-      name: gke
-
   google:
     serviceaccount: ((gcp-service-account-knative-experiments))
+    gcloud_project: ((gke-project-name))
+    gcloud_cluster: ((gke-cluster-name))
+    gcloud_zone:    ((gke-cluster-zone))
+    ca_cert:        ((helm-ca))
+    client_cert:    ((helm-tiller-cert))
+    client_key:     ((helm-tiller-key))
 
   aws:
     bucket:      (( grab meta.pipeline ))