diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 986980c..ee76b79 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -94,3 +94,5 @@ jobs:
             APP_VERSION=${{ env.APP_VERSION }}
             BUILD_TIME=${{ env.BUILD_TIME }}
             COMMIT=${{ env.SHORT_SHA }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index 945623d..69192a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,7 @@ COPY . /build
 RUN cp -r /build/custom/ assets/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X main.appVersion=${APP_VERSION} -X main.buildTime=${BUILD_TIME} -X main.gitCommit=${COMMIT}" -a -o wg-ui .
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X 'main.appVersion=${APP_VERSION}' -X 'main.buildTime=${BUILD_TIME}' -X 'main.gitCommit=${COMMIT}'" -a -o wg-ui .
 
 # Release stage
 FROM alpine:3.16