diff --git a/bindep.txt b/bindep.txt
index 5816a55..8d8c1a2 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1 +1,2 @@
 snapcraft [platform:dpkg]
+snapd [platform:dpkg]
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 2905cf8..0adc727 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -1,31 +1,34 @@
 setup:
   dirs:
-    - "{snap_common}/etc/neutron.conf.d"
-    - "{snap_common}/etc/neutron"
+    - "{snap_common}/etc/neutron/conf.d"
     - "{snap_common}/etc/neutron/plugins/ml2"
     - "{snap_common}/etc/neutron/policy.d"
     - "{snap_common}/etc/neutron/rootwrap.d"
-    - "{snap_common}/log"
-    - "{snap_common}/lock"
+    - "{snap_common}/lib/neutron"
+    - "{snap_common}/log/neutron"
+    - "{snap_common}/lock/neutron"
+  symlinks:
+    "{snap_common}/etc/neutron": /etc/neutron
+    "{snap_common}/lib/neutron": /var/lib/neutron
+    "{snap_common}/log/neutron": /var/log/neutron
+    "{snap_common}/lock/neutron": /var/lock/neutron
   templates:
-    "neutron-snap.conf.j2": "{snap_common}/etc/neutron.conf.d/neutron-snap.conf"
+    neutron-snap.conf.j2: "{snap_common}/etc/neutron/conf.d/neutron-snap.conf"
+  copyfiles:
+    "{snap}/etc/neutron": "{snap_common}/etc/neutron"
 entry_points:
   neutron-db-manage:
     binary: neutron-db-manage
     config-files:
-      - "{snap}/etc/neutron/neutron.conf"
-      - "{snap_common}/etc/neutron/neutron.conf"
-      - "{snap}/etc/neutron/plugins/ml2/ml2_conf.ini"
-      - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
+      - "/etc/neutron/neutron.conf"
+      - "/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "{snap_common}/etc/neutron.conf.d"
+      - "/etc/neutron/conf.d"
   neutron-server:
     binary: neutron-server
     config-files:
-      - "{snap}/etc/neutron/neutron.conf"
-      - "{snap_common}/etc/neutron/neutron.conf"
-      - "{snap}/etc/neutron/plugins/ml2/ml2_conf.ini"
-      - "{snap_common}/etc/neutron/plugins/ml2/ml2_conf.ini"
+      - "/etc/neutron/neutron.conf"
+      - "/etc/neutron/plugins/ml2/ml2_conf.ini"
     config-dirs:
-      - "{snap_common}/etc/neutron.conf.d"
-    log-file: "{snap_common}/log/neutron-server.log"
+      - "/etc/neutron/conf.d"
+    log-file: "/var/log/neutron/neutron-server.log"
diff --git a/snap/templates/neutron-snap.conf.j2 b/snap/templates/neutron-snap.conf.j2
index 4f538cd..ed36153 100644
--- a/snap/templates/neutron-snap.conf.j2
+++ b/snap/templates/neutron-snap.conf.j2
@@ -1,7 +1,7 @@
 [DEFAULT]
 # Set state path to writable directory
-state_path = {{ snap_common }}
+state_path = /var/lib/neutron
 
 [oslo_concurrency]
 # Oslo Concurrency lock path
-lock_path = {{ snap_common }}/lock
+lock_path = /var/lock/neutron
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f8df800..44b8ac6 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -2,20 +2,18 @@ name: neutron
 version: ocata
 summary: OpenStack Network Service (neutron)
 description: OpenStack Network Service (neutron)
-confinement: strict
+confinement: classic
 grade: devel
 
+environment:
+  PATH: $PATH:$SNAP/bin
+
 apps:
   api:
     command: snap-openstack neutron-server
     daemon: simple
-    plugs:
-      - network
-      - network-bind
   manage:
     command: snap-openstack neutron-db-manage
-    plugs:
-      - network
 
 parts:
   neutron:
@@ -25,21 +23,19 @@ parts:
     python-packages:
       - pymysql
       - python-memcached
-      - git+https://github.com/openstack-snaps/snap.openstack#egg=snap.openstack
+      - git+https://github.com/openstack/snap.openstack#egg=snap.openstack
     constraints: https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt
     build-packages:
+      - gcc
       - libffi-dev
       - libssl-dev
-      - pkg-config
   templates:
-    after:
-      - neutron
+    after: [neutron]
     plugin: dump
     source: snap
   # TODO: replace below with scriplets once implemented in snapcraft
   config:
-    after:
-      - neutron
+    after: [neutron]
     plugin: dump
     source: http://tarballs.openstack.org/neutron/neutron-master.tar.gz
     organize:
diff --git a/tox.ini b/tox.ini
index 997c257..7360ffc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,13 @@ skipsdist = True
 basepython = python3.5
 install_command = pip install {opts} {packages}
 passenv = HOME TERM
+whitelist_externals =
+    sudo
+    snapcraft
 
 [testenv:snap]
 deps = -r{toxinidir}/requirements.txt
 commands =
+    sudo snap install core
     snapcraft clean
     snapcraft snap