diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34ce5f26..899aff2f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## next deploy
 
+- Improved docker image building time
+
 ## v5.4.4 2022 June 8
 
 - Check shopping cart items are valid before online payment
diff --git a/Dockerfile b/Dockerfile
index 884d2bc65..472103020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,8 +44,7 @@ RUN bundle config --global frozen 1
 
 # Install gems in a cache efficient way
 WORKDIR /tmp
-COPY Gemfile /tmp/
-COPY Gemfile.lock /tmp/
+COPY Gemfile* /tmp/
 RUN bundle config set --local without 'development test doc' && bundle install && bundle binstubs --all
 
 # Prepare the application directories
@@ -72,16 +71,16 @@ COPY docker/database.yml /usr/src/app/config/database.yml
 COPY . /usr/src/app
 
 # Volumes (the folders are created by setup.sh)
-VOLUME /usr/src/app/invoices
-VOLUME /usr/src/app/payment_schedules
-VOLUME /usr/src/app/exports
-VOLUME /usr/src/app/imports
-VOLUME /usr/src/app/public
-VOLUME /usr/src/app/public/uploads
-VOLUME /usr/src/app/public/packs
-VOLUME /usr/src/app/accounting
-VOLUME /usr/src/app/proof_of_identity_files
-VOLUME /var/log/supervisor
+VOLUME /usr/src/app/invoices \
+       /usr/src/app/payment_schedules \
+       /usr/src/app/exports \
+       /usr/src/app/imports \
+       /usr/src/app/public \
+       /usr/src/app/public/uploads \
+       /usr/src/app/public/packs \
+       /usr/src/app/accounting \
+       /usr/src/app/proof_of_identity_files \
+       /var/log/supervisor
 
 # Expose port 3000 to the Docker host, so we can access it from the outside
 EXPOSE 3000