diff --git a/config/70-connectionagent-tracing.conf b/config/70-connectionagent-tracing.conf
new file mode 100644
index 0000000..325ca75
--- /dev/null
+++ b/config/70-connectionagent-tracing.conf
@@ -0,0 +1 @@
+CONNECTIONAGENT_TRACING=-d
diff --git a/config/com.jolla.Connectiond.service b/config/com.jolla.Connectiond.service
index bd11ad6..95cf5a7 100644
--- a/config/com.jolla.Connectiond.service
+++ b/config/com.jolla.Connectiond.service
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=com.jolla.Connectiond
-Exec=/usr/bin/connectionagent
+ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $CONNECTIONAGENT_TRACING
 SystemdService=connectionagent.service
 Interface=/Connectiond
diff --git a/config/config.pro b/config/config.pro
index 914ab6f..ff50f28 100644
--- a/config/config.pro
+++ b/config/config.pro
@@ -3,7 +3,8 @@ TEMPLATE = subdirs
 OTHER_FILES += \
     com.jolla.Connectiond.service \
     connectionagent.conf \
-    connectionagent.service
+    connectionagent.service \
+    70-connectionagent-tracing.conf
 
 dbusservice.path = $${INSTALL_PREFIX}/usr/share/dbus-1/services
 dbusservice.files = com.jolla.Connectiond.service
@@ -14,4 +15,7 @@ systemdservice.files = connectionagent.service
 dbusconfig.path = /etc/dbus-1/session.d
 dbusconfig.files = connectionagent.conf
 
-INSTALLS += dbusservice systemdservice dbusconfig
+nemoenvironment.path = $${INSTALL_PREFIX}/var/lib/environment/nemo
+nemoenvironment.files = 70-connectionagent-tracing.conf
+
+INSTALLS += dbusservice systemdservice dbusconfig nemoenvironment
diff --git a/config/connectionagent.service b/config/connectionagent.service
index 7fefe3c..c25947f 100644
--- a/config/connectionagent.service
+++ b/config/connectionagent.service
@@ -4,8 +4,7 @@ Requires=dbus.service booster-qt5.service
 After=pre-user-session.target booster-qt5.service
 
 [Service]
-EnvironmentFile=-/etc/tracing/connectionagent/connectionagent.tracing
-ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $TRACING
+ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $CONNECTIONAGENT_TRACING
 Type=dbus
 BusName=com.jolla.Connectiond
 Restart=always
diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
index da6145d..e210afa 100644
--- a/rpm/connectionagent-qt5.spec
+++ b/rpm/connectionagent-qt5.spec
@@ -7,7 +7,6 @@ Group:      Communications/Connectivity Adaptation
 License:    LGPLv2
 URL:        http://github.com/lpotter/connectionagent
 Source0:    %{name}-%{version}.tar.bz2
-Source1:    connectionagent.tracing
 Requires:   connman-qt5-declarative
 Requires:   systemd
 Requires:   systemd-user-session-targets
@@ -69,8 +68,6 @@ rm -rf %{buildroot}
 %qmake5_install
 
 %make_install
-mkdir -p %{buildroot}%{_sysconfdir}/tracing/connectionagent/
-cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/tracing/connectionagent/
 
 mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
 ln -s ../connectionagent.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
@@ -105,4 +102,4 @@ fi
 
 %files tracing
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/tracing/connectionagent
+%config /var/lib/environment/nemo/70-connectionagent-tracing.conf
diff --git a/rpm/connectionagent.tracing b/rpm/connectionagent.tracing
deleted file mode 100644
index 79ab67c..0000000
--- a/rpm/connectionagent.tracing
+++ /dev/null
@@ -1 +0,0 @@
-TRACING=-d