diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5b07dde..cc59b7e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,6 +7,9 @@ on:
     tags:
       - 'v*.*.*'
   pull_request:
+env:
+  # don't hardcode the repo name; so that CI won't fail on forks 
+  IMAGE_NAME: ${{github.repository}}
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -21,7 +24,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ghcr.io/matjazp/ubuntu-bind
+            ghcr.io/${{ env.IMAGE_NAME }}
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch
@@ -48,4 +51,4 @@ jobs:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 1c11a47..297297b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM internetsystemsconsortium/bind9:9.16
 LABEL org.opencontainers.image.source="https://github.com/matjazp/ubuntu-bind"
-RUN apt-get -qqy update && apt-get -qqy install dnsutils iputils-ping ifupdown  less nano
+RUN apt-get -qqy update && apt-get -qqy install dnsutils iputils-ping ifupdown  less nano vim
 COPY startup.sh  /startup.sh
 RUN chmod +x /startup.sh
 COPY --chown=root:bind named.conf.log /etc/named.conf.log