diff --git a/net-wireless/hcxdumptool/hcxdumptool-6.2.7.ebuild b/net-wireless/hcxdumptool/hcxdumptool-6.2.7.ebuild
index 05487a756..41e8f1ccd 100644
--- a/net-wireless/hcxdumptool/hcxdumptool-6.2.7.ebuild
+++ b/net-wireless/hcxdumptool/hcxdumptool-6.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ZerBea/hcxdumptool/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="gpio"
 
 DEPEND="dev-libs/openssl:="
diff --git a/net-wireless/hcxdumptool/metadata.xml b/net-wireless/hcxdumptool/metadata.xml
new file mode 100644
index 000000000..4d5c965db
--- /dev/null
+++ b/net-wireless/hcxdumptool/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>blshkv@pentoo.org</email>
+    <name>Anton Bolshakov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ZerBea/hcxdumptool</remote-id>
+  </upstream>
+  <use>
+    <flag name="gpio">	Turns Raspberry Pi off via GPIO switch</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-wireless/hcxkeys/hcxkeys-6.2.1.ebuild b/net-wireless/hcxkeys/hcxkeys-6.2.1.ebuild
index 2d9ceb036..a3fdfeab7 100644
--- a/net-wireless/hcxkeys/hcxkeys-6.2.1.ebuild
+++ b/net-wireless/hcxkeys/hcxkeys-6.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Generate plainmasterkeys (rainbowtables) and hashes for hashcat/JTR
 HOMEPAGE="https://github.com/ZerBea/hcxkeys"
 SRC_URI="https://github.com/ZerBea/hcxkeys/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE=""
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/net-wireless/hcxkeys/metadata.xml b/net-wireless/hcxkeys/metadata.xml
new file mode 100644
index 000000000..cb067565b
--- /dev/null
+++ b/net-wireless/hcxkeys/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blshkv@pentoo.org</email>
+    <name>Anton Bolshakov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ZerBea/hcxkeys</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-wireless/hcxtools/metadata.xml b/net-wireless/hcxtools/metadata.xml
new file mode 100644
index 000000000..a556235a9
--- /dev/null
+++ b/net-wireless/hcxtools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blshkv@pentoo.org</email>
+    <name>Anton Bolshakov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ZerBea/hcxtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-wireless/wifite/wifite-2.6.6.ebuild b/net-wireless/wifite/wifite-2.6.6.ebuild
index fb042576d..aec86b961 100644
--- a/net-wireless/wifite/wifite-2.6.6.ebuild
+++ b/net-wireless/wifite/wifite-2.6.6.ebuild
@@ -6,6 +6,12 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1
 
+DESCRIPTION="An automated wireless attack tool"
+HOMEPAGE="https://github.com/kimocoder/wifite2"
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="dict opencl extra"
+
 MY_P="${PN}2-${PV}"
 
 if [[ ${PV} == "9999" ]]; then
@@ -17,13 +23,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="An automated wireless attack tool"
-HOMEPAGE="https://github.com/derv82/wifite2"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="dict opencl extra"
-
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
 	net-analyzer/scapy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"