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/node.js.yml
index 19275d1de..ae26f323d 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.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 ]
+  pull_request:
+    branches: [ master, develop ]
 
 jobs:
   build:
diff --git a/.travis/deploy_stage.sh b/.travis/deploy_stage.sh
deleted file mode 100644
index 2fadbb6d0..000000000
--- a/.travis/deploy_stage.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-eval "$(ssh-agent -s)" # start the ssh agent
-openssl aes-256-cbc -K $encrypted_fb724e9ad24a_key -iv $encrypted_fb724e9ad24a_iv -in .travis/marketing_rsa.enc -out .travis/marketing_rsa -d
-chmod 600 .travis/marketing_rsa # this key should have push access
-ssh-add .travis/marketing_rsa
-git remote add deploy dokku@csh-cloud.oweb.co:brickhack-stage
-git fetch --unshallow
-git push --force deploy develop:master
diff --git a/.travis/marketing_rsa.enc b/.travis/marketing_rsa.enc
deleted file mode 100644
index b9b2b295e..000000000
Binary files a/.travis/marketing_rsa.enc and /dev/null differ