diff --git a/2.4/Dockerfile b/2.4/Dockerfile
index 151bd38..58e3ea7 100644
--- a/2.4/Dockerfile
+++ b/2.4/Dockerfile
@@ -4,17 +4,8 @@ MAINTAINER Bytemark Hosting "support@bytemark.co.uk"
 # This variable is inherited from httpd:alpine image:
 # ENV HTTPD_PREFIX /usr/local/apache2
 
-RUN set -ex; \
-    # Create Debian-style subdirectories.
-    mkdir -p "$HTTPD_PREFIX/conf/conf-available"; \
-    mkdir -p "$HTTPD_PREFIX/conf/conf-enabled"; \
-    mkdir -p "$HTTPD_PREFIX/conf/sites-available"; \
-    mkdir -p "$HTTPD_PREFIX/conf/sites-enabled"
-
 # Copy in our configuration files.
-COPY dav.conf "$HTTPD_PREFIX/conf/conf-available"
-COPY default.conf "$HTTPD_PREFIX/conf/sites-available"
-COPY default-ssl.conf "$HTTPD_PREFIX/conf/sites-available"
+COPY conf/ "$HTTPD_PREFIX/conf/"
 
 RUN set -ex; \
     # Create empty default DocumentRoot.
@@ -51,6 +42,8 @@ RUN set -ex; \
         >> "$HTTPD_PREFIX/conf/httpd.conf"; \
     \
     # Enable dav and default site.
+    mkdir -p "$HTTPD_PREFIX/conf/conf-enabled"; \
+    mkdir -p "$HTTPD_PREFIX/conf/sites-enabled"; \
     ln -s ../conf-available/dav.conf "$HTTPD_PREFIX/conf/conf-enabled"; \
     ln -s ../sites-available/default.conf "$HTTPD_PREFIX/conf/sites-enabled"
 
diff --git a/2.4/dav.conf b/2.4/conf/conf-available/dav.conf
similarity index 100%
rename from 2.4/dav.conf
rename to 2.4/conf/conf-available/dav.conf
diff --git a/2.4/default-ssl.conf b/2.4/conf/sites-available/default-ssl.conf
similarity index 100%
rename from 2.4/default-ssl.conf
rename to 2.4/conf/sites-available/default-ssl.conf
diff --git a/2.4/default.conf b/2.4/conf/sites-available/default.conf
similarity index 100%
rename from 2.4/default.conf
rename to 2.4/conf/sites-available/default.conf