diff --git a/Makefile b/Makefile
index 69f199f1629dfed0b52a1588b11fcb0539097bde..00a425c5655d701dcbee9f7f3a151e468c87f895 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ build-plugins:
 	    d="$${d##*/}";\
 		rm plugin-registry/plugins/$$d/$(PLUGIN_NAME);\
 		$(GOBUILD) -o plugin-registry/plugins/$$d/plugin ./plugins/$$d/cmd;\
+		cp plugins/$$d/plugin.yaml plugin-registry/plugins/$$d/;\
 		zip -r -j plugin-registry/plugins/$$d/$(PLUGIN_NAME) plugin-registry/plugins/$$d/;\
 		rm plugin-registry/plugins/$$d/plugin;\
 	done
diff --git a/plugin-registry/plugins/.gitkeep b/plugin-registry/plugins/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/plugin-registry/plugins/openconfig/plugin.yaml b/plugin-registry/plugins/openconfig/plugin.yaml
deleted file mode 100644
index d9c164479d5f8647c838ec0e4d8ccbbab634ed13..0000000000000000000000000000000000000000
--- a/plugin-registry/plugins/openconfig/plugin.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: "Openconfig"
-firmware: "standard"
-author: "goSDN-Team"
-version: "1.0.0"