diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml
index a2b3b81..9c4d246 100644
--- a/.forgejo/workflows/build_keycloak.yml
+++ b/.forgejo/workflows/build_keycloak.yml
@@ -21,7 +21,7 @@ jobs:
         run: apk add --no-cache nodejs
 
       - name: Checkout Source Code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
 
       - name: Build Container
         env:
diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml
index d9772ae..7eee44e 100644
--- a/.forgejo/workflows/build_nextcloud.yml
+++ b/.forgejo/workflows/build_nextcloud.yml
@@ -14,40 +14,21 @@ jobs:
       image: ghcr.io/osscontainertools/kaniko:alpine
     strategy:
       matrix:
-        # renovate: datasource=docker depName=docker.io/library/nextcloud
         nextcloud-version: [ 33, 34 ]
     steps:
       - name: Install required system packages
-        run: apk add --no-cache nodejs git
+        run: apk add --no-cache nodejs
 
-      - name: Checkout source code
-        uses: actions/checkout@v7
+      - name: Checkout Source Code
+        uses: actions/checkout@v6
 
-      - name: Checkout nextcloud/docker
-        run: git clone --depth 1 https://github.com/nextcloud/docker.git nextcloud-docker
-
-      - name: Build base Nextcloud image
+      - name: Build Container
         env:
           KANIKO_NO_PUSH: ${{ forgejo.ref_name != 'main' }}
           KANIKO_GIT_HAMBURG_CCC_DE_USER: forgejo-actions
           KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.PACKAGES_TOKEN }}
         run: /kaniko/executor
-          --dockerfile="${{ forgejo.workspace }}/nextcloud-docker/${{ matrix.nextcloud-version }}/apache/Dockerfile" 
-          --context="dir://${{ forgejo.workspace }}/nextcloud-docker/${{ matrix.nextcloud-version }}/apache"
-          --build-arg=TAG=${{ matrix.nextcloud-version }}
-          --destination=git.hamburg.ccc.de/ccchh/oci-images/nextcloud-base:${{ matrix.nextcloud-version }}
-          --no-push-cache
-          --credential-helpers=env
-          --annotation=org.opencontainers.image.ref.name=nextcloud-base
-          --annotation=org.opencontainers.image.source=${{ forgejo.server_url }}/${{ forgejo.repository }}
-
-      - name: Build extended image
-        env:
-          KANIKO_NO_PUSH: ${{ forgejo.ref_name != 'main' }}
-          KANIKO_GIT_HAMBURG_CCC_DE_USER: forgejo-actions
-          KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.PACKAGES_TOKEN }}
-        run: /kaniko/executor
-          --dockerfile="${{ forgejo.workspace }}/nextcloud/Containerfile"
+          --dockerfile="${{forgejo.workspace }}/nextcloud/Containerfile"
           --context="dir://${{ forgejo.workspace }}/nextcloud"
           --build-arg=TAG=${{ matrix.nextcloud-version }}
           --destination=git.hamburg.ccc.de/ccchh/oci-images/nextcloud:${{ matrix.nextcloud-version }}
diff --git a/keycloak/Containerfile b/keycloak/Containerfile
index 72ff902..0f6f1fc 100644
--- a/keycloak/Containerfile
+++ b/keycloak/Containerfile
@@ -1,6 +1,6 @@
 ARG TAG=latest
 
-FROM debian:13-slim as attribute-endpoints-provider-builder
+FROM debian:12-slim as attribute-endpoints-provider-builder
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y maven git \
diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile
index d76a998..d139a4d 100644
--- a/nextcloud/Containerfile
+++ b/nextcloud/Containerfile
@@ -1,10 +1,10 @@
-ARG TAG
-FROM git.hamburg.ccc.de/ccchh/oci-images/nextcloud-base:${TAG}
+ARG TAG=latest
+FROM docker.io/library/nextcloud:${TAG}
 
 RUN apt-get update \
     && apt-get install -y supervisor \
     && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p /var/log/supervisord /var/run/supervisord
+    && mkdir -p /var/log/supervisord /var/run/supervisord 
 
 # We need to copy a file to the supervisord folder in /var/run so it exists when the container starts.
 COPY .keep /var/run/supervisord/
@@ -13,4 +13,4 @@ COPY supervisord.conf /
 
 ENV NEXTCLOUD_UPDATE=1
 
-CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
\ No newline at end of file