diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..9a2531d
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,22 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/python:3
+    steps:
+      - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Build Gotty Image
+          command: |
+            DOCKER_TAG=$CIRCLE_BRANCH-$CIRCLE_BUILD_NUM
+            docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+            docker build -t honestica/gotty-v2:$DOCKER_TAG .
+            docker push honestica/gotty-v2:$DOCKER_TAG
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build:
+          context: org-global
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
deleted file mode 100644
index 177e36c..0000000
--- a/.github/workflows/main.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Go
-
-on:
-  - push
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-    - name: Test
-      run: make test
-
-    - name: Build
-      run: make tools cross_compile
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
deleted file mode 100644
index 8e2748f..0000000
--- a/.github/workflows/pre-release.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: "pre-release"
-
-on:
-  push:
-    branches:
-      - "master"
-
-
-jobs:
-  pre-release:
-    name: "Pre Release"
-    runs-on: "ubuntu-latest"
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-
-
-    - name: "Build & test"
-      run: "make tools release-artifacts"
-
-    - uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest"
-        prerelease: true
-        title: "Development Build"
-        files: |
-          LICENSE
-          builds/dist/*
\ No newline at end of file
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..80e1c78
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+* @honestica/infra @honestica/tooling
diff --git a/Dockerfile b/Dockerfile
index 565e142..72cd110 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM golang:1.16
 
 WORKDIR /gotty
 COPY . /gotty
+RUN apt-get update && apt-get install -y nodejs npm
 RUN CGO_ENABLED=0 make
 
 FROM alpine:latest