diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1830521..2acef38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ jobs:
           - ODOOVERSION: "16.0"
           - ODOOVERSION: "16.0-light"
           - ODOOVERSION: "17.0-light"
+          - ODOOVERSION: "18.0-light"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Docker Buildx
diff --git a/18.0-light/Dockerfile b/18.0-light/Dockerfile
new file mode 100644
index 0000000..7e46ebb
--- /dev/null
+++ b/18.0-light/Dockerfile
@@ -0,0 +1,38 @@
+FROM ghcr.io/acsone/odoo-bedrock:18.0-py312-noble-latest
+ARG PYTHONBIN=python3.12
+MAINTAINER Akretion
+
+# syntax = docker/dockerfile:1.4
+
+# List from https://github.com/camptocamp/docker-odoo-project/blob/master/16.0/Dockerfile
+ENV BUILD_PACKAGE \
+    build-essential \
+    gcc \
+    ${PYTHONBIN}-dev \
+    libevent-dev \
+    libfreetype6-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    libsasl2-dev \
+    libldap2-dev \
+    libssl-dev \
+    libjpeg-dev \
+    libpng-dev \
+    zlib1g-dev \
+    git \
+# Additionnal dep from Ak
+    po4a \
+    libpq-dev \
+    postgresql-client
+
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install -y --no-install-recommends $BUILD_PACKAGE
+
+COPY 18.0-light/base_requirements.txt /tmp/base_requirements.txt
+RUN pip install --no-cache-dir -r /tmp/base_requirements.txt
+
+COPY 18.0-light/ak_requirements.txt /tmp/ak_requirements.txt
+RUN pip install --no-cache-dir -r /tmp/ak_requirements.txt
+
+CMD ["odoo"]
diff --git a/18.0-light/ak_requirements.txt b/18.0-light/ak_requirements.txt
new file mode 100644
index 0000000..8452545
--- /dev/null
+++ b/18.0-light/ak_requirements.txt
@@ -0,0 +1,3 @@
+click-odoo-contrib
+git+https://github.com/oca/openupgradelib.git@master
+odoo_test_helper #==2.0.2
diff --git a/18.0-light/base_requirements.txt b/18.0-light/base_requirements.txt
new file mode 100644
index 0000000..e8cd46f
--- /dev/null
+++ b/18.0-light/base_requirements.txt
@@ -0,0 +1,82 @@
+Babel==2.10.3 ; python_version >= '3.11'
+chardet==5.2.0 ; python_version >= '3.11'
+cryptography==42.0.8 ; python_version >= '3.12'  # (Noble) min 41.0.7, pinning 42.0.8 for security fixes
+decorator==5.1.1  ; python_version >= '3.11'
+docutils==0.20.1 ; python_version >= '3.11'
+ebaysdk==2.1.5
+freezegun==1.2.1 ; python_version >= '3.11'
+geoip2==2.9.0
+gevent==24.2.1 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble)
+greenlet==3.0.3 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble)
+idna==3.6 ; python_version >= '3.12'
+Jinja2==3.1.2 ; python_version > '3.10'
+libsass==0.22.0 ; python_version >= '3.11'  # (Noble) Mostly to have a wheel package
+lxml==5.2.1; python_version >= '3.12' # (Noble - removed html clean)
+lxml-html-clean; python_version >= '3.12' # (Noble - removed from lxml, unpinned for futur security patches)
+MarkupSafe==2.1.5 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+num2words==0.5.13 ; python_version >= '3.12' 
+ofxparse==0.21
+passlib==1.7.4 # min version = 1.7.2 (Focal with security backports)
+Pillow==10.2.0 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+polib==1.1.1
+psutil==5.9.8 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
+psycopg2==2.9.9 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
+pydot==1.4.2
+pyopenssl==24.1.0 ; python_version >= '3.12' # (Noble) min 23.2.0, pinned for compatibility with cryptography==42.0.8 and security patches
+PyPDF2==2.12.1 ; python_version > '3.10'
+pyserial==3.5
+python-dateutil==2.8.2 ; python_version >= '3.11'
+python-ldap==3.4.4 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+python-stdnum==1.19 ; python_version >= '3.11'
+pytz  # no version pinning to avoid OS perturbations
+pyusb==1.2.1
+qrcode==7.4.2 ; python_version >= '3.11'
+reportlab==4.1.0 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
+requests==2.31.0 ; python_version >= '3.11' # (Noble)
+rjsmin==1.2.0 ; python_version >= '3.11'
+rl-renderPM==4.0.3 ; sys_platform == 'win32' and python_version >= '3.12'  # Needed by reportlab 4.1.0 but included in deb package
+urllib3==2.0.7  ; python_version >= '3.12'  # (Noble) Compatibility with cryptography
+vobject==0.9.6.1
+Werkzeug==3.0.1 ; python_version >= '3.12'  # (Noble) Avoid deprecation warnings
+xlrd==2.0.1 ; python_version >= '3.12'
+XlsxWriter==3.1.9 ; python_version >= '3.12'
+xlwt==1.3.0
+zeep==4.2.1 ; python_version >= '3.11'
+setuptools==73.0.1
+
+# Not part of official requirements, but used by some addons
+# colorama==0.3.9
+gdata==2.0.18
+html5lib==1.1
+odfpy==1.4.1
+pyinotify==0.9.6
+simplejson==3.19.3
+
+
+# test / lint
+# those libs and their dependencies are unpinned
+# to always test with the last version of it
+flake8
+pytest==8.3.2
+pluggy
+coverage
+pytest-odoo>=0.4.7
+pytest-cov>=2.10.0
+watchdog
+
+# Library dependency
+argh==0.31.3
+atomicwrites==1.4.1
+attrs==24.2.0
+beautifulsoup4==4.12.3
+future==1.0.0
+mccabe==0.7.0
+more-itertools==10.4.0
+pbr==6.0.0
+pexpect==4.9.0
+ptyprocess==0.7.0
+py==1.11.0
+pycodestyle==2.12.1
+pyflakes==3.2.0
+unicodecsv==0.14.1
+wrapt==1.16.0
diff --git a/HISTORY.rst b/HISTORY.rst
index d53933a..bf01338 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,4 @@
+* 26/09/2024 Add 18.0-light
 * 10/07/2023 *Major change* v14 is now python 3.8
 * 10/07/2023 Add v14-light
 * 10/07/2023 v16-light remove dead file and add ak_requirements