diff --git a/example/add_docker_to_matrix.sh b/example/add_docker_to_matrix.sh
index ac9ac1f..c242404 100755
--- a/example/add_docker_to_matrix.sh
+++ b/example/add_docker_to_matrix.sh
@@ -5,7 +5,7 @@ set -e
 shopt -s nullglob
 for package_json in $(find . -name '*.json')
 do
-  jq '.DockerMatrix.ImageNames += [ "ubuntu2310"  ]' ${package_json} > ${package_json}.test
+  jq '.DockerMatrix.ImageNames += [ "fedora40"  ]' ${package_json} > ${package_json}.test
   mv ${package_json}.test ${package_json}
 done
 shopt -u nullglob
\ No newline at end of file
diff --git a/example/docker/fedora40/Dockerfile b/example/docker/fedora40/Dockerfile
new file mode 100644
index 0000000..4f4c8e5
--- /dev/null
+++ b/example/docker/fedora40/Dockerfile
@@ -0,0 +1,27 @@
+FROM fedora:40
+
+USER root
+RUN echo root:1234 | chpasswd
+
+RUN dnf -y update && \
+    dnf -y install  \
+      make automake gcc gcc-c++ kernel-devel binutils lsb-release git openssl-devel openssh-server wget patchelf
+
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
+    chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --prefix=/usr/local && \
+    rm ./cmake.sh
+
+RUN dnf -y update && \
+    dnf -y remove \
+      wget
+
+RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
+RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc
+
+RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN mkdir -p /run/sshd
+
+RUN ssh-keygen -A
+
+ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
diff --git a/example/package/ba-logger/ba-logger_debug.json b/example/package/ba-logger/ba-logger_debug.json
index fe53375..c826738 100644
--- a/example/package/ba-logger/ba-logger_debug.json
+++ b/example/package/ba-logger/ba-logger_debug.json
@@ -34,7 +34,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/ba-logger/ba-logger_release.json b/example/package/ba-logger/ba-logger_release.json
index 5374849..cf8485c 100644
--- a/example/package/ba-logger/ba-logger_release.json
+++ b/example/package/ba-logger/ba-logger_release.json
@@ -34,7 +34,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/boost/boost_debug.json b/example/package/boost/boost_debug.json
index 55ce0f4..74bd0ba 100644
--- a/example/package/boost/boost_debug.json
+++ b/example/package/boost/boost_debug.json
@@ -31,7 +31,8 @@
       "debian11",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/boost/boost_release.json b/example/package/boost/boost_release.json
index d5ee09f..2c25574 100644
--- a/example/package/boost/boost_release.json
+++ b/example/package/boost/boost_release.json
@@ -31,7 +31,8 @@
       "debian11",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/bzip2/bzip2_debug.json b/example/package/bzip2/bzip2_debug.json
