diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 56b73f44aee..23afee804e3 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -174,8 +174,9 @@ function create-federation-api-objects {
       $host_kubectl create secret generic ${name} --from-file="${dir}/kubeconfig" --namespace="${FEDERATION_NAMESPACE}"
     done
 
-    $template "${manifests_root}/federation-apiserver-"{deployment,secrets}".yaml" | $host_kubectl create -f -
-    $template "${manifests_root}/federation-controller-manager-deployment.yaml" | $host_kubectl create -f -
+    for file in federation-etcd-pvc.yaml federation-apiserver-{deployment,secrets}.yaml federation-controller-manager-deployment.yaml; do
+      $template "${manifests_root}/${file}" | $host_kubectl create -f -
+    done
 
     # Update the users kubeconfig to include federation-apiserver credentials.
     CONTEXT=federation-cluster \
diff --git a/federation/manifests/federation-apiserver-deployment.yaml b/federation/manifests/federation-apiserver-deployment.yaml
index 5656298b696..1b21dbb999b 100644
--- a/federation/manifests/federation-apiserver-deployment.yaml
+++ b/federation/manifests/federation-apiserver-deployment.yaml
@@ -36,7 +36,17 @@ spec:
           readOnly: true
       - name: etcd
         image: quay.io/coreos/etcd:v2.3.3
+        command:
+          - /etcd
+          - --data-dir
+          - /var/etcd/data
+        volumeMounts:
+        - mountPath: /var/etcd
+          name: varetcd
       volumes:
       - name: federation-apiserver-secrets
         secret:
           secretName: federation-apiserver-secrets
+      - name: varetcd
+        persistentVolumeClaim:
+          claimName: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}-etcd-claim
diff --git a/federation/manifests/federation-etcd-pvc.yaml b/federation/manifests/federation-etcd-pvc.yaml
new file mode 100644
index 00000000000..c7a28225272
--- /dev/null
+++ b/federation/manifests/federation-etcd-pvc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{.FEDERATION_APISERVER_DEPLOYMENT_NAME}}-etcd-claim
+  annotations:
+    volume.alpha.kubernetes.io/storage-class: "yes"
+  namespace: {{.FEDERATION_NAMESPACE}}
+  labels:
+    app: federated-cluster
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi