diff --git a/.github/workflows/cachet-to-ghcr-on-push.yaml b/.github/workflows/cachet-to-ghcr-on-push.yaml
new file mode 100644
index 0000000..d79c287
--- /dev/null
+++ b/.github/workflows/cachet-to-ghcr-on-push.yaml
@@ -0,0 +1,18 @@
+---
+name: Cachet Docker Image on Push to GHCR
+
+on:
+  push:
+    branches:
+      - "2.5"
+
+jobs:
+  build_image_on_push:
+    permissions:
+      packages: write
+      security-events: write
+      actions: read
+      contents: read
+    uses: hpi-schul-cloud/infra-tools/.github/workflows/imagetoghcr-on-push.yaml@master
+    with:
+      image_name: "cachet"
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index 22a8248..0000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Publish Docker image
-on:
-  push:
-    branches: [ "*" ]
-    tags: [ "*" ]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      - 
-        name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
-      -
-        name: Docker meta
-        id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
-        with:
-          images: sedan07/cachet
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          build-args: |
-            cachet_ver=${{ steps.get_version.outputs.VERSION }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index a0eadc6..a305409 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG cachet_ver
 ARG archive_url
 
 ENV cachet_ver ${cachet_ver:-2.5}
-ENV archive_url ${archive_url:-https://github.com/fiveai/Cachet/archive/${cachet_ver}.tar.gz}
+ENV archive_url https://github.com/dBildungsplattform/Cachet/archive/2.5.tar.gz
 
 ENV COMPOSER_VERSION 1.9.0