diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml
deleted file mode 100644
index e48b3fd..0000000
--- a/.gitea/workflows/container.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Build Multiarch Container Image
-on: [push]
-jobs:
-  call-reusable-workflow:
-    uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main
-    with:
-      repository: ${{ gitea.repository }}
-      ref_name: ${{ gitea.ref_name }}
-      sha: ${{ gitea.sha }}
-      registry_url: ${{ secrets.REGISTRY_URL }}
-      registry_user: ${{ secrets.REGISTRY_USER }}
-      registry_pw: ${{ secrets.REGISTRY_PW }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..fcc535d
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,26 @@
+variables:
+  CONTAINER_NAME: thallian/php8-fpm
+
+build:
+  stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"
+
+downstream-nextcloud:
+  stage: .post
+  trigger: containers/nextcloud
+
+downstream-roundcube:
+  stage: .post
+  trigger: containers/roundcube
diff --git a/Containerfile b/Containerfile
deleted file mode 100644
index 0482da7..0000000
--- a/Containerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM docker.io/thallian/confd-env:3.19-3.1.6.2
-
-RUN apk --no-cache add php83-fpm
-
-ADD /rootfs /
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d2e82f9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM thallian/confd-env:latest
+
+RUN apk --no-cache add php8-fpm
+RUN ln -s /usr/bin/php8 /usr/bin/php
+
+ADD /rootfs /
diff --git a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
index 777bd9d..ec688ba 100644
--- a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
+++ b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "00_memory_limit.ini.tmpl"
-dest = "/etc/php83/conf.d/00_memory_limit.ini"
+dest = "/etc/php8/conf.d/00_memory_limit.ini"
diff --git a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
index f8c1982..32e5e52 100644
--- a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
+++ b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "01_max_execution_time.ini.tmpl"
-dest = "/etc/php83/conf.d/01_max_execution_time.ini"
+dest = "/etc/php8/conf.d/01_max_execution_time.ini"
diff --git a/rootfs/etc/confd/conf.d/02_opcache.ini.toml b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
index 229cbb6..f51cc55 100644
--- a/rootfs/etc/confd/conf.d/02_opcache.ini.toml
+++ b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "02_opcache.ini.tmpl"
-dest = "/etc/php83/conf.d/02_opcache.ini"
+dest = "/etc/php8/conf.d/02_opcache.ini"
diff --git a/rootfs/etc/confd/conf.d/www.conf.toml b/rootfs/etc/confd/conf.d/www.conf.toml
index 5fa47c8..770c784 100644
--- a/rootfs/etc/confd/conf.d/www.conf.toml
+++ b/rootfs/etc/confd/conf.d/www.conf.toml
@@ -1,3 +1,3 @@
 [template]
 src = "www.conf.tmpl"
-dest = "/etc/php83/php-fpm.d/www.conf"
+dest = "/etc/php8/php-fpm.d/www.conf"
diff --git a/rootfs/etc/php83/php-fpm.conf b/rootfs/etc/php8/php-fpm.conf
similarity index 98%
rename from rootfs/etc/php83/php-fpm.conf
rename to rootfs/etc/php8/php-fpm.conf
index 1947ddf..fdd7898 100644
--- a/rootfs/etc/php83/php-fpm.conf
+++ b/rootfs/etc/php8/php-fpm.conf
@@ -14,7 +14,7 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-;pid = run/php83-fpm.pid
+;pid = run/php-fpm7.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -122,4 +122,4 @@ error_log = syslog
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php83/php-fpm.d/*.conf
+include=/etc/php8/php-fpm.d/*.conf
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
index a849bc5..0dc8f7e 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php-fpm83 --nodaemonize --force-stderr
+exec php-fpm8 --nodaemonize --force-stderr