index 3252d68..17ca51e 100644
--- a/example/package/bzip2/bzip2_debug.json
+++ b/example/package/bzip2/bzip2_debug.json
@@ -29,7 +29,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/bzip2/bzip2_release.json b/example/package/bzip2/bzip2_release.json
index 64badf8..4fa0875 100644
--- a/example/package/bzip2/bzip2_release.json
+++ b/example/package/bzip2/bzip2_release.json
@@ -29,7 +29,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/cpprestsdk/cpprestsdk_debug.json b/example/package/cpprestsdk/cpprestsdk_debug.json
index 9af053b..e1c9ad5 100644
--- a/example/package/cpprestsdk/cpprestsdk_debug.json
+++ b/example/package/cpprestsdk/cpprestsdk_debug.json
@@ -1,6 +1,9 @@
 {
-  "Env": { },
-  "DependsOn": [ "zlib", "boost" ],
+  "Env": {},
+  "DependsOn": [
+    "zlib",
+    "boost"
+  ],
   "Git": {
     "URI": "https://github.com/bringauto/cpprestsdk.git",
     "Revision": "v2.10.20"
@@ -31,7 +34,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/cpprestsdk/cpprestsdk_release.json b/example/package/cpprestsdk/cpprestsdk_release.json
index c43e8e3..37322ca 100644
--- a/example/package/cpprestsdk/cpprestsdk_release.json
+++ b/example/package/cpprestsdk/cpprestsdk_release.json
@@ -1,6 +1,9 @@
 {
-  "Env": { },
-  "DependsOn": [ "zlib", "boost" ],
+  "Env": {},
+  "DependsOn": [
+    "zlib",
+    "boost"
+  ],
   "Git": {
     "URI": "https://github.com/bringauto/cpprestsdk.git",
     "Revision": "v2.10.20"
@@ -31,7 +34,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/curl/curl_debug.json b/example/package/curl/curl_debug.json
index d3b3262..121d7ca 100644
--- a/example/package/curl/curl_debug.json
+++ b/example/package/curl/curl_debug.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/curl/curl_release.json b/example/package/curl/curl_release.json
index 857ad42..8ac585c 100644
--- a/example/package/curl/curl_release.json
+++ b/example/package/curl/curl_release.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/cxxopts/cxxopts_v3_debug.json b/example/package/cxxopts/cxxopts_v3_debug.json
index fb83196..d065500 100644
--- a/example/package/cxxopts/cxxopts_v3_debug.json
+++ b/example/package/cxxopts/cxxopts_v3_debug.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/cxxopts/cxxopts_v3_release.json b/example/package/cxxopts/cxxopts_v3_release.json
index ce3b520..f34df7f 100644
--- a/example/package/cxxopts/cxxopts_v3_release.json
+++ b/example/package/cxxopts/cxxopts_v3_release.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/expat/expat_debug.json b/example/package/expat/expat_debug.json
index 7f1add1..085365e 100644
--- a/example/package/expat/expat_debug.json
+++ b/example/package/expat/expat_debug.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/expat/expat_release.json b/example/package/expat/expat_release.json
index baa2c0d..ba98a56 100644
--- a/example/package/expat/expat_release.json
+++ b/example/package/expat/expat_release.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-http-client-shared/fleet_http_client_debug.json b/example/package/fleet-http-client-shared/fleet_http_client_debug.json
index 6fb851f..df9abba 100644
--- a/example/package/fleet-http-client-shared/fleet_http_client_debug.json
+++ b/example/package/fleet-http-client-shared/fleet_http_client_debug.json
@@ -1,6 +1,13 @@
 {
   "Env": {},
-  "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ],
+  "DependsOn": [
+    "zlib",
+    "ba-logger",
+    "boost",
+    "fleet-protocol-interface",
+    "fleet-protocol-cxx-helpers-static",
+    "cpprestsdk"
+  ],
   "Git": {
     "URI": "https://github.com/bringauto/fleet-protocol-http-client-cxx.git",
     "Revision": "v1.3.0"
@@ -12,8 +19,8 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_SAMPLES" : "OFF",
-        "BRINGAUTO_TESTS" : "OFF"
+        "BRINGAUTO_SAMPLES": "OFF",
+        "BRINGAUTO_TESTS": "OFF"
       }
     }
   },
@@ -34,7 +41,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-http-client-shared/fleet_http_client_release.json b/example/package/fleet-http-client-shared/fleet_http_client_release.json
index bd0424c..ba363aa 100644
--- a/example/package/fleet-http-client-shared/fleet_http_client_release.json
+++ b/example/package/fleet-http-client-shared/fleet_http_client_release.json
@@ -1,6 +1,13 @@
 {
   "Env": {},
-  "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ],
+  "DependsOn": [
+    "zlib",
+    "ba-logger",
+    "boost",
+    "fleet-protocol-interface",
+    "fleet-protocol-cxx-helpers-static",
+    "cpprestsdk"
+  ],
   "Git": {
     "URI": "https://github.com/bringauto/fleet-protocol-http-client-cxx.git",
     "Revision": "v1.3.0"
@@ -12,8 +19,8 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_SAMPLES" : "OFF",
-        "BRINGAUTO_TESTS" : "OFF"
+        "BRINGAUTO_SAMPLES": "OFF",
+        "BRINGAUTO_TESTS": "OFF"
       }
     }
   },
@@ -34,7 +41,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json
index d5779a5..c4d28dd 100644
--- a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json
+++ b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json
@@ -14,7 +14,7 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_TESTS" : "OFF"
+        "BRINGAUTO_TESTS": "OFF"
       }
     }
   },
