diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
new file mode 100644
index 000000000..b3f841156
--- /dev/null
+++ b/docker/Dockerfile.dev
@@ -0,0 +1,10 @@
+FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2-node14-composer2:latest
+
+RUN rm -rf /etc/apache2/sites-enabled/*
+COPY ./docker/conf/selfservice-apache2.conf /etc/apache2/sites-enabled/selfservice.conf
+EXPOSE 80
+
+# Set the default workdir
+WORKDIR /var/www/html
+
+CMD ["apache2-foreground"]
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
new file mode 100644
index 000000000..95f0ed88c
--- /dev/null
+++ b/docker/Dockerfile.prod
@@ -0,0 +1,18 @@
+FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
+COPY *.tar.bz2 /tmp/
+RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
+    rm -rf /tmp/*.tar.bz2
+
+# Add the application configuration files
+COPY .env .env
+COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml
+
+# Add the config files for Apache2
+RUN rm -rf /etc/apache2/sites-enabled/*
+COPY ./docker/conf/selfservice-apache2.conf /etc/apache2/sites-enabled/selfservice.conf
+EXPOSE 80
+
+# Set the default workdir
+WORKDIR /var/www/html
+
+CMD ["apache2-foreground"]
diff --git a/docker/conf/selfservice-apache2.conf b/docker/conf/selfservice-apache2.conf
new file mode 100644
index 000000000..f313c0ffc
--- /dev/null
+++ b/docker/conf/selfservice-apache2.conf
@@ -0,0 +1,34 @@
+<Virtualhost *:80>
+    ServerName  selfservice
+    ServerAdmin admin@surf.nl
+
+    DocumentRoot /var/www/html/public
+
+    SetEnv APP_ENV prod
+    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+
+    <Directory "/var/www/html/public">
+        Require all granted
+
+        Options -MultiViews
+        RewriteEngine On
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteRule ^(.*)$ index.php [QSA,L]
+    </Directory>
+    <Location />
+        Require all granted
+    </Location>
+
+    Header always set X-Content-Type-Options "nosniff"
+
+    # Set the php application handler so mod_php interpets the files
+    <FilesMatch \.php$>
+        SetHandler application/x-httpd-php
+    </FilesMatch>
+
+    ExpiresActive on
+    ExpiresByType font/* "access plus 1 year"
+    ExpiresByType image/* "access plus 6 months"
+    ExpiresByType text/css "access plus 1 year"
+    ExpiresByType text/js "access plus 1 year"
+</VirtualHost>