diff --git a/keps/sig-cloud-provider/providers/0004-cloud-provider-template.md b/keps/sig-cloud-provider/providers/0000-cloud-provider-template/README.md
similarity index 92%
rename from keps/sig-cloud-provider/providers/0004-cloud-provider-template.md
rename to keps/sig-cloud-provider/providers/0000-cloud-provider-template/README.md
index 83cacdee2c6..a35ab1c1489 100644
--- a/keps/sig-cloud-provider/providers/0004-cloud-provider-template.md
+++ b/keps/sig-cloud-provider/providers/0000-cloud-provider-template/README.md
@@ -1,32 +1,3 @@
----
-kep-number: 4
-title: Cloud Provider Template
-authors:
-  - "@janedoe"
-owning-sig: sig-cloud-provider
-participating-sigs:
-  - sig-aaa
-  - sig-bbb
-reviewers:
-  - TBD
-  - "@alicedoe"
-approvers:
-  - "@andrewsykim"
-  - "@hogepodge"
-  - "@jagosan"
-editor: TBD
-creation-date: yyyy-mm-dd
-last-updated: yyyy-mm-dd
-status: provisional
-see-also:
-  - KEP-1
-  - KEP-2
-replaces:
-  - KEP-3
-superseded-by:
-  - KEP-100
----
-
 # Cloud Provider FooBar
 
 This is a KEP template, outlining how to propose a new cloud provider into the Kubernetes ecosystem.
diff --git a/keps/sig-cloud-provider/providers/0000-cloud-provider-template/kep.yaml b/keps/sig-cloud-provider/providers/0000-cloud-provider-template/kep.yaml
new file mode 100644
index 00000000000..dc0c008ff67
--- /dev/null
+++ b/keps/sig-cloud-provider/providers/0000-cloud-provider-template/kep.yaml
@@ -0,0 +1,26 @@
+title: Cloud Provider Template
+kep-number: 0000
+authors:
+  - "@janedoe"
+owning-sig: sig-cloud-provider
+participating-sigs:
+  - sig-aaa
+  - sig-bbb
+reviewers:
+  - TBD
+  - "@alicedoe"
+approvers:
+  - "@andrewsykim"
+  - "@hogepodge"
+  - "@jagosan"
+editor: TBD
+creation-date: yyyy-mm-dd
+last-updated: yyyy-mm-dd
+status: provisional
+see-also:
+  - KEP-1
+  - KEP-2
+replaces:
+  - KEP-3
+superseded-by:
+  - KEP-100
diff --git a/keps/sig-cloud-provider/providers/0020-cloud-provider-alibaba-cloud.md b/keps/sig-cloud-provider/providers/2530-alibaba-cloud/README.md
similarity index 95%
rename from keps/sig-cloud-provider/providers/0020-cloud-provider-alibaba-cloud.md
rename to keps/sig-cloud-provider/providers/2530-alibaba-cloud/README.md
index 040d60e6a74..3618eed2504 100644
--- a/keps/sig-cloud-provider/providers/0020-cloud-provider-alibaba-cloud.md
+++ b/keps/sig-cloud-provider/providers/2530-alibaba-cloud/README.md
@@ -1,20 +1,3 @@
----
-title: Cloud Provider for Alibaba Cloud
-authors:
-  - "@aoxn"
-owning-sig: sig-cloud-provider
-reviewers:
-  - "@andrewsykim"
-approvers:
-  - "@andrewsykim"
-  - "@hogepodge"
-  - "@jagosan"
-editor: TBD
-creation-date: 2018-06-20
-last-updated: 2018-06-20
-status: provisional
----
-
 # Cloud Provider for Alibaba Cloud
 
 This is a KEP for adding ```Cloud Provider for Alibaba Cloud``` into the Kubernetes ecosystem.