@@ -35,7 +35,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json
index 1c63330..7685541 100644
--- a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json
+++ b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json
@@ -14,7 +14,7 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_TESTS" : "OFF"
+        "BRINGAUTO_TESTS": "OFF"
       }
     }
   },
@@ -35,7 +35,8 @@
       "debian12",
       "debian11",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-interface/fleet_protocol_debug.json b/example/package/fleet-protocol-interface/fleet_protocol_debug.json
index 3c1abeb..74feb7c 100644
--- a/example/package/fleet-protocol-interface/fleet_protocol_debug.json
+++ b/example/package/fleet-protocol-interface/fleet_protocol_debug.json
@@ -12,7 +12,7 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_SAMPLES" : "OFF"
+        "BRINGAUTO_SAMPLES": "OFF"
       }
     }
   },
@@ -34,7 +34,8 @@
       "debian11",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-interface/fleet_protocol_release.json b/example/package/fleet-protocol-interface/fleet_protocol_release.json
index 4e8a060..b9672a3 100644
--- a/example/package/fleet-protocol-interface/fleet_protocol_release.json
+++ b/example/package/fleet-protocol-interface/fleet_protocol_release.json
@@ -12,7 +12,7 @@
         "BRINGAUTO_INSTALL": "ON",
         "BRINGAUTO_PACKAGE": "ON",
         "BRINGAUTO_SYSTEM_DEP": "ON",
-        "BRINGAUTO_SAMPLES" : "OFF"
+        "BRINGAUTO_SAMPLES": "OFF"
       }
     }
   },
@@ -34,7 +34,8 @@
       "debian11",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-internal-client/internal_client_debug.json b/example/package/fleet-protocol-internal-client/internal_client_debug.json
index 8be4254..a4d9f20 100644
--- a/example/package/fleet-protocol-internal-client/internal_client_debug.json
+++ b/example/package/fleet-protocol-internal-client/internal_client_debug.json
@@ -37,7 +37,8 @@
       "debian11",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/fleet-protocol-internal-client/internal_client_release.json b/example/package/fleet-protocol-internal-client/internal_client_release.json
index c959a3b..b506d48 100644
--- a/example/package/fleet-protocol-internal-client/internal_client_release.json
+++ b/example/package/fleet-protocol-internal-client/internal_client_release.json
@@ -37,7 +37,8 @@
       "debian11",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/gtest/gtest_debug.json b/example/package/gtest/gtest_debug.json
index eabbcfd..c62c865 100644
--- a/example/package/gtest/gtest_debug.json
+++ b/example/package/gtest/gtest_debug.json
@@ -29,7 +29,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/gtest/gtest_release.json b/example/package/gtest/gtest_release.json
index 77a942b..3a40a79 100644
--- a/example/package/gtest/gtest_release.json
+++ b/example/package/gtest/gtest_release.json
@@ -29,7 +29,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/libosmium/libosmium_debug.json b/example/package/libosmium/libosmium_debug.json
index 735986d..caa39cc 100644
--- a/example/package/libosmium/libosmium_debug.json
+++ b/example/package/libosmium/libosmium_debug.json
@@ -40,7 +40,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/libosmium/libosmium_release.json b/example/package/libosmium/libosmium_release.json
index 6ccea8a..62f3102 100644
--- a/example/package/libosmium/libosmium_release.json
+++ b/example/package/libosmium/libosmium_release.json
@@ -40,7 +40,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/lz4/lz4_debug.json b/example/package/lz4/lz4_debug.json
index 8687efd..0db597e 100644
--- a/example/package/lz4/lz4_debug.json
+++ b/example/package/lz4/lz4_debug.json
@@ -31,7 +31,8 @@
       "debian11",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/lz4/lz4_release.json b/example/package/lz4/lz4_release.json
