diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..bfcc69caf
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,19 @@
+name: Build
+description: 'Build and push docker images.'
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-app-image:
+    runs-on: ubuntu:18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build Docker Image
+        run: |
+          docker build -t cloudfirellc/cloudfire:${GITHUB_SHA::8} .
+      - name: Push Docker Image
+        run: |
+          docker push cloudfirellc/cloudfire:latest
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2873783fc..04864f95e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,16 +1,8 @@
 name: Deploy
+description: "Deploy images"
 
 on:
   release: created
 
 jobs:
-  build-image:
-    runs-on: ubuntu:18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build Docker Image
-        run: |
-          docker build -t cloudfirellc/cloudfire:latest .
-      - name: Push Docker Image
-        run: |
-          docker push cloudfirellc/cloudfire:latest
+