diff --git a/Dockerfile b/Dockerfile
index 48bf0f4f1..613d2b8b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,20 @@ RUN apt-get update && apt upgrade -y && apt-get install -yq --no-install-recomme
     perl-doc \
     mysql-client \
     libjson-perl \
+    libtext-template-perl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && echo "Downloading MySQL Tuner script ..." \
-    && wget --no-check-certificate https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl -O /mysqltuner.pl \
-    && wget --no-check-certificate https://raw.githubusercontent.com/major/MySQLTuner-perl/master/basic_passwords.txt -O /basic_passwords.txt \
-    && wget --no-check-certificate https://raw.githubusercontent.com/major/MySQLTuner-perl/master/vulnerabilities.csv -O /vulnerabilities.csv
+    && mkdir -p /results
 
-ENTRYPOINT ["perl", "/mysqltuner.pl", "--passwordfile", "/basic_passwords.txt" , "--cvefile", "/vulnerabilities.txt", "--nosysstat", "--defaults-file", "/defaults.cnf" ]
-CMD ["--verbose"]
+WORKDIR /
+COPY ./mysqltuner.pl /mysqltuner.pl 
+COPY ./vulnerabilities.csv /vulnerabilities.txt
+COPY ./basic_passwords.txt /basic_passwords.txt
+COPY ./template_example.tpl /template.tpl
+
+ENTRYPOINT [ "perl", "/mysqltuner.pl", "--passwordfile", "/basic_passwords.txt",\
+             "--cvefile", "/vulnerabilities.txt", "--nosysstat", "--defaults-file", \
+             "/defaults.cnf", "--dumpdir", "/results", "--outputfile", \
+             "/results/mysqltuner.txt", "--template", "/template.tpl", \
+             "--reportfile", "/results/mysqltuner.html" ]
+CMD ["--verbose" ]
diff --git a/build/updateCVElist.pl b/build/updateCVElist.pl
index 7c8203d58..202d15332 100644
--- a/build/updateCVElist.pl
+++ b/build/updateCVElist.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use warnings;
 use strict;
 use WWW::Mechanize::GZip;
@@ -74,6 +74,7 @@ sub AUTOLOAD {
 	}
 }
 close(CVE);
+chmod 0644, "./cve.csv", "../vulnerabilities.csv";
 #unlink ('cve.csv') if (-f 'cve.csv');
 
 exit(0);