diff --git a/Dockerfile b/Dockerfile
index 59da766bc8..c916e05a35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,6 +28,7 @@ RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
 COPY docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 
 #SSL
+RUN mkdir -p /var/lib/snipeit/ssl
 COPY docker/001-default-ssl.conf /etc/apache2/sites-enabled/001-default-ssl.conf
 #COPY docker/001-default-ssl.conf /etc/apache2/sites-available/001-default-ssl.conf
 
@@ -76,7 +77,6 @@ RUN cd /var/www/html;composer install
 
 ############### DATA VOLUME #################
 
-RUN mkdir /var/lib/snipeit
 VOLUME [/var/lib/snipeit]
 
 ##### START SERVER
diff --git a/docker/001-default-ssl.conf b/docker/001-default-ssl.conf
index ed3f60bfda..b4fd60aafa 100644
--- a/docker/001-default-ssl.conf
+++ b/docker/001-default-ssl.conf
@@ -38,9 +38,9 @@
 		#   If both key and certificate are stored in the same file, only the
 		#   SSLCertificateFile directive is needed.
 		#SSLCertificateFile	/etc/ssl/private/ssl-cert-snakeoil.crt
-		SSLCertificateFile	/etc/ssl/private/snipeit-ssl.crt
+		SSLCertificateFile	/var/lib/snipeit/ssl/snipeit-ssl.crt
 		#SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-		SSLCertificateKeyFile /etc/ssl/private/snipeit-ssl.key
+		SSLCertificateKeyFile /var/lib/snipeit/ssl/snipeit-ssl.key
 
 		#   Server Certificate Chain:
 		#   Point SSLCertificateChainFile at a file containing the
@@ -50,7 +50,7 @@
 		#   when the CA certificates are directly appended to the server
 		#   certificate for convinience.
 		#SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
-		SSLCertificateChainFile /etc/ssl/private/snipeit-ssl.crt
+		SSLCertificateChainFile /var/lib/snipeit/ssl/snipeit-ssl.crt
 
 		#   Certificate Authority (CA):
 		#   Set the CA certificate verification path where to find CA
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b23f1eaca8..5e50cc6183 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -8,7 +8,7 @@ then
   MYSQL_ENV_MYSQL_USER='' MYSQL_ENV_MYSQL_PASSWORD='' php artisan --env=production -n key:generate
 fi
 
-if [ -f /etc/ssl/private/snipeit-ssl.crt -a -f /etc/ssl/private/snipeit-ssl.key ]
+if [ -f /var/lib/snipeit/ssl/snipeit-ssl.crt -a -f /var/lib/snipeit/ssl/snipeit-ssl.key ]
 then
   a2enmod ssl
 else