diff --git a/.forgejo/actions/artifact-upload/action.yml b/.forgejo/actions/artifact-upload/action.yml
deleted file mode 100644
index 76769be..0000000
--- a/.forgejo/actions/artifact-upload/action.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Upload Tar Artifact
-author: "Sebastian"
-description: Uploads the file or directory as an artifact into github/forgejo
-inputs:
-  name:
-    default: artifact.tar
-    description: Artifact name
-  path:
-    default: /bin
-    description: Paths of the file or directory with the data
-outputs:
-  T:
-    description: just a sample output
-    value: TEST
-runs:
-  using: composite
-  steps:
-    - name: collect
-      shell: sh
-      run: "/bin/env"
-    - name: upload
-      shell: sh
-      run: "/bin/true"
diff --git a/.forgejo/workflows/container-build.yml b/.forgejo/workflows/container-build.yml
index a3d6c32..0eac1ad 100644
--- a/.forgejo/workflows/container-build.yml
+++ b/.forgejo/workflows/container-build.yml
@@ -1,29 +1,19 @@
 ---
 on: [push]
 jobs:
-  clone:
-    runs-on: nodelts
-    container:
-      image: docker.io/node:lts
+  build-image:
+    runs-on: host
     steps:
       - uses: actions/checkout@v3
-  configuration:
-    runs-on: docker
-    needs:
-      - clone
-    container:
-      image: quay.io/keycloak/keycloak:latest
-      env:
-        PATH: "/opt/keycloak/bin:/usr/bin:/usr/local/bin"
-        KC_DB: postgres
-        KC_HTTPS_CLIENT_AUTH: request
-        KC_FEATURES: recovery-codes,passkeys,opentelemetry
-    steps:
-      - run: ls -lA
-      - run: kc.sh build
-        working-directory: /opt/keycloak/
-      - id: artifact-upload
-        uses: ./.forgejo/actions/artifact-upload
+      - uses: https://github.com/redhat-actions/buildah-build@v2
         with:
-          name: keycloak.tar
-          path: /opt/keycloak
+          containerfiles: Containerfile
+          image: ${{ github.repository }}
+          registry: gitea.sebastian-tobie.de
+          tags: latest ${{ github.run_number }}
+      - uses: https://github.com/redhat-actions/push-to-registry@v2.8
+        with:
+          image: ${{ github.repository }}
+          registry: gitea.sebastian-tobie.de
+          tags: latest ${{ github.run_number }}
+          password: ${{ github.token }}
\ No newline at end of file
diff --git a/Containerfile.in b/Containerfile
similarity index 90%
rename from Containerfile.in
rename to Containerfile
index 8a420e0..b57fa7c 100644
--- a/Containerfile.in
+++ b/Containerfile
@@ -1,7 +1,4 @@
-#ifndef SOURCE
-#define SOURCE gitea.sebastian-tobie.de/docker/keycloak:latest-orig
-#endif
-FROM SOURCE as builder
+FROM quay.io/keycloak/keycloak:latest as builder
 ENV PATH="/opt/keycloak/bin:/usr/bin:/usr/local/bin"
 
 ENV KC_HEALTH_ENABLED=false
@@ -12,7 +9,7 @@ ENV KC_FEATURES=dynamic-scopes,recovery-codes,preview
 ENV KC_DB_URL=postgresql://postgres.services.tobie:5432/keycloak
 RUN kc.sh build
 
-FROM SOURCE
+FROM quay.io/keycloak/keycloak:latest
 ENV PATH="/opt/keycloak/bin:/usr/bin:/usr/local/bin"
 
 COPY --from=builder /opt/keycloak/ /opt/keycloak/