diff --git a/configure.ac b/configure.ac
index 47ee44a7df..6d0ffc7adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2848,6 +2848,7 @@ EOF
             cat >> "${srcdir}/.ccls" <<EOF
 %c $(echo ${FRR_ALL_CCLS_CFLAGS} | sed -e 's/  */\n%c /g')
 %c -Wno-unused-function
+%c -Wno-microsoft
 EOF
 fi
     ], [
diff --git a/doc/developer/building-frr-for-ubuntu2204.rst b/doc/developer/building-frr-for-ubuntu2204.rst
index 6b941b3679..7e62d85763 100644
--- a/doc/developer/building-frr-for-ubuntu2204.rst
+++ b/doc/developer/building-frr-for-ubuntu2204.rst
@@ -50,6 +50,17 @@ This is optional
 
    sudo apt-get install protobuf-c-compiler libprotobuf-c-dev
 
+
+Config Rollbacks
+^^^^^^^^^^^^^^^^
+
+If config rollbacks are enabled using ``--enable-config-rollbacks``
+the sqlite3 developer package also should be installed.
+
+.. code-block:: console
+   sudo apt install libsqlite3-dev
+
+
 ZeroMQ
 ^^^^^^
 This is optional
diff --git a/docker/ubuntu-ci/Dockerfile b/docker/ubuntu-ci/Dockerfile
index ada7a48d37..939a43e4ea 100644
--- a/docker/ubuntu-ci/Dockerfile
+++ b/docker/ubuntu-ci/Dockerfile
@@ -22,6 +22,7 @@ RUN apt update && apt upgrade -y && \
             libpam0g-dev \
             libreadline-dev \
             libsnmp-dev \
+            libsqlite3-dev \
             libtool \
             make \
             perl \
@@ -112,6 +113,7 @@ RUN cd ~/frr && \
        --enable-multipath=64 \
        --enable-user=frr \
        --enable-group=frr \
+       --enable-config-rollbacks \
        --enable-vty-group=frrvty \
        --enable-snmp=agentx \
        --enable-scripting \