index 062b167..8c1575f 100644
--- a/example/package/lz4/lz4_release.json
+++ b/example/package/lz4/lz4_release.json
@@ -31,7 +31,8 @@
       "debian11",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/modbuspp/modbuspp_debug.json b/example/package/modbuspp/modbuspp_debug.json
index 7becc47..e96c4a8 100644
--- a/example/package/modbuspp/modbuspp_debug.json
+++ b/example/package/modbuspp/modbuspp_debug.json
@@ -30,7 +30,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/modbuspp/modbuspp_release.json b/example/package/modbuspp/modbuspp_release.json
index 215928a..ab0475b 100644
--- a/example/package/modbuspp/modbuspp_release.json
+++ b/example/package/modbuspp/modbuspp_release.json
@@ -30,7 +30,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/msgpack/msgpack_debug.json b/example/package/msgpack/msgpack_debug.json
index cd553d9..d499156 100644
--- a/example/package/msgpack/msgpack_debug.json
+++ b/example/package/msgpack/msgpack_debug.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/msgpack/msgpack_release.json b/example/package/msgpack/msgpack_release.json
index 726a1a3..98b21cf 100644
--- a/example/package/msgpack/msgpack_release.json
+++ b/example/package/msgpack/msgpack_release.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/nlohmannjson/nlohmannjson_debug.json b/example/package/nlohmannjson/nlohmannjson_debug.json
index 786b4e1..f82a87e 100644
--- a/example/package/nlohmannjson/nlohmannjson_debug.json
+++ b/example/package/nlohmannjson/nlohmannjson_debug.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/nlohmannjson/nlohmannjson_release.json b/example/package/nlohmannjson/nlohmannjson_release.json
index 1847d67..6f88573 100644
--- a/example/package/nlohmannjson/nlohmannjson_release.json
+++ b/example/package/nlohmannjson/nlohmannjson_release.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/pahomqttc/pahomqttc_debug.json b/example/package/pahomqttc/pahomqttc_debug.json
index 8bff103..8c7e54a 100644
--- a/example/package/pahomqttc/pahomqttc_debug.json
+++ b/example/package/pahomqttc/pahomqttc_debug.json
@@ -35,7 +35,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/pahomqttc/pahomqttc_release.json b/example/package/pahomqttc/pahomqttc_release.json
index f446fec..b721ffe 100644
--- a/example/package/pahomqttc/pahomqttc_release.json
+++ b/example/package/pahomqttc/pahomqttc_release.json
@@ -35,7 +35,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/pahomqttcpp/pahomqttcpp_debug.json b/example/package/pahomqttcpp/pahomqttcpp_debug.json
index 34a5325..601c3a2 100644
--- a/example/package/pahomqttcpp/pahomqttcpp_debug.json
+++ b/example/package/pahomqttcpp/pahomqttcpp_debug.json
@@ -37,7 +37,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/pahomqttcpp/pahomqttcpp_release.json b/example/package/pahomqttcpp/pahomqttcpp_release.json
index da6c9bd..d79cab3 100644
--- a/example/package/pahomqttcpp/pahomqttcpp_release.json
+++ b/example/package/pahomqttcpp/pahomqttcpp_release.json
@@ -37,7 +37,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protobuf/protobuf_debug_v21.12.json b/example/package/protobuf/protobuf_debug_v21.12.json
index 06a8f2f..b2da3e0 100644
--- a/example/package/protobuf/protobuf_debug_v21.12.json
+++ b/example/package/protobuf/protobuf_debug_v21.12.json
@@ -34,7 +34,8 @@
       "fleet-os-2",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protobuf/protobuf_debug_v3.17.json b/example/package/protobuf/protobuf_debug_v3.17.json
