diff --git a/recipes-containers/container-management/container-management_git.bb b/recipes-containers/container-management/container-management_git.bb
index b4defe7..bfbf061 100644
--- a/recipes-containers/container-management/container-management_git.bb
+++ b/recipes-containers/container-management/container-management_git.bb
@@ -17,6 +17,9 @@ GO_INSTALL = "${GO_IMPORT}/containerm/daemon \
               ${GO_IMPORT}/containerm/cli \
               "
 
+GO_LINKSHARED = ""
+GOBUILDFLAGS:remove = "-buildmode=pie"
+
 require container-management.inc
 
 inherit go-mod
diff --git a/recipes-containers/container-management/files/service.template b/recipes-containers/container-management/files/service.template
index af29fc8..cb432a7 100644
--- a/recipes-containers/container-management/files/service.template
+++ b/recipes-containers/container-management/files/service.template
@@ -2,13 +2,16 @@
 Description=Eclipse Kanto - Container Management
 Documentation=https://eclipse.org/kanto/docs/
 After=network.target containerd.service
-Requires=network.target containerd.service
+Requires=network.target
+Requires=containerd.service
 
 [Service]
 Type=simple
-ExecStart=@CM_BIN_DD@/container-management --cfg-file @CM_CFG_DD@/container-management/config.json
+Environment=HOME=%h
+Environment=XDG_CONFIG_HOME=%E
+ExecStart=/usr/bin/container-management --cfg-file /etc/container-management/config.json
 Restart=always
-TimeoutSec=3000
+TimeoutSec=300
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file