diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 412b1c4630fc437b7e20e46b5417ed3075b510fc..e1138d135ea463f43637a644b96f52cdbc272f9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ build_binaries:
   stage: build
   script:
     - autoreconf -si
-    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION"
+    - ./configure --with-matlab=/opt/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION"
     - make -j $(nproc) LN_S="cp -p"
   artifacts:
     paths:
@@ -56,7 +56,7 @@ pkg_source:
     - rm doc/manual/source/_static/mathjax && sed -i "/^mathjax_path *=/d" doc/manual/source/conf.py
     - 'for f in configure.ac preprocessor/configure.ac mex/build/matlab/configure.ac mex/build/octave/configure.ac; do sed -i "s/^AC_INIT(\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1], [$VERSION])/" $f; done'
     - autoreconf -si
-    - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION
+    - ./configure --with-matlab=/opt/MATLAB/$MATLAB_VERSION
     - make dist
   artifacts:
     paths:
@@ -67,7 +67,7 @@ pkg_source:
 pkg_windows:
   stage: pkg
   script:
-    - mkdir -p windows/deps/tarballs && cp ~/tarballs/matlab64-* windows/deps/tarballs/
+    - mkdir -p windows/deps/tarballs && cp /usr/lib/dynare-runner/matlab64-* windows/deps/tarballs/
     - make -C windows
     - rm windows/deps/tarballs/matlab64-* # No need to cache these files
   cache:
@@ -123,14 +123,14 @@ test_matlab:
   extends: .test_matlab_template
   script:
     - autoreconf -si
-    - ./configure --disable-octave --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION
+    - ./configure --disable-octave --with-matlab=/opt/MATLAB/$MATLAB_VERSION
     - make -j $(($(nproc) * 3 / 4)) -C tests check-matlab
 
 test_old_matlab:
   extends: .test_matlab_template
   script:
     - autoreconf -si
-    - ./configure --disable-octave --with-matlab=/usr/local/MATLAB/$OLD_MATLAB_VERSION
+    - ./configure --disable-octave --with-matlab=/opt/MATLAB/$OLD_MATLAB_VERSION
     - make -C mex/build/matlab clean
     - make -j $(nproc) -C mex/build/matlab
     - make -j $(($(nproc) * 3 / 4)) -C tests check-matlab
diff --git a/matlab/modules/dseries b/matlab/modules/dseries
index 0e275d751e5887075786b09d513fb3661f8ca7a2..9c1a33c69010473cfe5c9144b4c636a900a2b268 160000
--- a/matlab/modules/dseries
+++ b/matlab/modules/dseries
@@ -1 +1 @@
-Subproject commit 0e275d751e5887075786b09d513fb3661f8ca7a2
+Subproject commit 9c1a33c69010473cfe5c9144b4c636a900a2b268
diff --git a/matlab/modules/reporting b/matlab/modules/reporting
index 5d7f7e0c2bbf1985a516662c360d984e230a38c8..8800d4459299fde7362dd2ccce64b0a96477aa68 160000
--- a/matlab/modules/reporting
+++ b/matlab/modules/reporting
@@ -1 +1 @@
-Subproject commit 5d7f7e0c2bbf1985a516662c360d984e230a38c8
+Subproject commit 8800d4459299fde7362dd2ccce64b0a96477aa68