diff --git a/.github/ISSUE_TEMPLATE/blueprint.md b/.github/ISSUE_TEMPLATE/blueprint.md
index fe3a0447..16c053cc 100644
--- a/.github/ISSUE_TEMPLATE/blueprint.md
+++ b/.github/ISSUE_TEMPLATE/blueprint.md
@@ -2,7 +2,7 @@
 name: Component Blueprint
 about: Checklist for releasing a new component blueprint
 title: '[Component Blueprint]'
-labels: 'auro-form, Type: Design, not-reviewed'
+labels: 'auro-formkit, Type: Design, not-reviewed'
 assignees: leeejune
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index e6bdae7d..ca6c72ff 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -4,7 +4,7 @@ title: '[issue summary] Please verify version before submitting new issue'
 labels:
   - 'Type: Bug'
   - not-reviewed
-  - 'auro-form'
+  - 'auro-formkit'
 body:
   - type: markdown
     attributes:
@@ -13,12 +13,12 @@ body:
   - type: input
     id: version
     attributes:
-      label: Please verify the version of auro-form you have installed
+      label: Please verify the version of auro-formkit you have installed
   - type: markdown
     attributes:
       value: >
         [![See it on
-        NPM!](https://img.shields.io/npm/v/@aurodesignsystem/auro-form?style=for-the-badge&color=orange)](https://www.npmjs.com/package/@aurodesignsystem/auro-form)
+        NPM!](https://img.shields.io/npm/v/@aurodesignsystem/auro-formkit?style=for-the-badge&color=orange)](https://www.npmjs.com/package/@aurodesignsystem/auro-formkit)
   - type: textarea
     id: details
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 20971ab5..bf369db7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,10 +1,10 @@
 name: Feature request
 description: Suggest an idea for this project
-title: 'auro-form: [feature summary]'
+title: 'auro-formkit: [feature summary]'
 labels:
   - 'Type: Feature'
   - not-reviewed
-  - 'auro-form'
+  - 'auro-formkit'
 body:
   - type: textarea
     id: request
diff --git a/.github/ISSUE_TEMPLATE/general-support.yml b/.github/ISSUE_TEMPLATE/general-support.yml
index daf06690..fd688461 100644
--- a/.github/ISSUE_TEMPLATE/general-support.yml
+++ b/.github/ISSUE_TEMPLATE/general-support.yml
@@ -1,11 +1,11 @@
 name: General support
 description: Suggestions that are not related to bugs or new features
-title: 'auro-form: [issue]'
+title: 'auro-formkit: [issue]'
 labels:
   - 'Type: Question'
   - 'Type: Feature'
   - not-reviewed
-  - 'auro-form'
+  - 'auro-formkit'
 body:
   - type: textarea
     id: request
diff --git a/.github/ISSUE_TEMPLATE/publish_component.md b/.github/ISSUE_TEMPLATE/publish_component.md
index d7bd793c..9c85824c 100644
--- a/.github/ISSUE_TEMPLATE/publish_component.md
+++ b/.github/ISSUE_TEMPLATE/publish_component.md
@@ -2,7 +2,7 @@
 name: Publish Component
 about: Create a ticket to drive compliance before publishing a new component to Auro Design System
 title: 'Publish to Auro Design System'
-labels: 'auro-form, not-reviewed'
+labels: 'auro-formkit, not-reviewed'
 ---
 
 # Publish Component
@@ -53,7 +53,7 @@ labels: 'auro-form, not-reviewed'
     - [ ] All work is reviewed by Auro team
 1. __Publishing__
     - [ ] Removed all references to `auroLabs` from the repository
-    - [ ] Component properly named,  e.g. `auro-form`
+    - [ ] Component properly named,  e.g. `auro-formkit`
     - [ ] GitHub Repository properly named
     - Updated `readme.md`
       - [ ] Install information updated to published namespace
diff --git a/.github/settings.yml b/.github/settings.yml
index ab93ccd3..ebdfeb89 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -73,7 +73,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["test (18.x)","test (20.x)", "license/cla"]
+        contexts: ["test (20.x)","test (22.x)", "license/cla"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
@@ -89,7 +89,7 @@ branches:
 
 # Labels: define labels for Issues and Pull Requests
 labels:
-  - name: auro-form
+  - name: auro-formkit
     color: 'fa23e4'
     description:
     process: Key filter for this repo
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 9f0447b5..47b68ffb 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -36,9 +36,8 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
 
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-
+        # queries: security-extended,security-and-quality
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     # - name: Autobuild
diff --git a/.github/workflows/publishDemo.yml b/.github/workflows/publishDemo.yml
new file mode 100644
index 00000000..fb2bf189
--- /dev/null
+++ b/.github/workflows/publishDemo.yml
@@ -0,0 +1,12 @@
+name: Deploy Demo
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  call-publish-demo-workflow:
+    uses: AlaskaAirlines/auro-library/.github/workflows/publishDemo.yml@main
+    secrets:
+      AURO_SURGE_TOKEN: ${{secrets.AURO_SURGE_TOKEN}}
\ No newline at end of file
diff --git a/.github/workflows/testPublish.yml b/.github/workflows/testPublish.yml
index 3b91574a..58296952 100644
--- a/.github/workflows/testPublish.yml
+++ b/.github/workflows/testPublish.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 18.x, 20.x ]
+        node-version: [ 20.x, 22.x ]
 
     steps:
       - uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
 
   release:
     # Only release on push to main
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main' || 'refs/heads/beta'
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta')
     runs-on: ubuntu-latest
     needs: test
     steps:
@@ -38,10 +38,23 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - run: npm ci
-      - run: npm run build:release
-      - uses: cycjimmy/semantic-release-action@v4
+      - run: npm run build
+      - run: git config --unset core.hooksPath
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v4
+        with:
+          semantic_version: 24.x.x
+          ci: false
+          branches: |
+            [
+              'main',
+              {
+                name: 'beta',
+                prerelease: true
+              }
+            ]
         env:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/package-lock.json b/package-lock.json
index 46623250..b887d08d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,7 +60,7 @@
         "yaml-lint": "^1.7.0"
       },
       "engines": {
-        "node": "^18.x || ^20.x"
+        "node": "^20.x || ^22.x "
       }
     },
     "components/checkbox": {
diff --git a/package.json b/package.json
index 2e8dc45d..5c076807 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/AlaskaAirlines/auro-formkit"
   },
   "engines": {
-    "node": "^18.x || ^20.x"
+    "node": "^20.x || ^22.x "
   },
   "packageManager": "npm@10.0.0",
   "workspaces": [