diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 4b237ecc0..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: 2.1
-orbs:
-  node: circleci/node@3.0.0
-
-jobs:
-  build:
-    executor:
-      name: node/default
-      tag: '13.14'
-    steps:
-      - checkout
-      - node/install-packages
-      - run:
-          command: npm run build
-  deploy-staging:
-    machine:
-      enabled: true
-    steps:
-      - checkout
-      - run:
-          name: Deploy to Staging
-          command: |
-            git remote add deploy dokku@csh-cloud.oweb.co:brickhack-stage
-            git push --force deploy develop:master
-          no_output_timeout: 1h
-
-workflows:
-  build-and-deploy:
-    jobs:
-      - build
-      - deploy-staging:
-          requires:
-            - build
-          filters:
-            branches:
-              only: develop
diff --git a/.circleci/deploy_stage.sh b/.circleci/deploy_stage.sh
deleted file mode 100644
index 8c6d81dd7..000000000
--- a/.circleci/deploy_stage.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-git remote add deploy dokku@csh-cloud.oweb.co:brickhack-stage
-git fetch --unshallow
-git push --force deploy develop:master
diff --git a/.github/workflows/node.js.yml b/.github/workflows/build.yml
similarity index 89%
rename from .github/workflows/node.js.yml
rename to .github/workflows/build.yml
index 19275d1de..26f6c8d2b 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/build.yml
@@ -1,11 +1,11 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: CI
+name: CI - Build
 
-on: 
-  push:
-    branches: [ develop ]
+on:
+  pull_request:
+    branches: [ master, develop ]
 
 jobs:
   build:
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
new file mode 100644
index 000000000..ab459af85
--- /dev/null
+++ b/.github/workflows/deploy-production.yml
@@ -0,0 +1,26 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Deploy - Production
+
+on:
+  push: master
+
+jobs:
+  deploy-production:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: master
+    - run: node --version
+    - name: Install dependencies
+      run: npm ci
+    - name: Builder
+      run: npm run build
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./build
+        allow_empty_commit: true