diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd509da2..321a2753 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,7 +119,8 @@ workflows:
               singlestore_image:
                 - singlestore/cluster-in-a-box:alma-8.0.19-f48780d261-4.0.11-1.16.0
                 - singlestore/cluster-in-a-box:alma-8.1.32-e3d3cde6da-4.0.16-1.17.6
-                - singlestore/cluster-in-a-box:alma-8.5.7-bf633c1a54-4.0.17-1.17.8
+                - singlestore/cluster-in-a-box:alma-8.5.22-fe61f40cd1-4.1.0-1.17.11
+                - singlestore/cluster-in-a-box:alma-8.7.12-483e5f8acb-4.1.0-1.17.15
   publish:
     jobs:
       - approve-publish:
diff --git a/Layerfile b/Layerfile
index bac27705..7ade2018 100644
--- a/Layerfile
+++ b/Layerfile
@@ -39,9 +39,9 @@ MEMORY 8G
 MEMORY 12G
 MEMORY 16G
 
-# split to 16 states
+# split to 21 states
 # each of them will run different version of the singlestore and spark
-SPLIT 16
+SPLIT 21
 
 # copy the entire git repository
 COPY . .
diff --git a/scripts/define-layerci-matrix.sh b/scripts/define-layerci-matrix.sh
index e8d6d58a..78fe6d66 100755
--- a/scripts/define-layerci-matrix.sh
+++ b/scripts/define-layerci-matrix.sh
@@ -4,7 +4,8 @@ set -eu
 SINGLESTORE_IMAGE_TAGS=(
     "alma-8.0.19-f48780d261-4.0.11-1.16.0"
     "alma-8.1.32-e3d3cde6da-4.0.16-1.17.6"
-    "alma-8.5.7-bf633c1a54-4.0.17-1.17.8"
+    "alma-8.5.22-fe61f40cd1-4.1.0-1.17.11"
+    "alma-8.7.12-483e5f8acb-4.1.0-1.17.15"
 )
 SINGLESTORE_IMAGE_TAGS_COUNT=${#SINGLESTORE_IMAGE_TAGS[@]}
 SPARK_VERSIONS=(