diff --git a/net-proxy/byedpi/byedpi-0.14.1.ebuild b/net-proxy/byedpi/byedpi-0.14.1.ebuild
index fe55fa6f69..749bd26c4d 100644
--- a/net-proxy/byedpi/byedpi-0.14.1.ebuild
+++ b/net-proxy/byedpi/byedpi-0.14.1.ebuild
@@ -31,5 +31,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/byedpi.initd byedpi
 	newconfd "${FILESDIR}"/byedpi.confd byedpi
-	systemd_dounit dist/linux/byedpi.service
+# Replace distributed service file with working one
+#	systemd_dounit dist/linux/byedpi.service
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index 3d771b14a8..31a7b0aa5d 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -31,5 +31,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/byedpi.initd byedpi
 	newconfd "${FILESDIR}"/byedpi.confd byedpi
-	systemd_dounit dist/linux/byedpi.service
+# Replace distributed service file with working one
+#	systemd_dounit dist/linux/byedpi.service
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }
diff --git a/net-proxy/byedpi/files/byedpi.confd b/net-proxy/byedpi/files/byedpi.confd
index e25b7a4264..1b7b318641 100644
--- a/net-proxy/byedpi/files/byedpi.confd
+++ b/net-proxy/byedpi/files/byedpi.confd
@@ -5,4 +5,4 @@
 #BYEDPI_BIND_PORT=1080
 
 # Additional command-line options for ciadpi
-#BYEDPI_OPTS="--disorder 1 --auto=torst --tlsrec 1+s"
+#BYEDPI_OPTS="--disorder 5 --auto=torst --tlsrec 6+s"
diff --git a/net-proxy/byedpi/files/byedpi.initd b/net-proxy/byedpi/files/byedpi.initd
index 979beea391..58c86a4cb4 100644
--- a/net-proxy/byedpi/files/byedpi.initd
+++ b/net-proxy/byedpi/files/byedpi.initd
@@ -6,7 +6,7 @@
 
 : "${BYEDPI_BIND_IP:=0.0.0.0}"
 : "${BYEDPI_BIND_PORT:=1080}"
-: "${BYEDPI_OPTS:=--disorder 1 --auto=torst --tlsrec 1+s}"
+: "${BYEDPI_OPTS:=--disorder 5 --auto=torst --tlsrec 6+s}"
 
 command="/usr/bin/ciadpi"
 command_args="--ip ${BYEDPI_BIND_IP} --port ${BYEDPI_BIND_PORT} ${BYEDPI_OPTS}"
diff --git a/net-proxy/byedpi/files/byedpi.service b/net-proxy/byedpi/files/byedpi.service
index 8f8063711d..13f956d864 100644
--- a/net-proxy/byedpi/files/byedpi.service
+++ b/net-proxy/byedpi/files/byedpi.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/hufrea/byedpi/blob/main/readme.txt
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/ciadpi --disorder 1 --auto=torst --tlsrec 1+s
+ExecStart=/usr/bin/ciadpi --disorder 5 --auto=torst --tlsrec 6+s
 
 [Install]
 WantedBy=multi-user.target