index 321efac..ec36540 100644
--- a/example/package/protobuf/protobuf_debug_v3.17.json
+++ b/example/package/protobuf/protobuf_debug_v3.17.json
@@ -26,6 +26,7 @@
   },
   "DockerMatrix": {
     "ImageNames": [
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protobuf/protobuf_release_v21.12.json b/example/package/protobuf/protobuf_release_v21.12.json
index c3bbb93..fb85ce4 100644
--- a/example/package/protobuf/protobuf_release_v21.12.json
+++ b/example/package/protobuf/protobuf_release_v21.12.json
@@ -34,7 +34,8 @@
       "fleet-os-2",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protobuf/protobuf_release_v3.17.json b/example/package/protobuf/protobuf_release_v3.17.json
index 6539930..0f03c49 100644
--- a/example/package/protobuf/protobuf_release_v3.17.json
+++ b/example/package/protobuf/protobuf_release_v3.17.json
@@ -26,6 +26,7 @@
   },
   "DockerMatrix": {
     "ImageNames": [
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protozero/protozero_debug.json b/example/package/protozero/protozero_debug.json
index a040f32..ca8751b 100644
--- a/example/package/protozero/protozero_debug.json
+++ b/example/package/protozero/protozero_debug.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/protozero/protozero_release.json b/example/package/protozero/protozero_release.json
index 11cf8e7..b339e2c 100644
--- a/example/package/protozero/protozero_release.json
+++ b/example/package/protozero/protozero_release.json
@@ -31,7 +31,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/spdlog/spdlog_debug.json b/example/package/spdlog/spdlog_debug.json
index 4c19524..93b778a 100644
--- a/example/package/spdlog/spdlog_debug.json
+++ b/example/package/spdlog/spdlog_debug.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/spdlog/spdlog_release.json b/example/package/spdlog/spdlog_release.json
index 5d80fa2..9f12f29 100644
--- a/example/package/spdlog/spdlog_release.json
+++ b/example/package/spdlog/spdlog_release.json
@@ -32,7 +32,8 @@
       "fleet-os-2",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/statesmurf/statesmurf_debug.json b/example/package/statesmurf/statesmurf_debug.json
index 0c6d7cb..47c72a1 100644
--- a/example/package/statesmurf/statesmurf_debug.json
+++ b/example/package/statesmurf/statesmurf_debug.json
@@ -35,7 +35,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/statesmurf/statesmurf_release.json b/example/package/statesmurf/statesmurf_release.json
index 8e2ea90..9751209 100644
--- a/example/package/statesmurf/statesmurf_release.json
+++ b/example/package/statesmurf/statesmurf_release.json
@@ -35,7 +35,8 @@
       "ubuntu2204",
       "debian12",
       "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2310",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/zlib/zlib_debug.json b/example/package/zlib/zlib_debug.json
index 4804517..cb823fb 100644
--- a/example/package/zlib/zlib_debug.json
+++ b/example/package/zlib/zlib_debug.json
@@ -30,7 +30,8 @@
       "debian12",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }
diff --git a/example/package/zlib/zlib_release.json b/example/package/zlib/zlib_release.json
index 4a842b1..d22a266 100644
--- a/example/package/zlib/zlib_release.json
+++ b/example/package/zlib/zlib_release.json
@@ -30,7 +30,8 @@
       "debian12",
       "ubuntu2304",
       "ubuntu2310",
-      "ubuntu1804-aarch64"
+      "ubuntu1804-aarch64",
+      "fedora40"
     ]
   }
 }