diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0b0dfe75..24def07d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,13 +1,7 @@
 name: Publish
 
 on:
-  release:
-    types:
-      - published
-
-permissions:
-  contents: write
-
+  workflow_dispatch:
 jobs:
   publish:
     runs-on: ubuntu-20.04
@@ -21,19 +15,15 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-      - name: Build
-        run: ./gradlew build
+      - name: Build & Publish
+        run: ./gradlew build publish --stacktrace
         env:
-          ARRP_VERSION: ${{ github.event.release.tag_name }}
-      - name: Upload Release Artifact
-        uses: softprops/action-gh-release@v1
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          GITHUB_RELEASE: true
+      - name: capture build artifacts
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        uses: actions/upload-artifact@v2
         with:
-          files: build/libs/arrp-${{ github.event.release.tag_name }}.jar
-          tag_name: ${{ github.event.release.tag_name }}
-      - name: Upload to external sites
-        run: ./gradlew curseforge modrinth publishAllPublicationsToModmavenRepository
-        env:
-          ARRP_VERSION: ${{ github.event.release.tag_name }}
-          CURSEFORGE: ${{ secrets.CURSEFORGE }}
-          MODRINTH: ${{ secrets.MODRINTH }}
-          MODMAVEN: ${{ secrets.MODMAVEN }}
+          name: Artifacts
+          path: build/libs/
diff --git a/build.gradle b/build.gradle
index 8de20bfd..1de0a4de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "dev.architectury.loom" version "0.12.0-SNAPSHOT"
+    id "dev.architectury.loom" version "1.4-SNAPSHOT"
     id 'maven-publish'
     id "me.shedaniel.unified-publishing" version "0.1.+"
 }
@@ -13,10 +13,13 @@ loom {
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-archivesBaseName = "${project.archives_base_name}-forge"
+archivesBaseName = "${project.archives_base_name}"
 version = project.mod_version
 group = project.maven_group
 
+def isCI = System.getenv("GITHUB_ACTION")
+def isRELEASE = System.getenv("GITHUB_RELEASE")
+
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
@@ -55,20 +58,22 @@ jar {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            from(components["java"])
+            artifactId = "arrp-forge"
+            from(components.java)
         }
     }
     // select the repositories you want to publish to
     repositories {
-        maven {
-            def mavenUrl = project.hasProperty('maven_url') ? project.property('maven_url') : ""
-            url mavenUrl
-            if (mavenUrl.startsWith("http")) {
+        if (isCI && isRELEASE) {
+            maven {
+                url = "https://repo.repsy.io/mvn/trinsdar/trins-mods/"
                 credentials {
-                    username project.hasProperty('maven_username') ? project.property('maven_username') : ""
-                    password project.hasProperty('maven_password') ? project.property('maven_password') : ""
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
                 }
             }
+        } else {
+            mavenLocal()
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index bca14e37..38ba2b0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,8 +6,8 @@ forge_version=47.1.0
 loom.platform=forge
 
 # Mod Properties
-maven_group=net.devtech
-archives_base_name=arrp
+mod_version=0.8.0
+maven_group=io.github.trinsdar
+archives_base_name=arrp-forge
 # Dependencies
 
-mod_version=0.8.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb879..db9a6b82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists