diff --git a/sys-libs/iceoryx/iceoryx-2.0.3.ebuild b/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
index 91a29125be..318d809ee5 100644
--- a/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
+++ b/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
@@ -3,26 +3,26 @@
 
 EAPI=8
 
-inherit cmake 
-
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/eclipse-iceoryx/iceoryx"
-	inherit git-r3	
+	inherit git-r3
 else
 	SRC_URI="https://github.com/eclipse-iceoryx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-S="${WORKDIR}/${P}"
-B="${WORKDIR}/${P}_build"
 DESCRIPTION="Eclipse Iceoryx zero copy IPC"
 HOMEPAGE="https://iceoryx.io"
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test doc examples ccache"
-RESTRICT="!test? ( test )"
+
+# restricted because itt violates network sandbox
+# In next version wee can use GTest_DIR to skip downloading gtest from github
+RESTRICT="test"
 
 RDEPEND=(
 	"doc? ( app-doc/doxygen )"
@@ -32,30 +32,23 @@ RDEPEND=(
 
 DEPEND="${RDEPEND[@]}"
 
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=()
-
 src_prepare() {
-
 	CMAKE_USE_DIR=${S}/${PN}_meta
-	BUILD_DIR=${B}
+	BUILD_DIR="${S}_build"
 	cmake_src_prepare
 }
 
 src_configure() {
-	
 	local mycmakeargs=(
-	 -DBUILD_DOC= $(usex doc)
-	 -DBUILD_ALL=OFF
-	 -DBINDING_C=ON
-	 -DEXAMPLES=$(usex examples)
- 	 -DBUILD_TEST=$(usex test)
- 	 -DCLANG_TIDY=OFF
- 	 -DDOWNLOAD_TOML_LIB=OFF
- 	 -DCMAKE_MODULE_PATH="/usr/lib/cmake/cpptoml"
- 	 -DCCACHE=$(usex ccache)
- 	 
+		-DBUILD_DOC= $(usex doc)
+		-DBUILD_ALL=OFF
+		-DBINDING_C=ON
+		-DEXAMPLES=$(usex examples)
+		-DBUILD_TEST=OFF
+		-DCLANG_TIDY=OFF
+		-DDOWNLOAD_TOML_LIB=OFF
+		-DCMAKE_MODULE_PATH="/usr/lib/cmake/cpptoml"
+		-DCCACHE=$(usex ccache)
 	)
 
 	cmake_src_configure
diff --git a/sys-libs/iceoryx/iceoryx-9999.ebuild b/sys-libs/iceoryx/iceoryx-9999.ebuild
index 91a29125be..5255470435 100644
--- a/sys-libs/iceoryx/iceoryx-9999.ebuild
+++ b/sys-libs/iceoryx/iceoryx-9999.ebuild
@@ -3,19 +3,16 @@
 
 EAPI=8
 
-inherit cmake 
-
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/eclipse-iceoryx/iceoryx"
-	inherit git-r3	
+	inherit git-r3
 else
 	SRC_URI="https://github.com/eclipse-iceoryx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-S="${WORKDIR}/${P}"
-B="${WORKDIR}/${P}_build"
 DESCRIPTION="Eclipse Iceoryx zero copy IPC"
 HOMEPAGE="https://iceoryx.io"
 
@@ -32,30 +29,23 @@ RDEPEND=(
 
 DEPEND="${RDEPEND[@]}"
 
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=()
-
 src_prepare() {
-
 	CMAKE_USE_DIR=${S}/${PN}_meta
-	BUILD_DIR=${B}
+	BUILD_DIR="${S}_build"
 	cmake_src_prepare
 }
 
 src_configure() {
-	
 	local mycmakeargs=(
-	 -DBUILD_DOC= $(usex doc)
-	 -DBUILD_ALL=OFF
-	 -DBINDING_C=ON
-	 -DEXAMPLES=$(usex examples)
- 	 -DBUILD_TEST=$(usex test)
- 	 -DCLANG_TIDY=OFF
- 	 -DDOWNLOAD_TOML_LIB=OFF
- 	 -DCMAKE_MODULE_PATH="/usr/lib/cmake/cpptoml"
- 	 -DCCACHE=$(usex ccache)
- 	 
+		-DBUILD_DOC= $(usex doc)
+		-DBUILD_ALL=OFF
+		-DBINDING_C=ON
+		-DEXAMPLES=$(usex examples)
+		-DBUILD_TEST=$(usex test)
+		-DCLANG_TIDY=OFF
+		-DDOWNLOAD_TOML_LIB=OFF
+		-DCMAKE_MODULE_PATH="/usr/lib/cmake/cpptoml"
+		-DCCACHE=$(usex ccache)
 	)
 
 	cmake_src_configure
diff --git a/sys-libs/iceoryx/metadata.xml b/sys-libs/iceoryx/metadata.xml
new file mode 100644
index 0000000000..1b9eff5a19
--- /dev/null
+++ b/sys-libs/iceoryx/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-needed -->
+	<upstream>
+		<remote-id type="github">eclipse-iceoryx/iceoryx</remote-id>
+	</upstream>
+	<use>
+		<flag name='ccache'>Enable ccache support</flag>
+	</use>
+</pkgmetadata>