diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index d564926b..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-*.deb filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90222bec..17f28d64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,6 @@ jobs:
         with:
           # fetch the whole repo for `git describe` to work
           fetch-depth: 0
-          lfs: true
 
       - name: "Run flake8"
         run: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 68491b68..d4ab7e55 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -70,13 +70,10 @@ if that is possible.
 
 ### Get the Source
 
-Make sure git with LFS support ist installed.
-
 To clone the git repo, run the following commands:
 ```
 git clone git@github.com:aptly-dev/aptly.git
 cd aptly
-git lfs checkout
 ```
 
 ## Development Setup
diff --git a/Makefile b/Makefile
index 3ff15d3d..27ccdde1 100644
--- a/Makefile
+++ b/Makefile
@@ -85,9 +85,10 @@ test: prepare swagger etcd-install  ## Run unit tests
 system-test: prepare swagger etcd-install  ## Run system tests
 	# build coverage binary
 	go test -v -coverpkg="./..." -c -tags testruncli
-	# Extract fixture-db, fixture-pool, etcd.db
-	test -e ~/aptly-fixture-db || tar -C ~/ -xf system/files/aptly-fixture.tar.xz
-	test -f ~/etcd.db || xz -dc system/files/etcd.db.xz > ~/etcd.db
+	# Download fixture-db, fixture-pool, etcd.db
+	if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi
+	if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi
+	test -f ~/etcd.db || (curl -o ~/etcd.db.xz http://repo.aptly.info/system-tests/etcd.db.xz && xz -d ~/etcd.db.xz)
 	# Run system tests
 	PATH=$(BINPATH)/:$(PATH) && FORCE_COLOR=1 $(PYTHON) system/run.py --long --coverage-dir $(COVERAGE_DIR) $(CAPTURE) $(TEST)
 
diff --git a/system/Dockerfile b/system/Dockerfile
index 53fc87d7..c57f27df 100644
--- a/system/Dockerfile
+++ b/system/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg b
         golang/bookworm-backports golang-go/bookworm-backports golang-doc/bookworm-backports golang-src/bookworm-backports \
         make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage \
         g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \
-        binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev git-lfs && \
+        binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly
@@ -16,6 +16,9 @@ RUN mkdir /work
 WORKDIR /work/src
 RUN chown aptly /work
 
+RUN cd /var/lib/aptly; git clone https://github.com/aptly-dev/aptly-fixture-db.git
+RUN cd /var/lib/aptly; git clone https://github.com/aptly-dev/aptly-fixture-pool.git
+RUN cd /var/lib/aptly; curl -O http://repo.aptly.info/system-tests/etcd.db.xz && xz -d etcd.db.xz
 RUN echo "aptly ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/aptly
 ADD system/t13_etcd/install-etcd.sh /src/
 RUN /src/install-etcd.sh
diff --git a/system/files/aptly-fixture.tar.xz b/system/files/aptly-fixture.tar.xz
deleted file mode 100644
index 963ac2ac..00000000
--- a/system/files/aptly-fixture.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cef7679d88a35f87fff1d7647473f3413fcca4b643a927185fe5088ac16d8b5
-size 47947528
diff --git a/system/files/etcd.db.xz b/system/files/etcd.db.xz
deleted file mode 100644
index c8464e05..00000000
--- a/system/files/etcd.db.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d6d4e4ef989635ea5d0533a55f862c1524d97dcadcafe8d2f1a79fc4b01a443
-size 27149608
diff --git a/system/t09_repo/AddRepo17Test/mesa-stable-no-march_24.2.6-101pika1_amd64.deb b/system/t09_repo/AddRepo17Test/mesa-stable-no-march_24.2.6-101pika1_amd64.deb
index ef70a0ec..b021ea8e 100644
Binary files a/system/t09_repo/AddRepo17Test/mesa-stable-no-march_24.2.6-101pika1_amd64.deb and b/system/t09_repo/AddRepo17Test/mesa-stable-no-march_24.2.6-101pika1_amd64.deb differ
diff --git a/system/t09_repo/AddRepo17Test/mesa-stable_24.2.6-101pika1_amd64.deb b/system/t09_repo/AddRepo17Test/mesa-stable_24.2.6-101pika1_amd64.deb
index 35ccd13e..1114ba60 100644
Binary files a/system/t09_repo/AddRepo17Test/mesa-stable_24.2.6-101pika1_amd64.deb and b/system/t09_repo/AddRepo17Test/mesa-stable_24.2.6-101pika1_amd64.deb differ