diff --git a/base/Dockerfile b/base/Dockerfile
index fcb85bd2..bf2fda1d 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -68,7 +68,7 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg -
 
 # Get open5gs code and install
 RUN git clone --recursive https://github.com/open5gs/open5gs && cd open5gs && \
-    git checkout tags/v2.7.2 && meson build --prefix=`pwd`/install && \
+    git checkout 04ec945e1d334ca5917705a885eff80ad30e1e38 && meson build --prefix=`pwd`/install && \
     ninja -C build && cd build && ninja install && \
     mkdir -p /open5gs/install/include
 
diff --git a/hss/hss.conf b/hss/hss.conf
index 31f99c0d..d0422e36 100644
--- a/hss/hss.conf
+++ b/hss/hss.conf
@@ -173,7 +173,7 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem";
 # algorithms. In addition the "0xffffff" application is advertised in CER/CEA 
 # exchanges.
 # Default: Relaying is enabled.
-#NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4
diff --git a/mme/mme.conf b/mme/mme.conf
index 1a0b815a..6fc8fa6e 100644
--- a/mme/mme.conf
+++ b/mme/mme.conf
@@ -174,7 +174,7 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem";
 # algorithms. In addition the "0xffffff" application is advertised in CER/CEA 
 # exchanges.
 # Default: Relaying is enabled.
-#NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4
diff --git a/pcrf/pcrf.conf b/pcrf/pcrf.conf
index 356374e5..91b9275f 100644
--- a/pcrf/pcrf.conf
+++ b/pcrf/pcrf.conf
@@ -175,7 +175,7 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem";
 # algorithms. In addition the "0xffffff" application is advertised in CER/CEA 
 # exchanges.
 # Default: Relaying is enabled.
-#NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4
diff --git a/smf/smf.conf b/smf/smf.conf
index 3677b43f..8e13c568 100644
--- a/smf/smf.conf
+++ b/smf/smf.conf
@@ -174,7 +174,7 @@ TLS_CA = "/open5gs/install/etc/freeDiameter/cacert.pem";
 # algorithms. In addition the "0xffffff" application is advertised in CER/CEA 
 # exchanges.
 # Default: Relaying is enabled.
-#NoRelay;
+NoRelay;
 
 # Number of server threads that can handle incoming messages at the same time.
 # Default: 4