diff --git a/app/script/mkdeb b/app/script/mkdeb
index f4ebfbc95..90739c876 100755
--- a/app/script/mkdeb
+++ b/app/script/mkdeb
@@ -57,6 +57,9 @@ cp "$ROOT/build/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lin
 # Remove group write from all files
 chmod -R g-w "$TARGET";
 
+# Remove execstack bit from mailspring executable
+execstack --clear-execstack "$TARGET/usr/share/mailspring/mailspring"
+
 # Remove executable bit from .node files
 find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \;
 
diff --git a/snap/snapcraft.template.yaml b/snap/snapcraft.template.yaml
index 6a04daa62..5144fac13 100644
--- a/snap/snapcraft.template.yaml
+++ b/snap/snapcraft.template.yaml
@@ -43,7 +43,6 @@ apps:
       TMPDIR: $XDG_RUNTIME_DIR
     plugs:
      - avahi-observe
-     - bluez
      - browser-support
      - cups-control
      - gsettings
@@ -51,7 +50,6 @@ apps:
      - mount-observe
      - network
      - network-observe
-     - process-control
      - password-manager-service
      - pulseaudio
      - removable-media