diff --git a/keps/sig-cloud-provider/providers/2530-alibaba-cloud/kep.yaml b/keps/sig-cloud-provider/providers/2530-alibaba-cloud/kep.yaml
new file mode 100644
index 00000000000..dfdfb10a76b
--- /dev/null
+++ b/keps/sig-cloud-provider/providers/2530-alibaba-cloud/kep.yaml
@@ -0,0 +1,15 @@
+title: Cloud Provider for Alibaba Cloud
+kep-number: 2530
+authors:
+  - "@aoxn"
+owning-sig: sig-cloud-provider
+reviewers:
+  - "@andrewsykim"
+approvers:
+  - "@andrewsykim"
+  - "@hogepodge"
+  - "@jagosan"
+editor: TBD
+creation-date: 2018-06-20
+last-updated: 2018-06-20
+status: provisional
diff --git a/keps/sig-cloud-provider/providers/0022-cloud-provider-baiducloud.md b/keps/sig-cloud-provider/providers/2531-baidu-cloud/README.md
similarity index 93%
rename from keps/sig-cloud-provider/providers/0022-cloud-provider-baiducloud.md
rename to keps/sig-cloud-provider/providers/2531-baidu-cloud/README.md
index e6d91b80e50..a1d1e4320e7 100644
--- a/keps/sig-cloud-provider/providers/0022-cloud-provider-baiducloud.md
+++ b/keps/sig-cloud-provider/providers/2531-baidu-cloud/README.md
@@ -1,22 +1,3 @@
----
-title: Cloud Provider for BaiduCloud
-authors:
-  - "@tizhou86"
-owning-sig: sig-cloud-provider
-reviewers:
-  - "@andrewsykim"
-  - "@cheftako"
-approvers:
-  - "@andrewsykim"
-  - "@cheftako"
-  - "@hogepodge"
-  - "@jagosan"
-editor: TBD
-creation-date: 2020-02-25
-last-updated: 2020-02-25
-status: implementable
----
-
 # Cloud Provider BaiduCloud
 
 ## Table of Contents
diff --git a/keps/sig-cloud-provider/providers/2531-baidu-cloud/kep.yaml b/keps/sig-cloud-provider/providers/2531-baidu-cloud/kep.yaml
new file mode 100644
index 00000000000..dc3c8e5b4e4
--- /dev/null
+++ b/keps/sig-cloud-provider/providers/2531-baidu-cloud/kep.yaml
@@ -0,0 +1,16 @@
+title: Cloud Provider for BaiduCloud
+kep-number: 2531
+authors:
+  - "@tizhou86"
+owning-sig: sig-cloud-provider
+reviewers:
+  - "@andrewsykim"
+  - "@cheftako"
+approvers:
+  - "@andrewsykim"
+  - "@cheftako"
+  - "@hogepodge"
+  - "@jagosan"
+creation-date: 2020-02-25
+last-updated: 2020-02-25
+status: implementable
diff --git a/keps/sig-cloud-provider/providers/20191206-cloud-provider-huaweicloud.md b/keps/sig-cloud-provider/providers/2532-huawei-cloud/README.md
similarity index 95%
rename from keps/sig-cloud-provider/providers/20191206-cloud-provider-huaweicloud.md
rename to keps/sig-cloud-provider/providers/2532-huawei-cloud/README.md
index 87e7fdb72e1..2c212dfbce6 100644
--- a/keps/sig-cloud-provider/providers/20191206-cloud-provider-huaweicloud.md
+++ b/keps/sig-cloud-provider/providers/2532-huawei-cloud/README.md
@@ -1,23 +1,3 @@
----
-title: Cloud Provider For HUAWEI CLOUD
-authors:
-  - "@RainbowMango"
-owning-sig: sig-cloud-provider
-reviewers:
-  - "@andrewsykim"
-  - "@cheftako"
-approvers:
-  - "@andrewsykim"
-  - "@cheftako"
-editor: TBD
-creation-date: 2019-12-06
-last-updated: 2020-02-26
-status: implementable
-see-also:
-replaces:
-superseded-by:
----
-
 # Cloud Provider For HUAWEI CLOUD
 
 This is a KEP for adding `Cloud Provider For HUAWEI CLOUD` into the Kubernetes ecosystem.
diff --git a/keps/sig-cloud-provider/providers/2532-huawei-cloud/kep.yaml b/keps/sig-cloud-provider/providers/2532-huawei-cloud/kep.yaml
new file mode 100644
index 00000000000..04f77a0090c
--- /dev/null
+++ b/keps/sig-cloud-provider/providers/2532-huawei-cloud/kep.yaml
@@ -0,0 +1,14 @@
+title: Cloud Provider For HUAWEI CLOUD
+kep-number: 2532
+authors:
+  - "@RainbowMango"
+owning-sig: sig-cloud-provider
+reviewers:
+  - "@andrewsykim"
+  - "@cheftako"
+approvers:
+  - "@andrewsykim"
+  - "@cheftako"
+creation-date: 2019-12-06
+last-updated: 2020-02-26
+status: implementable