diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f2b3bb3a..e0dcfb22 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,8 +1,17 @@
 on:
   repository_dispatch:
-    types: [spec_release]
+    types: [release]
   workflow_dispatch:
-#on: push
+    inputs:
+      json:
+        description: 'Passed json from repository_dispatch'
+        required: true
+        type: string
+      version_postfix:
+        description: 'Additional string to concatenate onto the existing version before release'
+        required: false
+        type: string
+        default: ''
 
 name: Generate VRChat API SDK
 
@@ -10,11 +19,19 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     name: Generate VRChat API SDK
+    env:
+      ARTIFACT_NAME: "openapi.yaml"
+      INPUT: ${{ github.event_name == 'repository_dispatch' && toJSON(github.event.client_payload) || inputs.json }}
+      SPEC_URL: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json))['artifacts']['openapi-legacy.yaml'] }}
+      PASSED_VERSION: ${{ (github.event_name == 'repository_dispatch' && github.event.client_payload || fromJSON(inputs.json))['version'] }}
+      VERSION_POSTPEND: ${{ github.event_name == 'workflow_dispatch' && inputs.version_postfix || '' }}
     steps:
       - uses: actions/setup-node@v1
         with:
           node-version: 16
+
       - uses: actions/checkout@v2
+
       - name: 'Cache node_modules'
         uses: actions/cache@v4
         with:
@@ -22,31 +39,46 @@ jobs:
           key: ${{ runner.os }}-node-v16-${{ hashFiles('**/generate.sh') }}
           restore-keys: |
             ${{ runner.os }}-node-v16
+
       - name: Install OpenAPI Generator CLI
         run: npm install @openapitools/openapi-generator-cli
+
       - name: Set OpenAPI Generator version
         run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 6.2.1
+
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
           python-version: 3.9
-      - name: Generate SDK Client
-        run: bash ./generate.sh
+
+      - name: Download Specification
+        run: wget "${SPEC_URL}" '--output-document' "${ARTIFACT_NAME}"
+
       - name: Check version number
         run: |
-          echo "spec_version=$(grep "VERSION =" setup.py | cut -d "\"" -f 2)" >> $GITHUB_ENV
-      - name: Print version number
-        run: echo ${{ env.spec_version }}
+          vrchat_sdk_version=$(( ${PASSED_VERSION%%.*})).${PASSED_VERSION#*.}${VERSION_POSTPEND}
+          echo "Version is: ${vrchat_sdk_version}" 
+          echo "vrchat_sdk_version=$vrchat_sdk_version" >> $GITHUB_ENV 
+
+      - name: Generate SDK Client
+        run: bash ./generate.sh "${ARTIFACT_NAME}" "${vrchat_sdk_version}"
+
+      - name: Delete openapi.yaml file
+        run: unlink ${ARTIFACT_NAME}
+
       - name: Deploy SDK back into main branch
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: main
           folder: .
-          commit-message: "Upgrade Python SDK to spec ${{ env.spec_version }}"
+          commit-message: "Upgrade Python SDK to spec ${vrchat_sdk_version}"
+
       - name: Install pypa/build
         run: python -m pip install build --user
+
       - name: Build a binary wheel and a source tarball
         run: python -m build --sdist --wheel --outdir dist/ .
+
       - name: Publish SDK 📦 to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/generate.sh b/generate.sh
index c849b6a4..b162d15c 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,7 +1,10 @@
-#!/bin/bash
-
-npm install @openapitools/openapi-generator-cli 
+#!/usr/bin/env bash
 
+if [ ${#} -le 1 ]
+then
+  echo "Usage: generate.sh <openapi.yaml> <version>" >&2
+  exit 1
+fi
 rm vrchatapi docs -rf
 
 ./node_modules/\@openapitools/openapi-generator-cli/main.js generate \
@@ -10,13 +13,12 @@ rm vrchatapi docs -rf
 --git-user-id=vrchatapi \
 --git-repo-id=vrchatapi-python \
 -o . \
--i https://raw.githubusercontent.com/vrchatapi/specification/gh-pages/openapi.yaml \
+-i "${1}" \
 --http-user-agent="vrchatapi-py"
 
 # Fix description, keywords, etc...
 # Echo to trim whitespace
-VERSION=`echo $(cat setup.py | grep "The version of the OpenAPI document" | cut -d ":" -f 2)`
-sed -i "s/VERSION = \"1.0.0\"/VERSION = \"$VERSION\"/" ./setup.py
+sed -i "s/VERSION = \"1.0.0\"/VERSION = \"${2}\"/" ./setup.py
 sed -i 's/description="VRChat API Documentation"/description="VRChat API Library for Python"/' ./setup.py
 sed -i 's/keywords=\["OpenAPI", "OpenAPI-Generator", "VRChat API Documentation"\]/keywords=["vrchat", "vrchatapi", "vrc"]/' ./setup.py