diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml
index ad6f5454f7..dd376439d3 100644
--- a/sys-cluster/nanos6/metadata.xml
+++ b/sys-cluster/nanos6/metadata.xml
@@ -15,7 +15,6 @@
 		<!--<flag name="cuda">enable CUDA</flag>-->
 		<flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
 		<flag name="dlb">enable dynamic management and sharing of computing resources</flag>
-		<flag name="embed-code-changes">embed into the runtime any code changes present in the source</flag>
 		<flag name="execution-workflow">Enable execution using the Execution Workflow</flag>
 		<flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
 		<!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
diff --git a/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild b/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild
index 64d0428f44..0ddc6ac313 100644
--- a/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bsc-pm/nanos6/archive/refs/tags/version-${PV}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cluster debug dlb embed-code-changes execution-workflow extrae git papi unwind"
+IUSE="cluster debug dlb execution-workflow extrae papi unwind"
 #chrono-arch build fail
 #jemalloc require custom stuff
 #TODO: cuda pqos mercurium memkind k1om
@@ -24,7 +24,6 @@ RDEPEND="
 
 	cluster? ( virtual/mpi )
 	dlb? ( sys-cluster/dlb )
-	embed-code-changes? ( dev-vcs/git )
 	extrae? ( sys-cluster/extrae[nanos] )
 	papi? ( dev-libs/papi )
 	unwind? ( sys-libs/libunwind )
@@ -42,6 +41,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-chrono-arch
+		--disable-embed-code-changes
 		--disable-openacc
 		--disable-static
 
@@ -51,6 +51,7 @@ src_configure() {
 		--with-libnuma="${EPREFIX}/usr"
 		--with-pic
 
+		--without-git
 		--without-k1om
 		--without-nanos6-clang
 		--without-nanos6-mercurium
@@ -58,16 +59,10 @@ src_configure() {
 
 		$(use_enable cluster)
 		$(use_enable debug extra-debug)
-		$(use_enable embed-code-changes)
 		$(use_enable execution-workflow)
 	)
 	use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
 
-	if use embed-code-changes; then
-		myconf+=( "--with-git=${EPREFIX}/usr" )
-	else
-		myconf+=( "--without-git" )
-	fi
 	if use extrae; then
 		myconf+=( "--with-extrae=${EPREFIX}/usr/$(get_libdir)/extrae" )
 	else