diff --git a/Running_Linux_OSX.md b/Running_Linux_OSX.md
index c35ca091e0ef2c95a9deae67dc161b7caa0582e0..529b89f127f89f94039fc1b59d648c80b903285c 100644
--- a/Running_Linux_OSX.md
+++ b/Running_Linux_OSX.md
@@ -1,5 +1,8 @@
 # Overview
-When installing on Debian-based Linux or macOS systems, there are three general steps: [installing prerequisites](#installing-prerequisites), [installing The Sleuth Kit](#installing-the-sleuth-kit), and [installing Autopsy](#installing-autopsy) itself.  On macOS, you will want to [setup the JNA paths](#setup-macos-jna-paths).
+For Linux systems that [support snapd](https://snapcraft.io/docs/installing-snapd), there is currently the option to install Autopsy from the [snap package](#install-autopsy-snap).  Otherwise, when installing on Debian-based Linux or macOS systems, there are three general steps: [installing prerequisites](#installing-prerequisites), [installing The Sleuth Kit](#installing-the-sleuth-kit), and [installing Autopsy](#installing-autopsy) itself.  On macOS, you will want to [setup the JNA paths](#setup-macos-jna-paths).
+
+# Install Autopsy Snap
+You can download the snap package from the [releases section](https://github.com/sleuthkit/autopsy/releases).  In order for Autopsy to run properly, snap connections will need to be properly setup, which can be done by running this script: `snap connections autopsy | sed -nE 's/^[^ ]* *([^ ]*) *- *- *$/\1/p' | xargs -I{} sudo snap connect {}`.  See the [snap README](./snap/README.md) for more information.
 
 # Installing Prerequisites
 - **Linux**: Run [`linux_macos_install_scripts/install_prereqs_ubuntu.sh`](./linux_macos_install_scripts/install_prereqs_ubuntu.sh).
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d32596b9ee64a6b9070b4ae335859674b48d4376..bbbb3b9b17a10a0a416bbb9397b82b3c7e649d72 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -19,10 +19,11 @@
 # yaml reference here: https://snapcraft.io/docs/snapcraft-yaml-reference
 # sample yaml files here: https://github.com/videolan/vlc/blob/master/extras/package/snap/snapcraft.yaml, https://github.com/canonical/firefox-snap/blob/stable/snapcraft.yaml
 name: autopsy
+title: Autopsy
 # more on base snaps here: https://snapcraft.io/docs/base-snaps
 # core is based on corresponding ubuntu version.  ubuntu version information can be found here: https://wiki.ubuntu.com/Releases
 base: core22
-version: 4.20.0
+version: 4.21.0
 summary: A graphical interface to The Sleuth Kit and other digital forensics tools. # 79 char long summary
 description: Autopsy is a graphical interface to The Sleuth Kit and other open source digital forensics tools.
 source-code: https://github.com/sleuthkit/autopsy/
@@ -38,7 +39,7 @@ compression: lzo
 icon: snap/gui/autopsy.png
 
 plugs:
-  system-files-autopsy:
+  system-files-dev:
     interface: system-files
     read: [/dev]
   system-files-hugepages:
@@ -88,7 +89,6 @@ apps:
       # taken from https://snapcraft.io/docs/supported-interfaces
       - audio-playback
       - block-devices
-      - browser-sandbox
       - desktop
       - desktop-launch
       - desktop-legacy
@@ -108,7 +108,7 @@ apps:
       - opengl
       - optical-drive
       - removable-media
-      - system-files-autopsy
+      - system-files-dev
       - system-files-hugepages
       - system-observe
     slots:
@@ -119,8 +119,7 @@ parts:
     # more information on plugins here: https://snapcraft.io/docs/supported-plugins
     plugin: autotools
     source: https://github.com/sleuthkit/sleuthkit.git
-    source-branch: develop
-    #source-tag: sleuthkit-4.12.0
+    source-tag: sleuthkit-4.12.1
     build-environment: [JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64]
     # information on packages here: https://snapcraft.io/docs/package-repositories
     build-packages:
@@ -174,7 +173,7 @@ parts:
       - lsof
     plugin: nil
     source: https://github.com/sleuthkit/autopsy.git
-    source-branch: develop
+    source-tag: autopsy-4.21.0
     build-environment:
       - JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
       - TSK_JAVA_LIB_PATH: $SNAPCRAFT_STAGE/usr/local/share/java
@@ -186,7 +185,7 @@ parts:
       AUTOPSY_PLATFORM_PATH="$AUTOPSY_SRC_PATH/netbeans-plat/$NETBEANS_PLAT_VER"
       AUTOPSY_HARNESS_PATH="$AUTOPSY_PLATFORM_PATH/harness"
       export TSK_HOME="$HOME/parts/sleuthkit/build"
-      ant -Dnbplatform.active.dir="$AUTOPSY_PLATFORM_PATH" -Dnbplatform.default.harness.dir="$AUTOPSY_HARNESS_PATH" build build-zip
+      ant -Dnbplatform.active.dir="$AUTOPSY_PLATFORM_PATH" -Dnbplatform.default.harness.dir="$AUTOPSY_HARNESS_PATH" build-zip
 
       # ----- SETUP EXTRACT DIRECTORY -----
       AUTOPSY_LOCATION="$SNAPCRAFT_PART_INSTALL/autopsy"