diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 00000000..41294bfe
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,22 @@
+name: Snapshot Compile & Release
+
+on:
+  [pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Upload to Bintray
+        run: ./gradlew bintrayUpload --stacktrace
+        env:
+          BINTRAY_USER: shedaniel
+          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+          PR_NUM: ${{github.event.number}}
diff --git a/build.gradle b/build.gradle
index fddfe4ac..4252a8f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,9 +25,21 @@ allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
     apply plugin: "org.cadixdev.licenser"
+    
+    ext {
+        isSnapshot = System.getenv("PR_NUM") != null
+    }
+    
+    def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? (((short) new Random().nextInt()).abs() + 1000).toString() : System.getenv("GITHUB_RUN_NUMBER"))
 
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version + "." + (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv("GITHUB_RUN_NUMBER"))
+    if (!ext.isSnapshot) {
+        version = rootProject.base_version + "." + runNumber
+        archivesBaseName = rootProject.archives_base_name
+    } else {
+        version = rootProject.base_version + "-PR." + System.getenv("PR_NUM") + "." + runNumber
+        archivesBaseName = rootProject.archives_base_name_snapshot
+    }
+    
     group = rootProject.maven_group
 
     tasks.withType(JavaCompile) {
@@ -55,7 +67,7 @@ allprojects {
 
         ignoreFailures = true
     }
-    
+
     ext {
         releaseChangelog = {
             def dateFormat = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm")
diff --git a/gradle.properties b/gradle.properties
index 21506c73..68623ff7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,8 @@ minecraft_version=1.16.4
 supported_version=1.16.4/5
 
 archives_base_name=architectury
-mod_version=1.4
+archives_base_name_snapshot=architectury-snapshot
+base_version=1.4
 maven_group=me.shedaniel
 
 fabric_loader_version=0.10.8