diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index a0891145..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-version: 2
-
-npm_login: &npm_login
-  run:
-    name: Login to NPM
-    command: |
-      npm config set @wizeline:registry=https://verdaccio.wizeline.sh
-      npm config set //verdaccio.wizeline.sh/:_authToken=$NPM_TOKEN
-
-jobs:
-  dependency_install:
-    docker: &yarn_defaults
-    - image: node:8.7.0
-    steps:
-    - checkout
-    - *npm_login
-    - restore_cache: &restore_yarn_cache
-        keys:
-        - v2-yarn-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
-        - v2-yarn-cache-{{ .Branch }}
-        - v2-yarn-cache-master
-        - v2-yarn-cache
-    - run:
-        name: Build
-        command: cd design-system && yarn
-    - save_cache:
-        key: v2-yarn-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
-        paths:
-        - ./node_modules
-  test:
-    docker: *yarn_defaults
-    steps:
-    - checkout
-    - restore_cache: *restore_yarn_cache
-    - run:
-        name: Unit test
-        command: cd design-system && yarn && yarn run test
-workflows:
-  version: 2
-  continuous_integration:
-    jobs:
-    - dependency_install:
-        context: ppm-js
-    - test:
-        context: ppm-js
-        requires:
-        - dependency_install
-
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..02a581fe
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+.PHONY: build-tea build-site clean
+
+build-tea:
+	cd design-system/; \
+	yarn; \
+	yarn build
+
+build-site: build-tea
+	cd site/; \
+	yarn; \
+	yarn build
+
+clean:
+	rm -rf design-system/node_modules
+
diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 00000000..707547b5
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,11 @@
+# Global settings applied to the whole site.
+#
+# ?publish? is the directory to publish (relative to root of your repo),
+# ?command? is your build command,
+# ?base? is directory to change to before starting build. if you set base:
+#    that is where we will look for package.json/.nvmrc/etc not repo root!
+
+[build]
+  base    = ""
+  publish = "site/catalog/build"
+  command = "npm i -g yarn@1.12.3 && make build-site"
diff --git a/site/package.json b/site/package.json
index 0626e7fb..96c0cd7e 100644
--- a/site/package.json
+++ b/site/package.json
@@ -13,7 +13,6 @@
     "start": "catalog start",
     "build": "catalog build",
     "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject",
-    "deploy": "yarn build && surge --project ./catalog/build --domain wizeline-tea.surge.sh"
+    "eject": "react-scripts eject"
   }
 }