diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index d1e1beb..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-stages:
-  - build
-
-default:
-  tags: [ubuntu22.04]
-
-before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
-  - docker buildx create --use
-  - export DOCKER_BUILDKIT=1
-  - export POSTGRESQL_VERSION=15
-  - export COMPOSER_VERSION=2.6.5
-  - export NODE_VERSION=18
-
-build:image:8.2:
-  stage: build
-  script:
-    - export PHP_VERSION=8.2
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile" --no-cache --pull --build-arg COMPOSER_VERSION --build-arg POSTGRESQL_VERSION -t "$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:8" -t "$CI_REGISTRY_IMAGE:latest"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-dev" -t "$CI_REGISTRY_IMAGE:8-dev" -t "$CI_REGISTRY_IMAGE:latest-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-debug" -t "$CI_REGISTRY_IMAGE:8-debug" -t "$CI_REGISTRY_IMAGE:latest-debug"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.fat" --no-cache --pull --build-arg NODE_VERSION --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat" -t "$CI_REGISTRY_IMAGE:8-fat" -t "$CI_REGISTRY_IMAGE:latest-fat"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev" -t "$CI_REGISTRY_IMAGE:8-fat-dev" -t "$CI_REGISTRY_IMAGE:latest-fat-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-debug" -t "$CI_REGISTRY_IMAGE:8-fat-debug" -t "$CI_REGISTRY_IMAGE:latest-fat-debug"
-
-build:image:8.1:
-  stage: build
-  script:
-    - export PHP_VERSION=8.1
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile" --no-cache --pull --build-arg COMPOSER_VERSION --build-arg POSTGRESQL_VERSION -t "$CI_REGISTRY_IMAGE:$PHP_VERSION"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-debug"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.fat" --no-cache --pull --build-arg NODE_VERSION --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-debug"
-
-build:image:8.0:
-  stage: build
-  script:
-    - export PHP_VERSION=8.0
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile" --no-cache --pull --build-arg COMPOSER_VERSION --build-arg POSTGRESQL_VERSION -t "$CI_REGISTRY_IMAGE:$PHP_VERSION"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-debug"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.fat" --no-cache --pull --build-arg NODE_VERSION --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.dev" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev"
-    - docker buildx build --push --platform linux/amd64 "$PHP_VERSION/" -f "$PHP_VERSION/Dockerfile.debug" --no-cache --pull --build-arg "BASE_IMAGE=$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-dev" -t "$CI_REGISTRY_IMAGE:$PHP_VERSION-fat-debug"
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
index 1c92fa8..830e61a 100644
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@@ -1,11 +1,13 @@
 ARG DEBIAN_VERSION
 FROM ghcr.io/tweedegolf/debian:${DEBIAN_VERSION}
+ARG DEBIAN_VERSION
 
 # Install postgresql client
 ARG POSTGRESQL_VERSION
 ENV POSTGRESQL_VERSION ${POSTGRESQL_VERSION}
-RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+RUN install -d /usr/share/postgresql-common/pgdg \
+    && curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    && echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] http://apt.postgresql.org/pub/repos/apt/ $DEBIAN_VERSION-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         postgresql-client-$POSTGRESQL_VERSION \
@@ -13,8 +15,9 @@ RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add
 
 # Install the custom PHP repository
 ENV PHP_VERSION 8.2
-RUN curl -s -L https://packages.sury.org/php/apt.gpg | apt-key add - \
-    && echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/sury_php.list \
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb \
+    && dpkg -i /tmp/debsuryorg-archive-keyring.deb \
+    && echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/php.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         php${PHP_VERSION}-bcmath \
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
index 8fbd97d..e073e71 100644
--- a/8.3/Dockerfile
+++ b/8.3/Dockerfile
@@ -1,11 +1,13 @@
 ARG DEBIAN_VERSION
 FROM ghcr.io/tweedegolf/debian:${DEBIAN_VERSION}
+ARG DEBIAN_VERSION
 
 # Install postgresql client
 ARG POSTGRESQL_VERSION
 ENV POSTGRESQL_VERSION ${POSTGRESQL_VERSION}
-RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+RUN install -d /usr/share/postgresql-common/pgdg \
+    && curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    && echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] http://apt.postgresql.org/pub/repos/apt/ $DEBIAN_VERSION-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         postgresql-client-$POSTGRESQL_VERSION \
@@ -13,8 +15,9 @@ RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add
 
 # Install the custom PHP repository
 ENV PHP_VERSION 8.3
-RUN curl -s -L https://packages.sury.org/php/apt.gpg | apt-key add - \
-    && echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/sury_php.list \
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb \
+    && dpkg -i /tmp/debsuryorg-archive-keyring.deb \
+    && echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/php.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         php${PHP_VERSION}-bcmath \