diff --git a/snap/bin/run-wrap b/snap/bin/run-wrap
new file mode 100755
index 0000000..ca775eb
--- /dev/null
+++ b/snap/bin/run-wrap
@@ -0,0 +1,9 @@
+#!/bin/sh
+# NOTE(jamespage): This is a shim that really should not be required.
+
+set -e
+
+export CEPH_LIBRARY_PATH=`find $SNAP/usr/lib -name "libceph-common.so" -exec dirname {} \;`
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CEPH_LIBRARY_PATH
+
+exec $@
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9b2c30d..1a2ffb5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: gnocchi
-version: 3.1.11
+version: 4.0.3
 summary: Time Series Database as a Service
 description: |
   Gnocchi is an open-source, multi-tenant timeseries, metrics and
@@ -12,7 +12,7 @@ grade: stable
 
 apps:
   uwsgi:
-    command: snap-openstack gnocchi-uwsgi
+    command: run-wrap snap-openstack gnocchi-uwsgi
     daemon: simple
     plugs:
       - network-bind
@@ -22,20 +22,20 @@ apps:
     plugs:
       - network-bind
   metricd:
-    command: snap-openstack gnocchi-metricd
+    command: run-wrap snap-openstack gnocchi-metricd
     daemon: simple
     plugs:
       - network-bind
   upgrade:
-    command: snap-openstack gnocchi-upgrade
+    command: run-wrap snap-openstack gnocchi-upgrade
     plugs:
       - network
   change-sack-size:
-    command: snap-openstack gnocchi-change-sack-size
+    command: run-wrap snap-openstack gnocchi-change-sack-size
     plugs:
       - network
   config-generator:
-    command: snap-openstack gnocchi-config-generator
+    command: run-wrap snap-openstack gnocchi-config-generator
     plugs:
       - network
 
@@ -43,7 +43,7 @@ parts:
   gnocchi:
     plugin: python
     python-version: python2
-    source: https://pypi.python.org/packages/b2/50/71d1057dc1988cf7548e7e096c9e883845aead7e8fa06a5666c56e483c97/gnocchi-3.1.11.tar.gz
+    source: https://pypi.python.org/packages/31/04/f4a0d82279a9be0638e0f79a141e2f6295b18ad6c65b53ef716625fa712f/gnocchi-4.0.3.tar.gz
     python-packages:
       - futurist
       - keystonemiddleware
@@ -75,7 +75,7 @@ parts:
   config:
     after: [gnocchi]
     plugin: dump
-    source: https://pypi.python.org/packages/b2/50/71d1057dc1988cf7548e7e096c9e883845aead7e8fa06a5666c56e483c97/gnocchi-3.1.11.tar.gz
+    source: https://pypi.python.org/packages/31/04/f4a0d82279a9be0638e0f79a141e2f6295b18ad6c65b53ef716625fa712f/gnocchi-4.0.3.tar.gz
     organize:
       etc/*.conf: etc/gnocchi/
       etc/*.ini: etc/gnocchi/