diff --git a/.gitignore b/.gitignore
index 4c49bd78f1d08f2bc09fa0bd8191ed38b7dce5e3..a6af383ca9a34e5d72a0886ceb7e8bb91dca8ed5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .env
+database_volume
diff --git a/docker-compose.yml b/docker-compose.yml
index ff6936c54f9606e6c55b6491d1cac52d3e627aae..c3fa93b37bad9c679e27f3e475bbb4a9d4f60048 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   db:
-    image: mariadb:10.11
+    image: mariadb
     restart: unless-stopped
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "true"
@@ -9,17 +9,17 @@ services:
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
     volumes:
-      - database_volume:/var/lib/mysql
+      - ./database_volume:/var/lib/mysql
 
   passbolt:
-    image: passbolt/passbolt:latest-ce
+    # image: passbolt/passbolt:latest-ce
     #Alternatively you can use rootless:
-    #image: passbolt/passbolt:latest-ce-non-root
+    image: passbolt/passbolt:latest-ce-non-root
     restart: unless-stopped
     depends_on:
       - db
     environment:
-      APP_FULL_BASE_URL: http://${HOST}
+      APP_FULL_BASE_URL: https://${HOST}
       DATASOURCES_DEFAULT_HOST: "db"
       DATASOURCES_DEFAULT_DATABASE: "passbolt"
       DATASOURCES_DEFAULT_USERNAME: ${MYSQL_USER}
diff --git a/ports.yml b/ports.yml
index 7dfa2ec0641ee7fb52253b5f322bc537089e01d2..88bf8f16bfaf4f926a3a5b1eccbb197a5b352a51 100644
--- a/ports.yml
+++ b/ports.yml
@@ -3,4 +3,8 @@ version: "3"
 services:
   passbolt:
     ports:
-      - 80:80
+      # - 80:80
+      # - 443:443
+      #Alternatively for non-root images:
+      - 80:8080
+      - 443:4433