diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
new file mode 100644
index 0000000..a2c009f
--- /dev/null
+++ b/.github/workflows/build-and-push.yml
@@ -0,0 +1,20 @@
+  
+name: build-and-push
+
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
+      with:
+        repository: jlundy2/concourse-fly
+        username: ${{ secrets.DOCKERHUB_USERNAME}}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+        tag_with_ref: true
diff --git a/Dockerfile b/Dockerfile
index 9f66fbb..c895570 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM concourse/concourse:latest as cache
+FROM concourse/concourse:6.4.0 as cache
 
 FROM alpine:edge as downloader
 RUN apk add --no-cache curl jq