diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
index e9f06b9..10462f0 100644
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenConext/Stepup-Build
-          ref: master
+          ref: feature/php82_build
       - name: Output the semver tag to the tag variable
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
diff --git a/component_info b/component_info
index 7e273ad..8cff7da 100644
--- a/component_info
+++ b/component_info
@@ -1,4 +1,4 @@
-PHP_VERSION=72
+PHP_VERSION=82
 SYMFONY_VERSION=4
 ENCORE=yes
 ASSETIC=no
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
index 13f19c6..38c889a 100644
--- a/docker/Dockerfile.prod
+++ b/docker/Dockerfile.prod
@@ -1,12 +1,12 @@
-FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
+FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest AS php-build
+# Set the default workdir
+WORKDIR /var/www/html
+
 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 config/packages/parameters.yaml.dist config/packages/parameters.yaml
-COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
-COPY .env.docker .env
+COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/*
@@ -15,7 +15,4 @@ RUN mkdir -p /var/www/html/var && \
   rm -rf /var/www/html/var/cache/prod && \
   chown -R www-data /var/www/html/var
 
-# Set the default workdir
-WORKDIR /var/www/html
-
 CMD ["apache2-foreground"]