diff --git a/.env-local b/.env-local
index 4a8be83..2650bb7 100644
--- a/.env-local
+++ b/.env-local
@@ -1,3 +1,4 @@
 DEBUG=True
 STAGE=local
 DATABASE_URL=postgres://postgres@postgres:5432/db
+DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/test-*
\ No newline at end of file
diff --git a/src/portal/migrations/0003_auto_20180718_1741.py b/src/portal/migrations/0003_auto_20180718_1741.py
new file mode 100644
index 0000000..8d83843
--- /dev/null
+++ b/src/portal/migrations/0003_auto_20180718_1741.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-07-18 17:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+import django.db.models.deletion
+import filer.fields.file
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0002_auto_20180425_1334'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='downloadfiletranslation',
+            name='file',
+            field=filer.fields.file.FilerFileField(on_delete=django.db.models.deletion.CASCADE, to='filer.File', verbose_name='File'),
+        ),
+    ]
diff --git a/src/portal/models.py b/src/portal/models.py
index 6d2bfaa..52d870d 100644
--- a/src/portal/models.py
+++ b/src/portal/models.py
@@ -7,6 +7,7 @@ from django.conf import settings
 from django.db import models
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from filer.fields.file import FilerFileField
 from image_cropping import ImageRatioField
 from parler.models import TranslatableModel, TranslatedFields
 
@@ -132,12 +133,6 @@ class DownloadTag(TranslatableModel):
         return self.name
 
 
-if getattr(settings, 'DEFAULT_STORAGE_DSN', None):
-    protected_file_storage = PrivateS3MediaStorage()
-else:
-    protected_file_storage = default_storage
-
-
 class DownloadFile(TranslatableModel):
     section = models.ForeignKey(DownloadSection, verbose_name='Download Section', related_name='files')
     groups = models.ManyToManyField(Group, verbose_name='Mitgliedergruppen', related_name='files')
@@ -147,7 +142,7 @@ class DownloadFile(TranslatableModel):
     translations = TranslatedFields(
         name=models.CharField(max_length=512, verbose_name='Name', blank=True, null=True),
         description=models.TextField(verbose_name='Beschreibung', blank=True, null=True),
-        file=models.FileField(upload_to='protected_files', max_length=512, storage=protected_file_storage)
+        file=FilerFileField(verbose_name='File')
     )
 
     ordering = models.IntegerField(default=50, verbose_name='Sortierung')