diff --git a/cuda11.4.3-gcc9.4-x64.dockerfile b/cuda11.4.3-gcc9.4-x64.dockerfile
index 4ab591d..91ed221 100644
--- a/cuda11.4.3-gcc9.4-x64.dockerfile
+++ b/cuda11.4.3-gcc9.4-x64.dockerfile
@@ -33,7 +33,7 @@ RUN apt update \
 RUN pip install clingo
 
 # Now we install spack and find compilers/externals
-RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.22.0" https://github.com/spack/spack.git
+RUN mkdir -p /opt/ && cd /opt/ && git clone https://github.com/spack/spack.git && cd spack && git checkout b190518
 
 # Add current source dir into the image
 COPY . /opt/src/ci-images
diff --git a/spack-cuda.yaml b/spack-cuda.yaml
index 85ec44b..399e54c 100644
--- a/spack-cuda.yaml
+++ b/spack-cuda.yaml
@@ -3,7 +3,7 @@ spack:
     - mpis:
       - mpich@3.4.2
     - core-packages:
-      - kokkos@4.1 +cuda +wrapper +cuda_lambda cuda_arch=61
+      - kokkos@4.4 +cuda +wrapper +cuda_lambda cuda_arch=61
       - fmt@10.2.1
       - spdlog@1.13.0
     - packages:
diff --git a/spack.yaml b/spack.yaml
index 89ca6d9..11526fa 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -4,7 +4,7 @@ spack:
     - mpis:
       - mpich@3.4.2
     - core-packages:
-      - kokkos@4.1 +openmp +serial
+      - kokkos@4.4 +openmp +serial
       - fmt@10.2.1
       - spdlog@1.13.0
     - packages:
diff --git a/ubuntu20.04-gcc11-x64.dockerfile b/ubuntu20.04-gcc11-x64.dockerfile
index cb82b51..bfc9b0e 100644
--- a/ubuntu20.04-gcc11-x64.dockerfile
+++ b/ubuntu20.04-gcc11-x64.dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update \
 RUN pip install clingo
 
 # Now we install spack and find compilers/externals
-RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.22.0" https://github.com/spack/spack.git
+RUN mkdir -p /opt/ && cd /opt/ && git clone https://github.com/spack/spack.git && cd spack && git checkout b190518
 
 # Add current source dir into the image
 COPY . /opt/src/ci-images