diff --git a/.gitmodules b/.gitmodules
index e69de29..86a24d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "odoo/src/enterprise"]
+	path = odoo/src/enterprise
+	url = https://github.com/ursais/enterprise.git
+[submodule "odoo/odoo"]
+	path = odoo/odoo
+	url = https://github.com/ursais/odoo.git
diff --git a/docker-compose.yml b/docker-compose.yml
index f87ec30..058f514 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   db:
-    image: ursa/postgresql:latest
+    image: postgres:17
     restart: always
     environment:
       - POSTGRES_DB=postgres
diff --git a/odoo/Dockerfile b/odoo/Dockerfile
index f74b356..5db4ab4 100644
--- a/odoo/Dockerfile
+++ b/odoo/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/t4c3a5h0/odoo-base:18.0-test-20241010
+FROM public.ecr.aws/t4c3a5h0/odoo-base:18.0-test-20241022
 MAINTAINER Open Source Integrators <support@opensourceintegrators.com>
 
 # Copy files
@@ -12,4 +12,4 @@ COPY --chown=odoo songs /odoo/songs
 # COPY --chown=odoo src/l10n-mexico /odoo/addons/
 COPY src/enterprise /odoo/addons/
 
-RUN cd /odoo && pip3 install -r requirements.txt
+RUN cd /odoo && pip3 install -r requirements.txt --break-system-packages
diff --git a/odoo/migration.yml b/odoo/migration.yml
index aae9610..2ad8271 100644
--- a/odoo/migration.yml
+++ b/odoo/migration.yml
@@ -2,30 +2,14 @@ migration:
   options:
     install_command: odoo
     install_args: --log-level=debug
-    backup:
-      command: '
-        export DATE=$(date +%Y%m%dT%H%M%S) && psql -c "CREATE DATABASE $DATE WITH
-        TEMPLATE $PGDATABASE;"'
-      stop_on_failure: true
-      ignore_if: test "${RUNNING_ENV}" != "production"
 
   versions:
     - version: setup
-      backup: false
       operations:
-        #        pre:
-        #          - psql -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
         post:
           - anthem songs.setup.base::main
-          - /bin/sh -c "VERSION=17.0.1.0.0 anthem songs.environment::main"
+          - /bin/sh -c "VERSION=18.0.1.0.0 anthem songs.environment::main"
       addons:
         upgrade:
-          - customer
-          # - monitoring_status
-          - web_environment_ribbon
-#      modes:
-#        external:
-#          operations:
-#          addons:
-#            upgrade:
-#              - session_redis
+          - contacts
+
diff --git a/odoo/odoo b/odoo/odoo
new file mode 160000
index 0000000..d82522a
--- /dev/null
+++ b/odoo/odoo
@@ -0,0 +1 @@
+Subproject commit d82522a0c5dbd5f13ed4d2852a697a587ae1f295
diff --git a/odoo/setup.py b/odoo/setup.py
index 7f6ba3d..460a55b 100644
--- a/odoo/setup.py
+++ b/odoo/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="odoo-songs",
-    version="17.0.1.0.0",
+    version="18.0.1.0.0",
     description="Odoo ERP",
     license="GNU Affero General Public License v3 or later (AGPLv3+)",
     author="Open Source Integrators",
diff --git a/odoo/src/enterprise b/odoo/src/enterprise
new file mode 160000
index 0000000..c2281f6
--- /dev/null
+++ b/odoo/src/enterprise
@@ -0,0 +1 @@
+Subproject commit c2281f64c6cb6f73f75d54ca4660bb0f09204f86