diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 37043fd..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Build
-
-on: [push, pull_request, workflow_dispatch]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build -t mcappy/docker-react -f Dockerfile.dev .
-    - name: Run the test cases
-      run: docker run -e CI=true mcappy/docker-react yarn test
diff --git a/.github/workflows/deploy.yml b/.github/workflows/workflow.yml
similarity index 60%
rename from .github/workflows/deploy.yml
rename to .github/workflows/workflow.yml
index cf0034c..0fcde6c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/workflow.yml
@@ -1,14 +1,22 @@
-name: Beanstalk Deploy
-on:
-  push:
-    branches:
-    - master
-  workflow_dispatch:
+name: Build
+
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  build:
+
+  test:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
+    - name: Build the Docker image
+      run: docker build -t mcappy/docker-react -f Dockerfile.dev .
+    - name: Run the test cases
+      run: docker run -e CI=true mcappy/docker-react yarn test
+    
+  deploy:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
 
     - name: Checkout source code
       uses: actions/checkout@v2
@@ -26,3 +34,5 @@ jobs:
         version_label: ver-${{ github.sha }}
         region: us-east-2
         deployment_package: deploy.zip
+    
+