diff --git a/.github/workflows/snap-ci.yml b/.github/workflows/snap-ci.yml
new file mode 100644
index 000000000..a80b02f39
--- /dev/null
+++ b/.github/workflows/snap-ci.yml
@@ -0,0 +1,30 @@
+name: Snap CI
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - README.md
+    tags:
+      - '*'
+
+jobs:
+  build-snap-master-package:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      - name: Use Snapcraft
+        uses: snapcore/action-build@v1
+        id: build
+      - uses: actions/upload-artifact@v2
+        with:
+          name: rustdesk.snap
+          path: ${{ steps.build.outputs.snap }}
+      # - uses: snapcore/action-publish@v1
+      #   with:
+      #     store_login: ${{ secrets.SNAP_TOKEN }}
+      #     snap: ${{ steps.build.outputs.snap }}
+      #     release: edge
\ No newline at end of file
diff --git a/snap/gui/rustdesk.desktop b/snap/gui/rustdesk.desktop
new file mode 100644
index 000000000..c1e0aca1a
--- /dev/null
+++ b/snap/gui/rustdesk.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Version=1.0
+Name=RustDesk
+GenericName=Remote Desktop
+Comment=Remote Desktop
+Exec=rustdesk %u
+Icon=${SNAP}/meta/gui/rustdesk.png
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Other;
+Keywords=internet;
+Actions=new-window;
+
+X-Desktop-File-Install-Version=0.23
+
+[Desktop Action new-window]
+Name=Open a New Window
+
diff --git a/snap/gui/rustdesk.png b/snap/gui/rustdesk.png
new file mode 100644
index 000000000..3da699f1d
Binary files /dev/null and b/snap/gui/rustdesk.png differ
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e2bcfcb02..6e95bf5e3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -124,7 +124,6 @@ apps:
     plugs:
       - network
       - audio-playback
-      - audio-record
       - home
       - x11
       - opengl
@@ -134,7 +133,27 @@ apps:
       - pulseaudio
       - gsettings
       - unity7
+      # must manually connect
+      - login-session-observe
+      # [option] manually connect
+      - audio-record
   rustdesk-service:
     command: bin/rustdesk --service
     daemon: simple
+    plugs:
+      - network
+      - audio-playback
+      - home
+      - x11
+      - opengl
+      - wayland
+      - desktop
+      - desktop-legacy
+      - pulseaudio
+      - gsettings
+      - unity7
+      # must manually connect
+      - login-session-observe
+      # [option] manually connect
+      - audio-record