diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 93a5bf7..86f1e6f 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0
 
       - name: Build image
         run: |
diff --git a/Dockerfile b/Dockerfile
index ddcfac5..79664ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,16 @@
 # Build container
-FROM golang:alpine AS buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 AS buildstage
 
 ARG CLOUDFLARED_TAG
 
 RUN mkdir -p /root-layer/cloudflared
 WORKDIR /src
 
-RUN apk --no-cache add git build-base curl jq
+RUN \
+  apk add --no-cache \
+    build-base \
+    git \
+    go
 
 ENV GO111MODULE=on \
     CGO_ENABLED=0