diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 695935e..50747d1 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -1,6 +1,7 @@
 name: DockerHub
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - '*'
@@ -22,7 +23,7 @@ jobs:
         uses: crazy-max/ghaction-docker-meta@v2
         with:
           images: |
-            neilpang/wgcf-docker
+            ${{ secrets.DOCKERHUB_USERNAME }}/wgcf-docker
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -66,7 +67,7 @@ jobs:
         uses: crazy-max/ghaction-docker-meta@v2
         with:
           images: |
-            neilpang/wgcf-docker
+            ${{ secrets.DOCKERHUB_USERNAME }}/wgcf-docker
           tags: |
             type=semver,suffix=-alpine,pattern={{version}}
             type=semver,suffix=-alpine,pattern={{major}}.{{minor}}
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 7b0053a..5a1136d 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,3 +1,5 @@
+FROM virb3/wgcf:2.2 AS builder
+
 FROM alpine:3
 
 
@@ -9,7 +11,8 @@ RUN apk update -f \
   && rm -rf /var/cache/apk/*
   
   
-RUN curl -fsSL git.io/wgcf.sh | bash && mkdir -p /wgcf
+COPY --from=builder "/wgcf" "/usr/local/bin/wgcf"
+RUN mkdir -p /wgcf
 
 WORKDIR /wgcf