diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml
index 03c816a6..017f5019 100644
--- a/.github/workflows/main_deploy.yaml
+++ b/.github/workflows/main_deploy.yaml
@@ -51,12 +51,12 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v2
-      - name: Build Snap
-        run: snapcraft
-      - name: Publish Snap
-        run: snapcraft push ./*.snap
+      - uses: snapcore/action-build@v1
+        id: snapcraft
+      - uses: actions/upload-artifact@v3
+        with:
+          name: fluffychat
+          path: ${{ steps.snapcraft.outputs.snap }}
 
   deploy_playstore_internal:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ee09a0ee..2b9e8f66 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -83,12 +83,12 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
-      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v2
-      - name: Build Snap
-        run: snapcraft
-      - name: Publish Snap
-        run: snapcraft push ./*.snap
+      - uses: snapcore/action-build@v1
+        id: snapcraft
+      - uses: actions/upload-artifact@v3
+        with:
+          name: fluffychat
+          path: ${{ steps.snapcraft.outputs.snap }}
       - name: Promote Snap
         run: |
           RELEASE_TYPE=$(echo "${{ github.ref }}" | awk -F"/" '{print $3}')