diff --git a/ctl/server.go b/ctl/server.go
index 65f854078..7116b8790 100644
--- a/ctl/server.go
+++ b/ctl/server.go
@@ -64,12 +64,6 @@ func BuildServerFlags(cmd *cobra.Command, srv *server.Command) {
 	flags.StringVar(&srv.Config.Etcd.APeerURL, "etcd.advertise-peer-address", srv.Config.Etcd.APeerURL, "Advertise peer address. If not provided, uses the listen peer address.")
 	flags.StringVar(&srv.Config.Etcd.ClusterURL, "etcd.cluster-url", srv.Config.Etcd.ClusterURL, "Cluster URL to join.")
 	flags.StringVar(&srv.Config.Etcd.InitCluster, "etcd.initial-cluster", srv.Config.Etcd.InitCluster, "Initial cluster name1=apurl1,name2=apurl2")
-	// Etcd specified tls configuration options
-	flags.StringVar(&srv.Config.Etcd.TrustedCAFile, "etcd.tls-trusted-cafile", srv.Config.Etcd.TrustedCAFile, "Certificate Authority certificate")
-	flags.StringVar(&srv.Config.Etcd.ClientCertFile, "etcd.tls-cert-file", srv.Config.Etcd.ClientCertFile, "Client certificate (required for tls)")
-	flags.StringVar(&srv.Config.Etcd.ClientKeyFile, "etcd.tls-key-file", srv.Config.Etcd.ClientKeyFile, "Client key file (required for tls)")
-	flags.StringVar(&srv.Config.Etcd.PeerCertFile, "etcd.tls-peer-cert-file", srv.Config.Etcd.PeerCertFile, "Peer certificate (required for tls)")
-	flags.StringVar(&srv.Config.Etcd.PeerKeyFile, "etcd.tls-peer-key-file", srv.Config.Etcd.PeerKeyFile, "Peer key file (required for tls)")
 
 	// AntiEntropy
 	flags.DurationVar((*time.Duration)(&srv.Config.AntiEntropy.Interval), "anti-entropy.interval", (time.Duration)(srv.Config.AntiEntropy.Interval), "Interval at which to run anti-entropy routine.")
diff --git a/server/server.go b/server/server.go
index 40ff3a7ec..d4b47a6e1 100644
--- a/server/server.go
+++ b/server/server.go
@@ -381,6 +381,12 @@ func (m *Command) SetupServer() error {
 	//
 	// Use name for etcd.name
 	m.Config.Etcd.Name = m.Config.Name
+	// use the pilosa provided tls credentials if available
+	m.Config.Etcd.TrustedCAFile = m.Config.TLS.CACertPath
+	m.Config.Etcd.ClientCertFile = m.Config.TLS.CertificatePath
+	m.Config.Etcd.ClientKeyFile = m.Config.TLS.CertificateKeyPath
+	m.Config.Etcd.PeerCertFile = m.Config.TLS.CertificatePath
+	m.Config.Etcd.PeerKeyFile = m.Config.TLS.CertificateKeyPath
 	//
 	// If an Etcd.Dir is not provided, nest a default under the pilosa data dir.
 	if m.Config.Etcd.Dir == "" {