diff --git a/ci-fedora.dockerfile b/ci-fedora.dockerfile
index bdfed41..062f07b 100644
--- a/ci-fedora.dockerfile
+++ b/ci-fedora.dockerfile
@@ -22,6 +22,7 @@ RUN dnf -y update && \
     ninja-build \
     petsc-mpich-devel \
     eigen3-devel \
+    kokkos-devel \
     python3-devel \
     python3-pip \
     google-benchmark \
@@ -31,4 +32,7 @@ RUN dnf -y update && \
     echo "module load mpi/mpich-x86_64" > /etc/profile.d/mpich.sh
 
 # Run interactively using a bash login shell
+COPY --chown=root:root ginkgo/99-ginkgo-env.sh /etc/profile.d/
+COPY ginkgo/ginkgo-install.sh ginkgo-install.sh
+RUN ./ginkgo-install.sh && rm ginkgo-install.sh
 CMD [ "bash", "--login" ]
diff --git a/ci-ubuntu-2404.dockerfile b/ci-ubuntu-2404.dockerfile
index e058344..549f46a 100644
--- a/ci-ubuntu-2404.dockerfile
+++ b/ci-ubuntu-2404.dockerfile
@@ -36,7 +36,4 @@ RUN apt-get -qq update && \
     && rm -rf /var/lib/apt/lists/*
 
 # Environment variables are set in the .env file
-COPY --chown=root:root ginkgo/99-ginkgo-env.sh /etc/profile.d/
-COPY ginkgo/ginkgo-install.sh ginkgo-install.sh
-RUN ./ginkgo-install.sh && rm ginkgo-install.sh
 CMD ["/bin/bash", "--login"]
diff --git a/ginkgo/99-ginkgo-env.sh b/ginkgo/99-ginkgo-env.sh
index 4a3471b..7a88600 100755
--- a/ginkgo/99-ginkgo-env.sh
+++ b/ginkgo/99-ginkgo-env.sh
@@ -1,6 +1,4 @@
 # Copy this file into /etc/profile.d/
 
-export Ginkgo_DIR=/ginkgo/build
-
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$Ginkgo_DIR/lib
 export CPATH=$CPATH:$Ginkgo_DIR/include
diff --git a/ginkgo/ginkgo-install.sh b/ginkgo/ginkgo-install.sh
index e1e1cb0..2f97625 100755
--- a/ginkgo/ginkgo-install.sh
+++ b/ginkgo/ginkgo-install.sh
@@ -1,7 +1,7 @@
 # This script installs GINKGO
-VERSION=3.12.4
+VERSION=1.8.0
 
-wget -c https://github.com/ginkgo-project/ginkgo/archive/refs/heads/public_common_kernels.zip
-unzip public_common_kernels.zip && mv ginkgo-public_common_kernels ginkgo
+wget -c https://github.com/ginkgo-project/ginkgo/archive/refs/tags/v$VERSION.zip
+unzip v$VERSION.zip && mv ginkgo-$VERSION ginkgo
 cd ginkgo && mkdir build && cd build
-cmake .. && make
+cmake -DBUILD_TESTING="OFF" -DGINKGO_BUILD_EXAMPLES="OFF" -DGINKGO_BUILD_TESTS="OFF" .. && make -j 4