diff --git a/mc_backend/README.md b/mc_backend/README.md
index 2572636d78072c241f7dd3c98e3d8af45368f472..3b0c19758f517d5a7c19d4a69bb8ba4a8edcfb69 100644
--- a/mc_backend/README.md
+++ b/mc_backend/README.md
@@ -16,8 +16,6 @@ DATABASE_URL_PROD=postgresql://postgres@db:5432/
 DATABASE_URL=postgresql://postgres@db:5432/
 # Change this to "production" for public use
 FLASK_ENV_VARIABLE=development
-# for Windows, use 127.0.0.1 instead
-HOST_IP=0.0.0.0
 RUST_BACKTRACE=1
 OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 ```
diff --git a/mc_backend/mcserver/app/__init__.py b/mc_backend/mcserver/app/__init__.py
index 56ee74888e413f5f2f2a56c6491bd9cd0f8d867b..9445aaaecab50e2d6a44add58ef529490cd27c87 100644
--- a/mc_backend/mcserver/app/__init__.py
+++ b/mc_backend/mcserver/app/__init__.py
@@ -88,10 +88,10 @@ def init_app_common(cfg: Type[Config] = Config, is_csm: bool = False) -> Flask:
     app.app_context().push()
     db.init_app(app)
     migrate.init_app(app, db)
-    db.create_all()
     if is_csm:
         from mcserver.app.services.databaseService import DatabaseService
         DatabaseService.init_db_alembic()
+    db.create_all()
     from mcserver.app.services.textService import TextService
     TextService.init_proper_nouns_list()
     TextService.init_stop_words_latin()
diff --git a/mc_backend/mcserver/app/services/databaseService.py b/mc_backend/mcserver/app/services/databaseService.py
index f197de1614b411a5d7ce4aee9dcf6c2de221a843..11867a81857dbd07d5d5ad66f3ef638f09bf5ba5 100644
--- a/mc_backend/mcserver/app/services/databaseService.py
+++ b/mc_backend/mcserver/app/services/databaseService.py
@@ -11,7 +11,7 @@ from mcserver.app.models import CitationLevel, ResourceType, TextComplexityMeasu
     AnnisResponse, GraphData, TextComplexity
 from mcserver.app.services import CorpusService, CustomCorpusService, TextComplexityService
 from mcserver.config import Config
-from mcserver.models_auto import Corpus, Exercise, TExercise, UpdateInfo
+from mcserver.models_auto import Corpus, Exercise, UpdateInfo
 
 
 class DatabaseService:
diff --git a/mc_backend/mcserver/config.py b/mc_backend/mcserver/config.py
index 3837e318fc786f79d7e4bd48f604d48f46fe8959..74e5769e0ebe77ee2f7d3ace457610a8a0a9eb0a 100644
--- a/mc_backend/mcserver/config.py
+++ b/mc_backend/mcserver/config.py
@@ -81,8 +81,10 @@ class Config(object):
     H5P_FILL_BLANKS = "fill_blanks"
     H5P_MULTI_CHOICE = "multi_choice"
     H5P_VOC_LIST = "voc_list"
-    HOST_IP_MCSERVER = os.environ.get("HOST_IP", DOCKER_SERVICE_NAME_MCSERVER if IS_DOCKER else "127.0.0.1")
-    HOST_IP_CSM = DOCKER_SERVICE_NAME_CSM if IS_DOCKER else HOST_IP_MCSERVER
+    # Windows: use 127.0.0.1 as host IP fallback
+    HOST_IP_FALLBACK = "0.0.0.0"
+    HOST_IP_CSM = DOCKER_SERVICE_NAME_CSM if IS_DOCKER else HOST_IP_FALLBACK
+    HOST_IP_MCSERVER = DOCKER_SERVICE_NAME_MCSERVER if IS_DOCKER else HOST_IP_FALLBACK
     HOST_PORT = 5000
     INTERNET_PROTOCOL = "http://"
     INTERVAL_CORPUS_AGE_CHECK = 60 * 60