diff --git a/.dockerignore b/.dockerignore
index 559772097..53c27d576 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 data
+contrib
 Dockerfile
 docker-compose*.yml
 .dockerignore
diff --git a/Dockerfile b/Dockerfile
index 098369ddb..2f722aa37 120000
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1 @@
-docker/Dockerfile.apache
\ No newline at end of file
+contrib/docker/Dockerfile.apache
\ No newline at end of file
diff --git a/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache
similarity index 94%
rename from docker/Dockerfile.apache
rename to contrib/docker/Dockerfile.apache
index ef3e2e37e..7db56d9e8 100644
--- a/docker/Dockerfile.apache
+++ b/contrib/docker/Dockerfile.apache
@@ -32,10 +32,12 @@ COPY . /var/www/
 
 WORKDIR /var/www/
 RUN cp -r storage storage.skel \
- && cp /var/www/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
  && composer install --prefer-source --no-interaction \
  && rm -rf html && ln -s public html
 
+COPY contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini
+COPY contrib/docker/start.sh /start.sh
+
 VOLUME ["/var/www/storage"]
 
 ENV APP_ENV=production \
@@ -56,4 +58,4 @@ ENV APP_ENV=production \
     REMOTE_FOLLOW=false \
     ACTIVITY_PUB=false
 
-CMD /var/www/docker/start.sh
+CMD /start.sh
diff --git a/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm
similarity index 100%
rename from docker/Dockerfile.fpm
rename to contrib/docker/Dockerfile.fpm
diff --git a/docker/php.ini b/contrib/docker/php.ini
similarity index 100%
rename from docker/php.ini
rename to contrib/docker/php.ini
diff --git a/docker/start.sh b/contrib/docker/start.sh
similarity index 100%
rename from docker/start.sh
rename to contrib/docker/start.sh