diff --git a/.dockerignore b/.dockerignore
index aad30826..647c2035 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -19,4 +19,6 @@ venv/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-*.code-workspace
\ No newline at end of file
+*.code-workspace
+
+venv/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 3c351003..e095f6e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,10 @@ FROM python:3.12-alpine
 # Install MySQL and PostgreSQL client libraries
 RUN apk update && apk add --no-cache \
     mariadb-connector-c-dev \
-    postgresql-dev python3-dev musl-dev
+    postgresql-dev python3-dev musl-dev git
 
 # Install Tox
 RUN pip install tox
-RUN tox -e dev
 
 # Set the working directory
 WORKDIR /app
@@ -16,5 +15,7 @@ WORKDIR /app
 # Copy the project files to the working directory
 COPY . /app
 
+RUN tox -e dev
+
 # Set the entrypoint command
 CMD ["tox"]
diff --git a/src/cities_light/management/commands/cities_light.py b/src/cities_light/management/commands/cities_light.py
index d46973e1..2e9a389c 100644
--- a/src/cities_light/management/commands/cities_light.py
+++ b/src/cities_light/management/commands/cities_light.py
@@ -21,9 +21,9 @@
 
 from ...settings import (
     COUNTRY_SOURCES, REGION_SOURCES, SUBREGION_SOURCES, CITY_SOURCES,
-    TRANSLATION_SOURCES, DATA_DIR, TRANSLATION_LANGUAGES
+    TRANSLATION_SOURCES, DATA_DIR, TRANSLATION_LANGUAGES,
+    ICountry, IRegion, ISubRegion, ICity, IAlternate
 )
-from ...models import ICountry, IRegion, ISubRegion, ICity, IAlternate
 from ...signals import (
     country_items_pre_import, region_items_pre_import,
     subregion_items_pre_import, city_items_pre_import,
diff --git a/src/cities_light/migrations/0003_auto_20141120_0342.py b/src/cities_light/migrations/0003_auto_20141120_0342.py
index 88f31da8..0a216858 100644
--- a/src/cities_light/migrations/0003_auto_20141120_0342.py
+++ b/src/cities_light/migrations/0003_auto_20141120_0342.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-import cities_light.models
+from cities_light.abstract_models import ToSearchTextField
 
 from cities_light.settings import INDEX_SEARCH_NAMES
 
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='city',
             name='search_names',
-            field=cities_light.models.ToSearchTextField(default=b'', max_length=4000, db_index=INDEX_SEARCH_NAMES, blank=True),
+            field=ToSearchTextField(default=b'', max_length=4000, db_index=INDEX_SEARCH_NAMES, blank=True),
             preserve_default=True,
         ),
     ]