diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index e46e3b4..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.git
-.git*
-.drone.*
-*.md
-.dockerignore
-Dockerfile
-Dockerfile.*
-docker-compose.yml
diff --git a/.drone.jsonnet b/.drone.jsonnet
index 75db467..0046e37 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -12,11 +12,11 @@ local PipelineBuild(arch='amd64') = {
       settings: {
         dry_run: true,
         dockerfile: 'Dockerfile',
-        repo: 'xoxys/freshrss',
+        repo: 'xoxys/${DRONE_REPO_NAME}',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
         build_args: [
-          'FRESHRSS_VERSION=${DRONE_TAG%-*}',
+          'BUILD_VERSION=${DRONE_TAG%-*}',
         ],
       },
       when: {
@@ -32,11 +32,11 @@ local PipelineBuild(arch='amd64') = {
         auto_tag: true,
         auto_tag_suffix: arch,
         dockerfile: 'Dockerfile',
-        repo: 'xoxys/freshrss',
+        repo: 'xoxys/${DRONE_REPO_NAME}',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
         build_args: [
-          'FRESHRSS_VERSION=${DRONE_TAG%-*}',
+          'BUILD_VERSION=${DRONE_TAG%-*}',
         ],
       },
       when: {
@@ -99,7 +99,7 @@ local PipelineNotifications(depends_on=[]) = {
         DOCKERHUB_USERNAME: { from_secret: 'docker_username' },
         DOCKERHUB_PASSWORD: { from_secret: 'docker_password' },
         DOCKERHUB_REPO_PREFIX: 'xoxys',
-        DOCKERHUB_REPO_NAME: 'freshrss',
+        DOCKERHUB_REPO_NAME: '${DRONE_REPO_NAME}',
         README_PATH: 'README.md',
         SHORT_DESCRIPTION: 'Rootless FreshRSS - Self-hosted RSS feed aggregator',
       },
diff --git a/Dockerfile b/Dockerfile
index 02c77b2..e53cdb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,10 @@ LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
     org.label-schema.vendor="Robert Kaussow" \
     org.label-schema.schema-version="1.0"
 
-ARG FRESHRSS_VERSION=master
+ARG BUILD_VERSION=master
+ENV FRESHRSS_VERSION="${BUILD_VERSION:-master}"
+
+ADD overlay/ /
 
 RUN apk --update add --virtual .build-deps tar curl && \
     apk --update add php7 php7-curl php7-fpm php7-gmp php7-intl php7-mbstring php7-xml \
@@ -17,14 +20,13 @@ RUN apk --update add --virtual .build-deps tar curl && \
     rm -f /etc/php7/php-fpm.d/www.conf && \
     mkdir -p /var/www/app && \
     mkdir /var/www/.postgresql && \
-    FRESHRSS_VERSION="${FRESHRSS_VERSION:-master}" && \
     echo "Installing FreshRSS '${FRESHRSS_VERSION}' ..." && \
-    curl -SsL https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION##v}.tar.gz | tar xz -C /var/www/app/ --strip-components=1 && \
+    curl -SsL https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION##v}.tar.gz | \
+      tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \
     curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
     apk del .build-deps && \
     rm -rf /var/cache/apk/* && \
     rm -rf /tmp/* && \
-    rm -rf /var/www/app/CHANGELOG.md /var/www/app/CONTRIBUTING.md /var/www/app/CREDITS.md /var/www/app/Docker /var/www/app/README.* && \
     mkdir -p /var/run/php && \
     chown -R nginx /var/run/php && \
     mkdir -p /var/lib/php/tmp_upload && \
@@ -35,8 +37,6 @@ RUN apk --update add --virtual .build-deps tar curl && \
     chown -R nginx:nginx /var/www/.postgresql && \
     chown -R nginx:nginx /var/www/app
 
-ADD overlay/ /
-
 VOLUME /var/www/app/extensions
 VOLUME /var/www/app/data
 
diff --git a/overlay/.tarignore b/overlay/.tarignore
new file mode 100644
index 0000000..bba9334
--- /dev/null
+++ b/overlay/.tarignore
@@ -0,0 +1,9 @@
+CHANGELOG.md
+CONTRIBUTING.md
+CREDITS.md
+Docker
+docs
+tests
+README*
+Make*
+.[!.]*