diff --git a/bats_ai/settings/base.py b/bats_ai/settings/base.py
index 95e7c754..fc445844 100644
--- a/bats_ai/settings/base.py
+++ b/bats_ai/settings/base.py
@@ -46,7 +46,6 @@
     'django.contrib.sites',
     'django.contrib.staticfiles',
     'django_extensions',
-    'django_filters',
     'oauth2_provider',
     'resonant_utils',
     's3_file_field',
diff --git a/pyproject.toml b/pyproject.toml
index a53add82..1a2a4d77 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,12 +19,10 @@ dependencies = [
     "django-cors-headers",
     "django-environ",
     "django-extensions",
-    "django-filter",
-    "django-minio-storage",
     "django-oauth-toolkit",
     "django-resonant-settings[allauth,celery]",
-    "django-resonant-utils",
-    "django-s3-file-field[s3, minio]",
+    "django-resonant-utils[allauth,s3_storage]",
+    "django-s3-file-field[s3]",
     "django-storages[s3]",
     "django-stubs-ext",
     "psycopg[binary]",
@@ -52,8 +50,11 @@ dependencies = [
 [project.optional-dependencies]
 development = [
     "django-browser-reload",
-    "django-debug-toolbar",
     "django-click",
+    "django-debug-toolbar",
+    "django-minio-storage",
+    "django-resonant-utils[minio_storage]",
+    "django-s3-file-field[minio]",
     "faker",
     "ipython",
     "watchdog",
diff --git a/uv.lock b/uv.lock
index aa14a6f9..95bd5e0e 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.10"
 resolution-markers = [
     "python_full_version >= '3.14' and sys_platform == 'darwin'",
@@ -227,13 +227,11 @@ dependencies = [
     { name = "django-cors-headers" },
     { name = "django-environ" },
     { name = "django-extensions" },
-    { name = "django-filter" },
-    { name = "django-minio-storage" },
     { name = "django-ninja" },
     { name = "django-oauth-toolkit" },
     { name = "django-resonant-settings", extra = ["allauth", "celery"] },
-    { name = "django-resonant-utils" },
-    { name = "django-s3-file-field", extra = ["minio", "s3"] },
+    { name = "django-resonant-utils", extra = ["allauth", "s3-storage"] },
+    { name = "django-s3-file-field", extra = ["s3"] },
     { name = "django-storages", extra = ["s3"] },
     { name = "django-stubs-ext" },
     { name = "gdal" },
@@ -258,6 +256,9 @@ development = [
     { name = "django-browser-reload" },
     { name = "django-click" },
     { name = "django-debug-toolbar" },
+    { name = "django-minio-storage" },
+    { name = "django-resonant-utils", extra = ["minio-storage"] },
+    { name = "django-s3-file-field", extra = ["minio"] },
     { name = "faker" },
     { name = "ipython", version = "8.38.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
     { name = "ipython", version = "9.4.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
@@ -312,13 +313,14 @@ requires-dist = [
     { name = "django-debug-toolbar", marker = "extra == 'development'" },
     { name = "django-environ" },
     { name = "django-extensions" },
-    { name = "django-filter" },
-    { name = "django-minio-storage" },
+    { name = "django-minio-storage", marker = "extra == 'development'" },
     { name = "django-ninja" },
     { name = "django-oauth-toolkit" },
     { name = "django-resonant-settings", extras = ["allauth", "celery"] },
-    { name = "django-resonant-utils" },
-    { name = "django-s3-file-field", extras = ["s3", "minio"] },
+    { name = "django-resonant-utils", extras = ["allauth", "s3-storage"] },
+    { name = "django-resonant-utils", extras = ["minio-storage"], marker = "extra == 'development'" },
+    { name = "django-s3-file-field", extras = ["minio"], marker = "extra == 'development'" },
+    { name = "django-s3-file-field", extras = ["s3"] },
     { name = "django-storages", extras = ["s3"] },
     { name = "django-stubs-ext" },
     { name = "faker", marker = "extra == 'development'" },
@@ -1167,18 +1169,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/64/96/d967ca440d6a8e3861120f51985d8e5aec79b9a8bdda16041206adfe7adc/django_extensions-4.1-py3-none-any.whl", hash = "sha256:0699a7af28f2523bf8db309a80278519362cd4b6e1fd0a8cd4bf063e1e023336", size = 232980, upload-time = "2025-04-11T01:15:37.701Z" },
 ]
 
-[[package]]
-name = "django-filter"
-version = "25.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "django" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b5/40/c702a6fe8cccac9bf426b55724ebdf57d10a132bae80a17691d0cf0b9bac/django_filter-25.1.tar.gz", hash = "sha256:1ec9eef48fa8da1c0ac9b411744b16c3f4c31176c867886e4c48da369c407153", size = 143021, upload-time = "2025-02-14T16:30:53.238Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/07/a6/70dcd68537c434ba7cb9277d403c5c829caf04f35baf5eb9458be251e382/django_filter-25.1-py3-none-any.whl", hash = "sha256:4fa48677cf5857b9b1347fed23e355ea792464e0fe07244d1fdfb8a806215b80", size = 94114, upload-time = "2025-02-14T16:30:50.435Z" },
-]
-
 [[package]]
 name = "django-minio-storage"
 version = "0.5.8"
@@ -1253,6 +1243,17 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b9/49/394af41df5f9c73cd3703374364be8ce8581c0b0390761498958410dc648/django_resonant_utils-0.16.0-py3-none-any.whl", hash = "sha256:3f7b8b7e284269cac704122ef823be415eaf777d601d51a46369250294c276c4", size = 14201, upload-time = "2025-07-10T19:31:34.29Z" },
 ]
 
+[package.optional-dependencies]
+allauth = [
+    { name = "django-allauth" },
+]
+minio-storage = [
+    { name = "django-minio-storage" },
+]
+s3-storage = [
+    { name = "django-storages", extra = ["s3"] },
+]
+
 [[package]]
 name = "django-s3-file-field"
 version = "1.1.0"