diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
index 41aafc16f00..9ddf7ea716d 100644
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -1,3 +1,5 @@
+{% set num_cpus = salt['grains.get']('num_cpus', '') %}
+
 {
 "apiVersion": "v1beta3",
 "kind": "Pod",
@@ -29,6 +31,10 @@
       { "name": "varetcd",
         "mountPath": "/var/etcd",
         "readOnly": false}
+        ],
+    "env": [
+      { "name": "GOMAXPROCS",
+        "value": "{{num_cpus}}"}
         ]
        }
 ],