diff --git a/.snapcraft/edge/snapcraft.yaml b/.snapcraft/edge/snapcraft.yaml
index c8e92b8d6783dbc7fb556c137a9da3f75955edfb..27df00dc8762e4e000f50ce46dff96a077e113f0 100644
--- a/.snapcraft/edge/snapcraft.yaml
+++ b/.snapcraft/edge/snapcraft.yaml
@@ -21,16 +21,9 @@ apps:
         daemon: simple
         plugs: [network, network-bind]
 parts:
-    node-dependencies:
-        plugin: nil
-        stage-packages:
-            - g++
     node:
         plugin: nodejs
-        after: [node-dependencies]
         node-engine: 4.5.0
-        stage-packages:
-            - g++
         node-packages:
             - amdefine
             - ansi-regex
@@ -51,6 +44,11 @@ parts:
             - type-of
             - babel-compiler
             - meteor-promise
+        build-packages:
+            # For fibers
+            - python
+            - build-essential
+            - nodejs
         organize:
             lib/node_modules: node_modules
     rocketchat-server:
diff --git a/.snapcraft/stable/snapcraft.yaml b/.snapcraft/stable/snapcraft.yaml
index 119b1b62166d1ac90a00e943ab598efe0d47aec4..b440c9e1fa9622f9b80e9e0cfeda33907fd41a44 100644
--- a/.snapcraft/stable/snapcraft.yaml
+++ b/.snapcraft/stable/snapcraft.yaml
@@ -13,16 +13,9 @@ apps:
         daemon: simple
         plugs: [network, network-bind]
 parts:
-    node-dependencies:
-        plugin: nil
-        stage-packages:
-            - g++
     node:
         plugin: nodejs
-        after: [node-dependencies]
         node-engine: 4.5.0
-        stage-packages:
-            - g++
         node-packages:
             - amdefine
             - ansi-regex
@@ -43,6 +36,11 @@ parts:
             - type-of
             - babel-compiler
             - meteor-promise
+        build-packages:
+            # For fibers
+            - python
+            - build-essential
+            - nodejs
         organize:
             lib/node_modules: node_modules
     rocketchat-server:
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 80b5e3b2756f9452669608aaef44dec100d55104..7f35bd5db3856c46adae83875dc2323b344463c3 100644
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -14,6 +14,6 @@ else
     SNAP_FOLDER=./snapcraft/edge
 fi
 
-docker run -v $HOME:/root -v $SNAP_FOLDER:/cwd didrocks/snapcraft sh -c 'cd /cwd; snapcraft'
-docker run -v $HOME:/root -v $SNAP_FOLDER:/cwd -e CHANNEL=$CHANNEL didrocks/snapcraft sh -c "cd /cwd; snapcraft push *.snap --release $CHANNEL"
+docker run -v $HOME:/root -v $SNAP_FOLDER:/cwd snapcore/snapcraft sh -c 'cd /cwd; snapcraft'
+docker run -v $HOME:/root -v $SNAP_FOLDER:/cwd -e CHANNEL=$CHANNEL snapcore/snapcraft sh -c "cd /cwd; snapcraft push *.snap --release $CHANNEL"