diff --git a/tools/nm-in-container/data/data-etc-systemd-20-nm-in-container.override b/tools/nm-in-container/data/data-etc-systemd-20-nm-in-container.override
new file mode 100644
index 000000000..d8f251e4e
--- /dev/null
+++ b/tools/nm-in-container/data/data-etc-systemd-20-nm-in-container.override
@@ -0,0 +1,5 @@
+# Overrides for NetworkManager.service with nm-in-container
+# Placed in /etc/systemd/system/NetworkManager.service.d/
+[Service]
+Environment=G_DEBUG=fatal-warnings
+Environment=NM_OBFUSCATE_PTR=0
diff --git a/tools/nm-in-container/nm-in-container b/tools/nm-in-container/nm-in-container
index 19fb700c9..83d8f7bde 100755
--- a/tools/nm-in-container/nm-in-container
+++ b/tools/nm-in-container/nm-in-container
@@ -484,6 +484,8 @@ RUN dnf clean all
 
 RUN pip3 install --user behave_html_formatter || true
 
+RUN mkdir -p /etc/systemd/system/NetworkManager.service.d
+
 COPY data-NM-log "/usr/bin/NM-log"
 COPY data-nm-env-prepare.sh "/usr/bin/nm-env-prepare.sh"
 COPY data-nm-deploy.sh "/usr/bin/nm-deploy.sh"
@@ -497,6 +499,7 @@ COPY data-bash_history /root/.bash_history
 COPY data-gdbinit /root/.gdbinit
 COPY data-gdb_history /root/.gdb_history
 COPY data-behaverc /root/.behaverc
+COPY data-etc-systemd-20-nm-in-container.override /etc/systemd/system/NetworkManager.service.d/20-nm-in-container.override
 
 RUN systemctl enable NetworkManager