diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..7e6c7ab
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,24 @@
+name: ci
+
+on: [push, pull_request]
+
+defaults:
+  run:
+    shell: bash
+    working-directory: .
+
+jobs:
+  ubuntu:
+    runs-on: [ubuntu-latest, ubuntu-16.04]
+    strategy:
+      matrix:
+        node-version: [10.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install -g bats
+      - run: ./dotbare finit -u https://github.com/kazhala/dotfiles.git
+      - run: bats tests
diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
deleted file mode 100644
index 83cdba3..0000000
--- a/.github/workflows/dockerbuild.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: DockerBuild
-
-on:
-  push:
-    branches:
-      - master
-
-defaults:
-  run:
-    shell: bash
-    working-directory: .
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: kazhala/dotbare
-          tags: latest
diff --git a/README.md b/README.md
index aecbfa7..bfdeb2e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # dotbare
 
 [![Build Status](https://travis-ci.com/kazhala/dotbare.svg?branch=master&label=travis%20build)](https://travis-ci.com/kazhala/dotbare)
-![DockerBuild](https://github.com/kazhala/dotbare/workflows/DockerBuild/badge.svg)
+![CI Status](https://github.com/kazhala/dotbare/workflows/ci/badge.svg)
 ![AWSCodeBuild](https://codebuild.ap-southeast-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYWVnOEdGbWxuMmpJdVF2S3RTOFdUeGhEZDZvVkZ1cnBtZGJjd0RuOFdxUWxGeG1zR2YycFcydFJZT25VV3NkZnNsRWJ4ZVNsZ0VxZnpOY3RFUGdMV0RNPSIsIml2UGFyYW1ldGVyU3BlYyI6IlNDNjNHTlkyS2ZmbE5lZGIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 
 WIP