diff --git a/.docker/build b/.docker/build
index 200a6f8..732c4c4 100755
--- a/.docker/build
+++ b/.docker/build
@@ -54,9 +54,9 @@ build_deps() {
 
 build_base() {
   set -eux; \
-    cd $DIR/server; go get; ./build; \
+    cd $DIR/server; go get -v -t -d . ; ./build; \
     cd $DIR/client; npm install; npm run build; \
-    sudo docker build -f files/base/Dockerfile -t nurdism/neko:base $DIR ;
+    cd $DIR; sudo docker build -f .docker/files/base/Dockerfile -t nurdism/neko:base $DIR ;
 }
 
 build_firefox() {
@@ -93,6 +93,7 @@ set -ex
 case $1 in
   push) build_push ;;
   docker) build_docker ;;
+  base) build_base ;;
   deps) build_deps ;;
   dev) build_dev ;;
   gst) build_gst ;;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..a97a523
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+name: n.eko build
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    container: nurdism/neko:dev
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Fetch unshallow
+      run: git fetch --prune --tags --unshallow
+
+    - name: Get go dependencies and build server
+      working-directory: server
+      run: |
+        go get -v -t -d . 
+        ./build
+
+    - name: Get npm dependencies and build Client
+      working-directory: client
+      run: | 
+        npm install
+        npm run build
\ No newline at end of file
diff --git a/.github/workflows/neko.yml b/.github/workflows/deploy.yml
similarity index 85%
rename from .github/workflows/neko.yml
rename to .github/workflows/deploy.yml
index 283237c..243f955 100644
--- a/.github/workflows/neko.yml
+++ b/.github/workflows/deploy.yml
@@ -1,12 +1,12 @@
-name: N.eko CI
+name: n.eko auto deploy
 
 on:
   push:
     branches: [ master ]
 
 jobs:
-  build:
-    name: Build
+  deploy:
+    name: Deploy
     runs-on: ubuntu-latest
     container: nurdism/neko:dev
     steps:
@@ -18,11 +18,15 @@ jobs:
 
     - name: Get go dependencies and build server
       working-directory: server
-      run: go get -v -t -d ./... && ./build
+      run: |
+        go get -v -t -d . 
+        ./build
 
     - name: Get npm dependencies and build Client
       working-directory: client
-      run: npm install && npm run build
+      run: | 
+        npm install
+        npm run build
 
     - name: Build the base image
       run: docker build -f ./.docker/files/base/Dockerfile -t nurdism/neko:base .
diff --git a/server/build b/server/build
index 4812691..895b12a 100755
--- a/server/build
+++ b/server/build
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 BUILD_TIME=`date -u +'%Y-%m-%dT%H:%M:%SZ'`
 GIT_COMMIT=`git rev-parse --short HEAD`
 GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`