diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 724c2ee..a4de5c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,29 +90,10 @@ tests_dotnet:
   script:
     - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
     - 'dotnet test --no-restore'
-    
-release_dotnet:
-  stage: release
-  only:
-    changes:
-      - ChaosBot/**/*
-    refs:
-      - master
-  dependencies:
-    - tests_dotnet
-  tags:
-  - docker
-  - hawkeye
-  script:
-    - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
-    - 'dotnet publish -c Release --runtime linux-musl-x64 -o build -p:PublishSingleFile=true ChaosBot'
-  artifacts:
-    paths:
-      - build/*
 
-tests_node:
+build_node:
   image: node:latest
-  stage: test
+  stage: build
   only:
     changes:
       - ChaosBot/**/*
@@ -126,10 +107,30 @@ tests_node:
   script:
     - 'cd ChaosBot/wwwroot'
     - 'yarn install'
-    - 'yarn lint'
-      
-release_node:
+    - 'yarn build'
+  artifacts:
+    paths:
+      - ChaosBot/wwwroot/dist/*
+
+tests_node:
   image: node:latest
+  stage: test
+  only:
+    changes:
+      - ChaosBot/**/*
+    refs:
+      - master
+  dependencies:
+    - build_node
+  tags:
+    - docker
+    - hawkeye
+  script:
+    - 'cd ChaosBot/wwwroot'
+    - 'yarn install'
+    - 'yarn lint'
+
+release:
   stage: release
   only:
     changes:
@@ -137,17 +138,16 @@ release_node:
     refs:
       - master
   dependencies:
-    - tests_node
+    - tests_dotnet
   tags:
-  - docker
-  - hawkeye
+    - docker
+    - hawkeye
   script:
-    - 'cd ChaosBot/wwwroot'
-    - 'yarn install'
-    - 'yarn build'
+    - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
+    - 'dotnet publish -c Release --runtime linux-musl-x64 -o build -p:PublishSingleFile=true ChaosBot'
   artifacts:
     paths:
-      - ChaosBot/wwwroot/dist/*
+      - build/*
 
 docker:
   image: docker:stable
@@ -162,8 +162,7 @@ docker:
   - hawkeye
   dependencies:
     - version
-    - release_dotnet
-    - release_node
+    - release
   script:
     # Log in to the registry
     - 'docker login -u=$REGISTRY_USER -p=$REGISTRY_PASS registry.chaoticlogic.us'