diff --git a/Makefile b/Makefile
index 39038b001..d08e99f95 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ install:
 	sudo apt -y update && \
 	sudo apt install -y python3-full python3-pip libldap2-dev libpq-dev libsasl2-dev
 run_test_docker: 
-	sudo docker exec ${CONTAINER_ID} odoo -i sale --log-level=test --test-enable -d testdb --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8070
+	sudo docker exec ${CONTAINER_ID} odoo --test-tags=account  --log-level=test --test-enable -d testdb --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8071
 run_test_local: 
 	odoo-bin -i all_modules --log-level=test --test-enable -d testdb  --stop-after-init --config=${CONFIG}
 gen_config:
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 27b87cc18..3129771ce 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -27,6 +27,8 @@ services:
       - POSTGRES_USER=${PG_USER:-changeme}
       - POSTGRES_PASSWORD=${PG_PASS:-password}
       - POSTGRES_DB=${PG_DB:-postgres}
+    ports:
+      - ${PG_PORT:-5432}:5432
     restart: always             
     volumes:
         - ${PG_DATA:-./postgresql}:/var/lib/postgresql/data
diff --git a/deployment/env.template b/deployment/env.template
index 160c826d0..376423a29 100644
--- a/deployment/env.template
+++ b/deployment/env.template
@@ -7,6 +7,7 @@ ODOO_CONTAINER=
 ODOO_ADDONS=./addons
 ODOO_CONFIG=./etc
 #Database
+PG_PORT=
 PG_DB=
 PG_USER=
 PG_PASS=
diff --git a/deployment/etc/odoo.conf b/deployment/etc/odoo.conf
index a54e93ea2..0b9b32d32 100644
--- a/deployment/etc/odoo.conf
+++ b/deployment/etc/odoo.conf
@@ -4,5 +4,5 @@ data_dir = /var/lib/odoo
 db_host = db
 db_port = 5432
 db_user = nexterp
-db_password = dA3nIQioK3bgQoy5Ecrr4ZNm
+db_password = jm8neO0hvRDqC3EBO3euFmoo
 
diff --git a/setup/gen-config.py b/setup/gen-config.py
index ca0083d61..4bbd23cb1 100755
--- a/setup/gen-config.py
+++ b/setup/gen-config.py
@@ -14,7 +14,7 @@ def generate_password(length=16):
     alphabet = string.ascii_letters + string.digits
     return ''.join(secrets.choice(alphabet) for _ in range(length))
 
-def find_available_port(start_port=5432):
+def find_available_port(start_port=80):
     """Finds an available port starting from the given port."""
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
         while True:
@@ -75,6 +75,7 @@ def main():
 
     # Update .env file
     env_file_path = Path("deployment/.env")
+    set_key(dotenv_path=env_file_path, key_to_set="PG_PORT", value_to_set=find_available_port(5432),quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_DB", value_to_set=db_name,quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_USER", value_to_set=db_user,quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_PASS", value_to_set=db_pass,quote_mode="never")