diff --git a/.ci/build-kit/docker/Dockerfile b/.ci/build-kit/docker/Dockerfile
index d77a69bf7..250ec49ba 100644
--- a/.ci/build-kit/docker/Dockerfile
+++ b/.ci/build-kit/docker/Dockerfile
@@ -2,9 +2,9 @@
 ARG BASE_IMAGE_TAG=latest
 FROM ghcr.io/everest/everest-ci/build-kit-base:${BASE_IMAGE_TAG}
 
-# LTODO temp
+# Should be removed after updating the base image
 ENV EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
-ENV EVEREST_CMAKE_VERSION=bugfix/setup-cmake-variables-python-wheel
+ENV EVEREST_CMAKE_VERSION=v0.5.0
 RUN rm -rf ${EVEREST_CMAKE_PATH} \
     && git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \
     && cd ${EVEREST_CMAKE_PATH} \
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index 4810e018c..b920b57b1 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -17,8 +17,7 @@ on:
 jobs:
   ci:
     name: Build, Lint and Test
-    # LTODO - set to tag
-    uses: everest/everest-ci/.github/workflows/continuous_integration.yml@bugfix/build-kit-in-forks
+    uses: everest/everest-ci/.github/workflows/continuous_integration.yml@v1.4.0
     permissions:
       contents: read
     secrets: