diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index db6174e..77b2c31 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - base-images
+      - master
 
 jobs:
   build-and-push:
diff --git a/images/Dockerfile.template b/images/Dockerfile.template
index 7831512..84605bd 100644
--- a/images/Dockerfile.template
+++ b/images/Dockerfile.template
@@ -2,6 +2,8 @@ ARG TARGET
 FROM barebuild/$TARGET
 ARG PKGR_VERSION
 
-WORKDIR /app
+VOLUME ["/pkgr/cache", "/pkgr/output", "/pkgr/app"]
+WORKDIR /pkgr/output
+
 RUN curl -GLs https://buildcurl.com -d recipe=pkgr -d version="$PKGR_VERSION" -d target="$TARGET" -o - | tar xzf - -C /usr/local
-ENTRYPOINT ["/usr/local/bin/pkgr", "package", ".", "--clean", "--auto", "--compile-cache-dir", "/cache"]
+ENTRYPOINT ["/usr/local/bin/pkgr", "package", "/pkgr/app", "--clean", "--auto", "--compile-cache-dir", "/pkgr/cache"]