diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f50fed12dec09669f1aae952566eb4e07365017..5aedebfbbc61acfc977ec218f1cbaf024f7f59d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: quay.io/sheogorath/build-ah-engine
+image: quay.io/othermo/build-ah-engine
 
 variables:
   GIT_SUBMODULE_STRATEGY: 'recursive'
@@ -7,15 +7,7 @@ before_script:
   - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
 build-aarch64:
-  image: docker.io/library/fedora:32
   stage: build
-  before_script:
-    # Build engine for aarch64
-    - dnf install -y git podman buildah findutils
-    - sed -e 's/cgroup_manager =.*/cgroup_manager = "cgroupfs"/' /usr/share/containers/containers.conf > /etc/containers/containers.conf
-    - git config --global user.email "info@othermo.de"
-    - git config --global user.name "Othermo CI"
-    - cp storage.conf /etc/containers/storage.conf
   script:
     - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" || true
     - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" .