diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..8fe5232
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,43 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        buildkitd-flags: --debug
+
+    - name: Build container
+      uses: docker/build-push-action@v5
+      with:
+        context: compose
+        push: false
+        tags: ghcr.io/adfinis/pyaptly/cache:latest
+        cache-from: type=gha
+        cache-to: |
+          type=gha,mode=max
+          type=inline
+
+    - name: Push incline cache
+      run: |
+        docker push ghcr.io/adfinis/pyaptly/cache:latest
\ No newline at end of file
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 0000000..93fbd3f
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,37 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        buildkitd-flags: --debug
+
+    - name: Build container
+      uses: docker/build-push-action@v5
+      with:
+        context: compose
+        push: false
+        tags: ghcr.io/adfinis/pyaptly/cache:latest
+        cache-from: type=gha
+        cache-to: |
+          type=gha,mode=max
+          type=inline
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
deleted file mode 100644
index e6e1f33..0000000
--- a/.github/workflows/testing.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: "0 0 * * 0"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Run build
-      run: |
-        make up push
-
-    - name: Run tests
-      run: |
-        make test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 592979c..a6053e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
 .DEFAULT_GOAL := help
 
+CACHE_IMG = "ghcr.io/adfinis/pyaptly/cache:latest"
+
+DOCKER_BUILDKIT = 1
+export DOCKER_BUILDKIT
+
 # Help target extracts the double-hash comments from the targets and shows them
 # in a convenient way. This allows us to easily document the user-facing Make
 # targets
@@ -8,13 +13,13 @@ help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort -k 1,1 | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: up
-up: ## start and build container if needed
-	#@docker pull ghcr.io/adfinis/pyaptly/cache:latest
-	@DOCKER_BUILDKIT=1 docker compose up -d --build
+up: ## start the container (cached)
+	@docker pull $(CACHE_IMG)
+	@docker compose up -d --build
 
 .PHONY: push
 push: ## push docker build cache to registry
-	@docker push ghcr.io/adfinis/pyaptly/cache:latest
+	@docker push $(CACHE_IMG)
 
 .PHONY: down
 down: ## stop and remove container 
diff --git a/compose/Dockerfile b/compose/Dockerfile
index 9b20f4d..180eeae 100644
--- a/compose/Dockerfile
+++ b/compose/Dockerfile
@@ -1,35 +1,37 @@
-ARG DOCKER_IMAGE
-FROM $DOCKER_IMAGE
+FROM debian:bookworm-slim
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3-toml \
-    python3-requests \
-    python3-poetry \
-    gnupg \
-    bzip2 \
-    tini \
-    curl \
-    wait-for-it \
-    entr \
-    gnutls-bin \
-    nettle-dev \
-    gcc \
-    llvm-dev \
-    libclang-dev \
-    build-essential \
-    pkg-config \
-    gettext \
-    git \
-    procps \
-    psmisc \
-    vim-tiny \
-    cargo \
- && rm -rf /var/lib/apt/lists/* \
- && apt-get clean \
- && apt-get autoclean \
- && rm -rf /var/lib/apt/archives/* \
- && rm -rf /var/cache/apt/*
+#RUN apt-get update && apt-get install -y --no-install-recommends \
+#    python3-toml \
+#    python3-requests \
+#    python3-poetry \
+#    gnupg \
+#    bzip2 \
+#    tini \
+#    curl \
+#    wait-for-it \
+#    entr \
+#    gnutls-bin \
+#    nettle-dev \
+#    gcc \
+#    llvm-dev \
+#    libclang-dev \
+#    build-essential \
+#    pkg-config \
+#    gettext \
+#    git \
+#    procps \
+#    psmisc \
+#    vim-tiny \
+#    cargo \
+# && rm -rf /var/lib/apt/lists/* \
+# && apt-get clean \
+# && apt-get autoclean \
+# && rm -rf /var/lib/apt/archives/* \
+# && rm -rf /var/cache/apt/*
 ADD setup /setup
-RUN /setup/setup
-ADD run /setup/run
-ENTRYPOINT ["/usr/bin/tini", "--"]
\ No newline at end of file
+RUN echo build build build build
+# RUN /setup/setup
+# ADD run /setup/run
+WORKDIR /source
+ENTRYPOINT ["/usr/bin/tini", "--"]
+CMD ["bash", "/setup/run"]
\ No newline at end of file
diff --git a/compose/setup/version b/compose/setup/version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/compose/setup/version
@@ -0,0 +1 @@
+2
diff --git a/docker-compose.yml b/docker-compose.yml
index e90c033..c2738df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,12 +4,9 @@ services:
     image: ghcr.io/adfinis/pyaptly/cache:latest
     build:
       cache_from:
-        - ghcr.io/adfinis/pyaptly/cache:latest
+        - type=registry,ref=ghcr.io/adfinis/pyaptly/cache:latest
       context: compose
       args:
         BUILDKIT_INLINE_CACHE: 1
-        DOCKER_IMAGE: debian:bookworm-slim
-    working_dir: /source
-    command: ["bash", "/setup/run"]
     volumes:
       - ./:/source