diff --git a/.github/workflows/autodeploy.yml b/.github/workflows/autodeploy.yml
index 98baf5db..4fa7008a 100644
--- a/.github/workflows/autodeploy.yml
+++ b/.github/workflows/autodeploy.yml
@@ -1,15 +1,17 @@
-# This is a basic deployment workflow triggered by pushes to the alpha branch.
+# This is a basic deployment workflow triggered by pushes to the beta and live branches.
 
-
-name: Auto-Deploy 'live' Branch to coliolis.io
+name: Auto-Deploy 'beta/live' Branch to beta.coliolis.io or coriolis.io
 
 # Controls when the action will run. Workflow runs when the alpha branch receives a push event
 on:
   workflow_dispatch:
   push:
     branches:
+      - beta
       - live
-
+# Figure out the target branch name
+env:
+  BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   downloadcode:
@@ -19,13 +21,14 @@ jobs:
         run: |
           rm -Rf ./coriolis
           rm -Rf ./coriolis-data
-          git clone https://github.com/Brighter-Applications/coriolis.git --single-branch --branch live
-          git clone https://github.com/Brighter-Applications/coriolis-data.git --single-branch --branch live
+          git clone https://github.com/Brighter-Applications/coriolis.git --single-branch --branch ${BRANCH_NAME}
+          git clone https://github.com/Brighter-Applications/coriolis-data.git --single-branch --branch ${BRANCH_NAME}
           cd coriolis-data
           export NVM_DIR=~/.nvm
           source ~/.nvm/nvm.sh
           npm install
+          npm start
           cd ../coriolis
           npm install
           npm run build
-          sudo -u www-data cp -r ./build/* /var/www/coriolis.io/
+          if [ ${BRANCH_NAME} == "beta" ]; then sudo -u www-data cp -r ./build/* /var/www/beta.coriolis.io/; else sudo -u www-data cp -r ./build/* /var/www/coriolis.io/; fi
diff --git a/src/app/shipyard/Constants.js b/src/app/shipyard/Constants.js
index a71a41eb..808fdcd4 100755
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -25,7 +25,6 @@ export const ModuleGroupToName = {
   pd: 'Power Distributor',
   s: 'Sensors',
   ft: 'Fuel Tank',
-  pas: 'Planetary Approach Suite',
 
   // Internal
   fs: 'Fuel Scoop',
@@ -60,6 +59,7 @@ export const ModuleGroupToName = {
   sua: 'Supercruise Assist',
   mlc: "Multi Limpet Controller",
   rpl: "Repair Limpet Controller",
+  pas: 'Planetary Approach Suite',
 
   // Hard Points
   bl: 'Beam Laser',
@@ -77,11 +77,15 @@ export const ModuleGroupToName = {
   nl: 'Mine Launcher',
   ml: 'Mining Laser',
   mr: 'Missile Rack',
+  amr: 'Missile Rack (Advanced)',
   axmr: 'AX Missile Rack',
+  axmre: 'AX Missile Rack (Enhanced)',
   pa: 'Plasma Accelerator',
   po: 'Point Defence',
   mc: 'Multi-cannon',
+  advmc: 'Multi-cannon (Advanced)',
   axmc: 'AX Multi-cannon',
+  axmce: 'AX Multi-cannon (Enhanced)',
   pl: 'Pulse Laser',
   rg: 'Rail Gun',
   sb: 'Shield Booster',