diff --git a/Makefile b/Makefile
index 84386ea..b7ee459 100644
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,18 @@ init:
 
 setup: stop
 	@bash mobilizon/docker/message.sh "Compiling everything"
-	docker-compose run --rm mobilizon bash -c 'mix deps.get; npm ci; npm run build:pictures; mix ecto.create; mix ecto.migrate'
+	# docker-compose run --rm mobilizon bash -c 'mix hex.config unsafe_https true; mix deps.get; npm ci; npm run build:pictures'
+	docker-compose run --rm mobilizon bash -c 'mix ecto.create; mix ecto.migrate'
 migrate:
 	docker-compose run --rm mobilizon mix ecto.migrate
 logs:
 	docker-compose logs -f
 start: stop
-	@bash mobilizon/docker/message.sh "Starting Mobilizon with Docker"
+	@bash mobilizon/docker/message.sh "Starting WordPress and Mobilizon with Docker"
 	docker-compose up -d
-	@bash mobilizon/docker/message.sh "Docker server started"
+	@bash mobilizon/docker/message.sh "Docker containers started"
 stop:
-	@bash mobilizon/docker/message.sh "Stopping Mobilizon"
+	@bash mobilizon/docker/message.sh "Stopping WordPress and Mobilizon"
 	docker-compose down
-	@bash mobilizon/docker/message.sh "Mobilizon is stopped"
-test: stop
-	@bash mobilizon/docker/message.sh "Running tests"
-	docker-compose -f docker-compose.yml -f docker-compose.test.yml run mobilizon mix prepare_test
-	docker-compose -f docker-compose.yml -f docker-compose.test.yml run mobilizon mix test $(only)
-	@bash mobilizon/docker/message.sh "Done running tests"
-format:
-	docker-compose run --rm mobilizon bash -c "mix format && mix credo --strict"
-	@bash mobilizon/docker/message.sh "Code is now ready to commit :)"
+	@bash mobilizon/docker/message.sh "WordPress and Mobilizon are stopped"
 target: init
diff --git a/docker-compose.yml b/docker-compose.yml
index 36d1954..3d02939 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,18 @@ services:
           - wp.lan
           - mz.lan
 
+  postgres:
+    container_name: mobilizon_db
+    restart: unless-stopped
+    image: postgis/postgis
+    environment:
+      - POSTGRES_USER=mobilizon
+      - POSTGRES_PASSWORD=mobilizon
+      - POSTGRES_DB=mobilizon
+      - POSTGRES_PORT=5432
+    volumes:
+      - mobilizon_database_data:/var/lib/postgresql/data
+
   mobilizon:
     container_name: mobilizon
     restart: unless-stopped
@@ -27,13 +39,12 @@ services:
       dockerfile: Dockerfile
     volumes:
       - "./mobilizon:/app"
-      - /etc/ssl/certs:/etc/ssl/certs:ro
-      - /etc/ca-certificates/:/etc/ca-certificates/:ro
+      - "~/.local/share/mkcert/:/root/.local/share/mkcert/:ro"
     ports:
       - 4000:4000
       - 5173:5173
     depends_on:
-      - mobilizon_db
+      - postgres
     environment:
       MIX_ENV: "dev"
       DOCKER: "true"
@@ -46,12 +57,10 @@ services:
       MOBILIZON_DATABASE_PASSWORD: mobilizon
       MOBILIZON_DATABASE_USERNAME: mobilizon
       MOBILIZON_DATABASE_DBNAME: mobilizon
-      MOBILIZON_DATABASE_HOST: mobilizon_db
+      MOBILIZON_DATABASE_HOST: postgres
       MOBILIZON_DATABASE_PORT: 5432
       VITE_HOST: ${VITE_HOST:-0.0.0.0}
-    command: sh -c "mix phx.server"
-    env_file:
-      - .env
+    command: sh -c "mix hex.config unsafe_https true; mix phx.server"
     expose:
       - "4000"
 
@@ -61,8 +70,8 @@ services:
       dockerfile: Dockerfile-WordPress
     volumes:
       - ./wordpress:/var/www/html
-      - /etc/ssl/certs:/etc/ssl/certs:ro
-      - /etc/ca-certificates/:/etc/ca-certificates/:ro
+      #- /etc/ssl/certs:/etc/ssl/certs:ro
+      #- /etc/ca-certificates/:/etc/ca-certificates/:ro
     environment:
       - DOCKER_DEV_DOMAIN=wp.lan
       - WORDPRESS_DB_NAME=wordpress
@@ -94,16 +103,6 @@ services:
       - MYSQL_DATABASE=wordpress
     restart: always
 
-  mobilizon_db:
-    image: postgis/postgis:15-3.4
-    restart: unless-stopped
-    volumes:
-      - mobilizon_database_data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-
   phpmyadmin:
     depends_on:
       - mariadb