diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
new file mode 100644
index 0000000..07b8bf2
--- /dev/null
+++ b/.github/workflows/images.yaml
@@ -0,0 +1,37 @@
+name: Build Images
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build_scaler:
+    
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build The Scaler
+        run:
+          docker build -t scaler -f scaler/Dockerfile .
+  
+  build_operator:
+    
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build The Operator
+        run:
+          docker build -t operator -f operator/Dockerfile .
+
+  build_interceptor:
+    
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build The Interceptor
+        run:
+          docker build -t interceptor -f interceptor/Dockerfile .
diff --git a/interceptor/Dockerfile b/interceptor/Dockerfile
index 4db3897..eff24ca 100644
--- a/interceptor/Dockerfile
+++ b/interceptor/Dockerfile
@@ -1,6 +1,6 @@
 # adapted from Athens
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.14
+ARG GOLANG_VERSION=1.16
 ARG ALPINE_VERSION=3.11.5
 
 FROM golang:${GOLANG_VERSION}-alpine AS builder
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 29497d7..52b2dd4 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -1,6 +1,6 @@
 # adapted from Athens 
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.14
+ARG GOLANG_VERSION=1.16
 
 FROM golang:${GOLANG_VERSION}-alpine AS builder
 
diff --git a/scaler/Dockerfile b/scaler/Dockerfile
index 3bec40f..9b63651 100644
--- a/scaler/Dockerfile
+++ b/scaler/Dockerfile
@@ -1,6 +1,6 @@
 # taken from Athens
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.14
+ARG GOLANG_VERSION=1.16
 ARG ALPINE_VERSION=3.11.5
 
 FROM golang:${GOLANG_VERSION}-alpine AS builder