diff --git a/modules/rhizo_base/files/systemd/coredump.override b/modules/rhizo_base/files/systemd/coredump.override
new file mode 100644
index 0000000..1b0a9e9
--- /dev/null
+++ b/modules/rhizo_base/files/systemd/coredump.override
@@ -0,0 +1,3 @@
+[Service]
+WorkingDir=/var/lib/osmocom
+LimitCORE=infinity
diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index 77b3cca..55a043a 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -11,6 +11,9 @@
 # Sample Usage:
 #
 class rhizo_base::openbsc {
+
+  include systemd
+
   $network_name    = $rhizo_base::network_name
   $auth_policy     = $rhizo_base::auth_policy
   $lac             = $rhizo_base::lac
@@ -141,6 +144,11 @@ class rhizo_base::openbsc {
          notify  => Service['osmo-sgsn'],
       }
 
+    systemd::dropin_file { 'override.conf':
+        unit    => 'osmo-sgsn.service',
+        source  => 'puppet:///modules/rhizo_base/systemd/coredump.override'
+    }
+
     $sgsn_version = $repo ? {
       'latest'    => '1.6.0+rhizo1',
       'nightly'   => 'latest',