diff --git a/.github/workflows/event-merge-to-queue.yml b/.github/workflows/event-merge-to-queue.yml
index 6d2292c20..20e1ddd94 100644
--- a/.github/workflows/event-merge-to-queue.yml
+++ b/.github/workflows/event-merge-to-queue.yml
@@ -2,6 +2,7 @@ name: Merge a Pull-Request Flow
 run-name: Validate ${{ github.ref_name }}
 
 on:
+  workflow_dispatch:
   workflow_call:
   merge_group:
     types: [checks_requested]
@@ -22,22 +23,22 @@ jobs:
     uses: ./.github/workflows/task-unit-test.yml
     with:
       container: ubuntu:focal
-  bionic:
-    needs: [check-if-docs-only]
-    if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
-    uses: ./.github/workflows/task-unit-test.yml
-    with:
-      container: ubuntu:bionic
+#  bionic:
+#    needs: [check-if-docs-only]
+#    if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
+#    uses: ./.github/workflows/task-unit-test.yml
+#    with:
+#      container: ubuntu:bionic
   bullseye:
     needs: [check-if-docs-only]
     if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
     uses: ./.github/workflows/task-unit-test.yml
     with:
       container: debian:bullseye
-  amazonlinux2:
-    needs: [check-if-docs-only]
-    if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
-    uses: ./.github/workflows/amazon2.yml
+#  amazonlinux2:
+#    needs: [check-if-docs-only]
+#    if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
+#    uses: ./.github/workflows/amazon2.yml
   mariner2:
     needs: [check-if-docs-only]
     if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }}
@@ -75,9 +76,9 @@ jobs:
       - check-if-docs-only
       - jammy
       - focal
-      - bionic
+#      - bionic
       - bullseye
-      - amazonlinux2
+#      - amazonlinux2
       - mariner2
       - rocky8
       - rocky9
diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml
index f7a72a388..7d446024c 100644
--- a/.github/workflows/event-nightly.yml
+++ b/.github/workflows/event-nightly.yml
@@ -1,6 +1,7 @@
 name: nightly
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 20 * * *'
 
@@ -21,18 +22,18 @@ jobs:
     with:
       container: ubuntu:focal
       run-valgrind: false
-  bionic:
-    uses: ./.github/workflows/task-unit-test.yml
-    with:
-      container: ubuntu:bionic
-      run-valgrind: false
+#  bionic:
+#    uses: ./.github/workflows/task-unit-test.yml
+#    with:
+#      container: ubuntu:bionic
+#      run-valgrind: false
   bullseye:
     uses: ./.github/workflows/task-unit-test.yml
     with:
       container: debian:bullseye
       run-valgrind: false
-  amazonlinux2:
-    uses: ./.github/workflows/amazon2.yml
+#  amazonlinux2:
+#    uses: ./.github/workflows/amazon2.yml
   mariner2:
     uses: ./.github/workflows/mariner2.yml
   rocky8:
