diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05a2bb2..043559c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,7 @@ jobs:
         with:
           dir_names: true
           files: |
+            **/*
             *
       - id: outputStep
         run: echo "::set-output name=changeDirs::${{ steps.changeDirsStep.outputs.all_changed_files }}"
@@ -39,11 +40,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - image: your-docker-registry/app1
-            dockerfile: operator/Dockerfile
+          - image: ghcr.io/tu-wien-datalab/config-server-operator
             directory: operator
-          - image: user/app2
-            dockerfile: server/Dockerfile
+          - image: ghcr.io/tu-wien-datalab/config-server
             directory: server
     steps:
       - name: Docker metadata
@@ -59,6 +58,9 @@ jobs:
             type=ref,event=tag
             type=sha
 
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -68,7 +70,7 @@ jobs:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -76,9 +78,9 @@ jobs:
         uses: docker/build-push-action@v6
         if: startsWith(needs.init.outputs.changeDirs, matrix.directory)
         with:
-          context: .
-          file: ${{ matrix.dockerfile }}
+          context: ${{ matrix.directory }}
+          file: ./${{ matrix.directory }}/Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name == 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/README.md b/README.md
index 32bf20d..f7ff097 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 # config-server-operator
 
-![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2FTU-Wien-dataLAB%2Fconfig-server-operator%2Fmain%2Fpyproject.toml%3Ftoken%3DGHSAT0AAAAAACGUZZXQLY7KSD64CM5CM5FOZULV5QA)
+![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2FTU-Wien-dataLAB%2Fconfig-server-operator%2Fmain%2Fpyproject.toml)
 
 
 This operator provides CRDs to create key/value pairs (`KeyValuePair`). The operator combines these configuration objects into a single `ConfigMap` and deploys a REST API that can be used to access the individual values with the corresponding keys.
diff --git a/operator/operator.py b/operator/operator.py
index b58e24c..a4ae7a0 100644
--- a/operator/operator.py
+++ b/operator/operator.py
@@ -1,6 +1,5 @@
 import json
 import logging
-from typing import Optional
 
 import kopf
 import kubernetes
diff --git a/server/server.py b/server/server.py
index ddd9a6c..355f531 100644
--- a/server/server.py
+++ b/server/server.py
@@ -5,6 +5,7 @@
 import os
 import sys
 from pathlib import Path
+
 import tornado
 
 log = logging.getLogger(__name__)