diff --git a/Dockerfile b/Dockerfile
index 65a4625..a13c2c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,20 +10,31 @@ RUN apk -U add \
     nginx \
     php7-fpm \
     php7-gd \
-    php7-mcrypt \
     php7-json \
     php7-pdo \
     php7-pdo_mysql \
     supervisor \
     ca-certificates \
     tar \
- && mkdir privatebin && cd privatebin \
- && curl -L -o privatebin.tar.gz https://github.com/PrivateBin/PrivateBin/archive/$VERSION.tar.gz \
- && tar xvzf privatebin.tar.gz --strip 1 \
- && rm privatebin.tar.gz \
- && mv cfg/conf.sample.php /privatebin \
- && apk del tar ca-certificates curl libcurl \
- && rm -f /var/cache/apk/*
+    gnupg \
+ && mkdir -p privatebin/data \
+ && export GNUPGHOME="$(mktemp -d)" \
+ && gpg2 --list-public-keys || /bin/true \
+ && curl -s https://privatebin.info/key/rugk.asc | gpg2 --import - \
+ && curl -Lso privatebin.tar.gz.asc https://github.com/PrivateBin/PrivateBin/releases/download/$VERSION/PrivateBin-$VERSION.tar.gz.asc \
+ && curl -Lso privatebin.tar.gz https://github.com/PrivateBin/PrivateBin/archive/$VERSION.tar.gz \
+ && gpg2 --verify privatebin.tar.gz.asc \
+ && rm -rf "$GNUPGHOME" /var/www/* \
+ && cd /var/www \
+ && tar -xzf /privatebin.tar.gz --strip 1 \
+ && mv cfg/conf.sample.php /privatebin/ \
+ && mv cfg /privatebin/ \
+ && mv lib /privatebin \
+ && mv tpl /privatebin \
+ && mv vendor /privatebin \
+ && sed -i "s#define('PATH', '');#define('PATH', '/privatebin/');#" index.php \
+ && apk del tar ca-certificates curl gnupg \
+ && rm -f /privatebin.tar.gz* *.md /var/cache/apk/*
 
 COPY files/nginx.conf /etc/nginx/nginx.conf
 COPY files/php-fpm.conf /etc/php7/php-fpm.conf
diff --git a/files/nginx.conf b/files/nginx.conf
index dd69cc2..d27c8a2 100644
--- a/files/nginx.conf
+++ b/files/nginx.conf
@@ -48,7 +48,7 @@ http {
 
     server {
         listen 80;
-        root /privatebin;
+        root /var/www;
         index index.php index.html;
 
         location ~* \.(jpg|jpeg|gif|css|png|js|map|woff|woff2|ttf|svg|eot)$ {
diff --git a/files/php-fpm.conf b/files/php-fpm.conf
index 87afcb3..11905d9 100644
--- a/files/php-fpm.conf
+++ b/files/php-fpm.conf
@@ -11,4 +11,4 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
-chdir = /
+chdir = /var/www