diff --git a/net-proxy/zaproxy/metadata.xml b/net-proxy/zaproxy/metadata.xml
new file mode 100644
index 000000000..7bfc5dd05
--- /dev/null
+++ b/net-proxy/zaproxy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sidhayn@gmail.com</email>
+		<name>Zero_Chaos</name>
+	</maintainer>
+	<use>
+		<flag name="plugins">Install plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">zaproxy/zaproxy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-proxy/zaproxy/zaproxy-2.13.0.ebuild b/net-proxy/zaproxy/zaproxy-2.13.0.ebuild
index cfb605ad6..4a672ba04 100644
--- a/net-proxy/zaproxy/zaproxy-2.13.0.ebuild
+++ b/net-proxy/zaproxy/zaproxy-2.13.0.ebuild
@@ -46,6 +46,7 @@ HOMEPAGE="https://github.com/zaproxy/zaproxy"
 SRC_URI="https://github.com/zaproxy/zaproxy/releases/download/v${PV}/ZAP_${PV}_Linux.tar.gz
 		plugins? ( $PL_URL $PLUGIN_HUD_URL ) "
 
+S="${WORKDIR}/ZAP_${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -54,8 +55,6 @@ IUSE="+plugins"
 #java-pkg-2 sets java based on RDEPEND so the java slot in rdepend is used to build
 RDEPEND="|| ( >=virtual/jre-11:* virtual/jdk:* )"
 
-S="${WORKDIR}/ZAP_${PV}"
-
 src_prepare() {
 	if use plugins ; then
 		rm "${S}"/plugin/ascanrules-*.zap