diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
index eb741d9..8f4446c 100644
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -2,31 +2,30 @@ name: Django CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     environment: test
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7]
+        python-version: [3.11]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Run Tests
-      run: |
-        python manage.py test
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Run Tests
+        run: |
+          python manage.py test
diff --git a/Dockerfile b/Dockerfile
index b4d57a3..765522d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,4 @@ WORKDIR /code
 COPY requirements.txt /code/
 RUN pip install -r requirements.txt --no-cache-dir
 COPY . /code/
-CMD gunicorn "approval_polls.wsgi:application" "-b 0.0.0.0:8000"
\ No newline at end of file
+ENTRYPOINT ["/code/entrypoint.sh"]
\ No newline at end of file
diff --git a/approval_polls/settings.py b/approval_polls/settings.py
index c69064f..b0aa619 100644
--- a/approval_polls/settings.py
+++ b/approval_polls/settings.py
@@ -106,7 +106,7 @@
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 )
 
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_STORAGE = "whitenoise.storage.CompressedStaticFilesStorage"
 
 
 LOGIN_REDIRECT_URL = "/"
@@ -197,4 +197,4 @@
     },
 }
 
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
\ No newline at end of file
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
diff --git a/docker-compose.yml b/docker-compose.yml
index 939ff0e..8daffad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,10 @@ version: "3.9"
 services:
   web:
     build: .
-    entrypoint: gunicorn
-    command:
-      - "approval_polls.wsgi:application"
-      - "-b 0.0.0.0:8000"
+    environment:
+      DEBUG: False
     ports:
       - "8000:8000"
     volumes:
       - ./:/code
-      - ./db.sqlite3:/data/db.sqlite3
+      - ./db.sqlite3:/data/prod.sqlite3
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..3f19107
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Exit script in case of error
+set -e
+
+# Run Django migrations
+echo "Running migrations"
+python manage.py migrate --noinput
+python manage.py collectstatic  --noinput
+
+# Start Gunicorn server
+echo "Starting server"
+exec gunicorn "approval_polls.wsgi:application" "-b 0.0.0.0:8000"