diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index f40bba2..b6b277b 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -6,6 +6,14 @@ rocky8-deploy:
     - rocky8-package
     - rocky8-test
 
+rocky9-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh rockylinux
+  needs:
+    - rocky9-package
+    - rocky9-test
+
 debian11-deploy:
   extends: .deploy
   script:
@@ -22,13 +30,13 @@ debian12-deploy:
     - debian12-package
     - debian12-test
 
-remi-deploy:
+remi-rocky8-deploy:
   extends: .deploy
   script:
     - ./deploy_packages.sh rockylinux
   needs:
-    - remi-package
-    - remi-phpredis-test
+    - remi-rocky8-package
+    - remi-rocky8-test
 
 .deploy:
   stage: deploy
diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index 8b02bf3..a286fae 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -1,14 +1,16 @@
 rocky8-package:
-  extends: .package
+  extends: .rocky-package
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
+
+rocky9-package:
+  extends: .rocky-package
+  image: gitlab.linphone.org:4567/bc/public/docker/rocky9-php:$ROCKY_9_IMAGE_VERSION
+
+.rocky-package:
+  extends: .package
   script:
     - make rpm
 
-.debian_package:
-  extends: .package
-  script:
-    - make deb
-
 debian11-package:
   extends: .debian_package
   image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
@@ -17,9 +19,14 @@ debian12-package:
   extends: .debian_package
   image: gitlab.linphone.org:4567/bc/public/docker/debian12-php:$DEBIAN_12_IMAGE_VERSION
 
-remi-package:
+.debian_package:
   extends: .package
+  script:
+    - make deb
+
+remi-rocky8-package:
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
+  extends: .package
   script:
     - mkdir -p $CI_PROJECT_DIR/build
     - dnf -y install https://rpms.remirepo.net/enterprise/remi-release-8.rpm
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index f5e9dd7..f431560 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -1,8 +1,17 @@
 rocky8-test:
-  extends: .test
+  extends: .rocky-test
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   needs:
     - rocky8-package
+
+rocky9-test:
+  extends: .rocky-test
+  image: gitlab.linphone.org:4567/bc/public/docker/rocky9-php:$ROCKY_9_IMAGE_VERSION
+  needs:
+    - rocky9-package
+
+.rocky-test:
+  extends: .test
   script:
     - yum -y localinstall build/*.rpm
     - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
@@ -12,19 +21,6 @@ rocky8-test:
     - php artisan key:generate
     - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
 
-.debian-test:
-  extends: .test
-  script:
-    - pwd
-    - apt update
-    - apt install -y ./build/*.deb
-    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
-    - composer install --dev
-    - vendor/bin/phpcs
-    - vendor/bin/phpmd . ansi phpmd.xml
-    - php artisan key:generate
-    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
-
 debian11-test:
   extends: .debian-test
   image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
@@ -37,11 +33,24 @@ debian12-test:
   needs:
     - debian12-package
 
-remi-phpredis-test:
+.debian-test:
+  extends: .test
+  script:
+    - pwd
+    - apt update
+    - apt install -y ./build/*.deb
+    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
+    - composer install --dev
+    - vendor/bin/phpcs
+    - vendor/bin/phpmd . ansi phpmd.xml
+    - php artisan key:generate
+    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
+
+remi-rocky8-test:
   extends: .test
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   needs:
-    - remi-package
+    - remi-rocky8-package
   script:
     - yum -y localinstall build/*.rpm
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a691e7..853c59f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   ROCKY_8_IMAGE_VERSION: 20230330_163028_remove_remi
+  ROCKY_9_IMAGE_VERSION: 20231019_170719_rocky9_php80_cleanup
   DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools
   DEBIAN_12_IMAGE_VERSION: 20230925_143235_enable_debian12_packaging
   PHP_REDIS_REMI_VERSION: php-pecl-redis5-5.3.6-1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52f738d..2ece336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ v1.4
 ----
 - Redesign and refactoring of the main UI and panel flows
 - Removal of XMLRPC
+- Add RockyLinux 9 support
 
 v1.3
 ----