diff --git a/tf-modules/base/outputs.tf b/tf-modules/base/outputs.tf
index 74878972..3baa039b 100644
--- a/tf-modules/base/outputs.tf
+++ b/tf-modules/base/outputs.tf
@@ -92,7 +92,9 @@ EOF
 output "gke_cluster_endpoint" {
   value = google_container_cluster.primary.endpoint
 }
-
+output "gke_cluster_ca_certificate" {
+  value = google_container_cluster.primary.master_auth[0].cluster_ca_certificate
+}
 output "cd_service_account_secret" {
   value = kubernetes_service_account.cd.secret
 }
diff --git a/tf-workspace/outputs.tf b/tf-workspace/outputs.tf
new file mode 100644
index 00000000..e1b5b5f0
--- /dev/null
+++ b/tf-workspace/outputs.tf
@@ -0,0 +1,9 @@
+// Output Kubernetes connection arguments so that we can configure CodeFresh by hand. See:
+// https://github.com/codefresh-io/terraform-provider-codefresh/issues/20
+output "gw_test_cd_connection" {
+  value = <<EOF
+cluster_endpoint: ${module.gw_test.gke_cluster_endpoint}
+cluster_ca_certificate: ${module.gw_test.gke_cluster_ca_certificate}
+satoken: ${module.gw_test.cd_service_account_secret}
+EOF
+}