diff --git a/src/VecSim/algorithms/hnsw/graph_data.h b/src/VecSim/algorithms/hnsw/graph_data.h
index 28df1167b..1d9e66e1e 100644
--- a/src/VecSim/algorithms/hnsw/graph_data.h
+++ b/src/VecSim/algorithms/hnsw/graph_data.h
@@ -25,7 +25,7 @@ struct ElementLevelData {
     idType links[];
 
     explicit ElementLevelData(std::shared_ptr<VecSimAllocator> allocator)
-        : incomingUnidirectionalEdges(new(allocator) vecsim_stl::vector<idType>(allocator)),
+        : incomingUnidirectionalEdges(new (allocator) vecsim_stl::vector<idType>(allocator)),
           numLinks(0) {}
 
     linkListSize getNumLinks() const { return this->numLinks; }
diff --git a/src/python_bindings/bindings.cpp b/src/python_bindings/bindings.cpp
index 39956aa4a..4d15374cf 100644
--- a/src/python_bindings/bindings.cpp
+++ b/src/python_bindings/bindings.cpp
@@ -48,8 +48,8 @@ py::object wrap_results(VecSimQueryReply **res, size_t num_res, size_t num_queri
         VecSimQueryReply_Free(res[i]);
     }
 
-    py::capsule free_when_done_l(data_numpy_l, [](void *labels) { delete[] (long *)labels; });
-    py::capsule free_when_done_d(data_numpy_d, [](void *dists) { delete[] (double *)dists; });
+    py::capsule free_when_done_l(data_numpy_l, [](void *labels) { delete[](long *) labels; });
+    py::capsule free_when_done_d(data_numpy_d, [](void *dists) { delete[](double *) dists; });
     return py::make_tuple(
         py::array_t<long>(
             {(size_t)num_queries, num_res},         // shape
@@ -132,7 +132,7 @@ class PyVecSimIndex {
         }
 
         py::capsule free_when_done(data_numpy,
-                                   [](void *vector_data) { delete[] (NPArrayType *)vector_data; });
+                                   [](void *vector_data) { delete[](NPArrayType *) vector_data; });
         return py::array_t<NPArrayType>(
             {n_vectors, dim}, // shape
             {dim * sizeof(NPArrayType),
diff --git a/tests/module/redismodule.h b/tests/module/redismodule.h
index d4abbb776..25a11e385 100644
--- a/tests/module/redismodule.h
+++ b/tests/module/redismodule.h
@@ -855,10 +855,10 @@ RedisModuleString *(*RedisModule_HoldString)(RedisModuleCtx *ctx,
 REDISMODULE_API int (*RedisModule_StringCompare)(RedisModuleString *a,
                                                  RedisModuleString *b) REDISMODULE_ATTR;
 REDISMODULE_API RedisModuleCtx *(*RedisModule_GetContextFromIO)(RedisModuleIO *io)REDISMODULE_ATTR;
-REDISMODULE_API const RedisModuleString *(*RedisModule_GetKeyNameFromIO)(RedisModuleIO *io)
-    REDISMODULE_ATTR;
-REDISMODULE_API const RedisModuleString *(*RedisModule_GetKeyNameFromModuleKey)(RedisModuleKey *key)
-    REDISMODULE_ATTR;
+REDISMODULE_API const
+    RedisModuleString *(*RedisModule_GetKeyNameFromIO)(RedisModuleIO *io)REDISMODULE_ATTR;
+REDISMODULE_API const
+    RedisModuleString *(*RedisModule_GetKeyNameFromModuleKey)(RedisModuleKey *key)REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_GetDbIdFromModuleKey)(RedisModuleKey *key) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_GetDbIdFromIO)(RedisModuleIO *io) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_GetDbIdFromOptCtx)(RedisModuleKeyOptCtx *ctx) REDISMODULE_ATTR;
@@ -874,8 +874,8 @@ REDISMODULE_API void (*RedisModule_DigestAddLongLong)(RedisModuleDigest *md,
                                                       long long ele) REDISMODULE_ATTR;
 REDISMODULE_API void (*RedisModule_DigestEndSequence)(RedisModuleDigest *md) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_GetDbIdFromDigest)(RedisModuleDigest *dig) REDISMODULE_ATTR;
-REDISMODULE_API const RedisModuleString *(*RedisModule_GetKeyNameFromDigest)(RedisModuleDigest *dig)
-    REDISMODULE_ATTR;
+REDISMODULE_API const
+    RedisModuleString *(*RedisModule_GetKeyNameFromDigest)(RedisModuleDigest *dig)REDISMODULE_ATTR;
 REDISMODULE_API RedisModuleDict *(*RedisModule_CreateDict)(RedisModuleCtx *ctx)REDISMODULE_ATTR;
 REDISMODULE_API void (*RedisModule_FreeDict)(RedisModuleCtx *ctx,
                                              RedisModuleDict *d) REDISMODULE_ATTR;
diff --git a/tests/unit/test_hnsw_parallel.cpp b/tests/unit/test_hnsw_parallel.cpp
index 60df43d73..0abd1c871 100644
--- a/tests/unit/test_hnsw_parallel.cpp
+++ b/tests/unit/test_hnsw_parallel.cpp
@@ -16,7 +16,7 @@
 #include <atomic>
 
 // Helper macro to get the closest even number which is equal or lower than x.
-#define FLOOR_EVEN(x) ((x) - ((x) & 1))
+#define FLOOR_EVEN(x) ((x) - ((x)&1))
 
 template <typename index_type_t>
 class HNSWTestParallel : public ::testing::Test {