diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 116c645e..0e1c3f64 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1 +1 @@
-FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev11
+FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev18
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index da053ac4..4b17772f 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -13,7 +13,7 @@ jobs:
   checks:
     name: Format and License Checks
     runs-on: ubuntu-20.04
-    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev11
+    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev18
     steps:
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout repository
@@ -37,7 +37,7 @@ jobs:
             unit_tests_enabled: OFF
     runs-on: ${{ matrix.platform.nodes }}
     container:
-      image: ghcr.io/microsoft/ccf/app/dev/${{ matrix.platform.image }}:ccf-6.0.0-dev11
+      image: ghcr.io/microsoft/ccf/app/dev/${{ matrix.platform.image }}:ccf-6.0.0-dev18
       options: ${{ matrix.platform.options }}
       env:
         # Helps to distinguish between CI and local builds.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index db470fc9..5b73d427 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,7 +17,7 @@ jobs:
     name: Analyze
     
     runs-on: ubuntu-latest
-    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev11
+    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev18
     
     permissions:
       actions: read
diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml
index b0a1fbbe..3522f8a0 100644
--- a/.github/workflows/long-test.yml
+++ b/.github/workflows/long-test.yml
@@ -56,7 +56,7 @@ jobs:
     name: fuzz
     if: ${{ contains(github.event.pull_request.labels.*.name, 'run-fuzz-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
-    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev11
+    container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-6.0.0-dev18
     env:
       PLATFORM: virtual
     steps:
diff --git a/.pipelines/pullrequest.yml b/.pipelines/pullrequest.yml
index 6ff46dfb..4f345220 100644
--- a/.pipelines/pullrequest.yml
+++ b/.pipelines/pullrequest.yml
@@ -8,7 +8,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 - name: CCF_VERSION
   displayName: Target CCF version to build for
   type: string
-  default: 6.0.0-dev11
+  default: 6.0.0-dev18
 
 variables:
   SCITT_CI: 1 # used in scitt builds and tests
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 7e519310..4d531cbb 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -39,10 +39,10 @@ It is expected that you have Ubuntu 20.04. Follow the steps below to setup your
 
 2. Install dependencies:
     ```sh
-    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-6.0.0-dev11.tar.gz
-    tar xvzf ccf-6.0.0-dev11.tar.gz
-    cd CCF-ccf-6.0.0-dev11/getting_started/setup_vm/
-    ./run.sh app-dev.yml -e ccf_ver=6.0.0-dev11 -e platform=<virtual|snp> -e clang_version=15
+    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-6.0.0-dev18.tar.gz
+    tar xvzf ccf-6.0.0-dev18.tar.gz
+    cd CCF-ccf-6.0.0-dev18/getting_started/setup_vm/
+    ./run.sh app-dev.yml -e ccf_ver=6.0.0-dev18 -e platform=<virtual|snp> -e clang_version=15
     ```
 
 ## Compiling
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 84ae9b52..9de9e275 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -19,10 +19,6 @@ project(scitt
 set(COMPILE_TARGET "snp" CACHE STRING "Target compilation platform, either 'virtual', or 'snp'")
 option(BUILD_TESTS "Whether to build tests" ON)
 option(ENABLE_CLANG_TIDY "Run clang-tidy on the codebase" OFF)
-# Added as option to enable Azure Linux build in 6.0.0-dev, will eventually be removed
-# once the transition to libstdc++ is complete
-set(USE_LIBCXX ON CACHE BOOL "Use libc++ instead of libstdc++")
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 find_package(ccf_${COMPILE_TARGET} 6.0.0 REQUIRED)
@@ -103,10 +99,6 @@ if (BUILD_TESTS)
     add_subdirectory(${rapidcheck_SOURCE_DIR} ${rapidcheck_BINARY_DIR} EXCLUDE_FROM_ALL)
   endif()
 
-  # Because CCF libraries are built with libc++,
-  # everything else has to be too.
-  target_compile_options(gtest PUBLIC ${COMPILE_LIBCXX})
-  target_compile_options(rapidcheck PUBLIC ${COMPILE_LIBCXX})
   add_san(gtest)
   add_san(rapidcheck)
 
@@ -122,7 +114,6 @@ if (BUILD_TESTS)
     unit-tests/historical/lru_test.cpp
   )
   add_san(unit_tests)
-  target_compile_options(unit_tests PUBLIC ${COMPILE_LIBCXX})
   target_link_system_libraries(unit_tests PRIVATE
     GTest::gmock
     rapidcheck
diff --git a/build.sh b/build.sh
index 69b4e4db..ba5a1c3c 100755
--- a/build.sh
+++ b/build.sh
@@ -19,7 +19,7 @@ if [ "$PLATFORM" != "virtual" ] && [ "$PLATFORM" != "snp" ]; then
 fi
 
 if [ "$BUILD_CCF_FROM_SOURCE" = "ON" ]; then
-    CCF_SOURCE_VERSION="6.0.0-dev11"
+    CCF_SOURCE_VERSION="6.0.0-dev18"
     echo "Cloning CCF sources"
     rm -rf ccf-source
     git clone --single-branch -b "ccf-${CCF_SOURCE_VERSION}" https://github.com/microsoft/CCF ccf-source
diff --git a/docker/snp.Dockerfile b/docker/snp.Dockerfile
index 70a908f1..e5f2ed63 100644
--- a/docker/snp.Dockerfile
+++ b/docker/snp.Dockerfile
@@ -1,4 +1,4 @@
-ARG CCF_VERSION=6.0.0-dev11
+ARG CCF_VERSION=6.0.0-dev18
 FROM ghcr.io/microsoft/ccf/app/dev/snp:ccf-${CCF_VERSION}  as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE
diff --git a/docker/virtual.Dockerfile b/docker/virtual.Dockerfile
index 8a56b726..65aa0e2c 100644
--- a/docker/virtual.Dockerfile
+++ b/docker/virtual.Dockerfile
@@ -1,4 +1,4 @@
-ARG CCF_VERSION=6.0.0-dev11
+ARG CCF_VERSION=6.0.0-dev18
 FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-${CCF_VERSION}  as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE
diff --git a/pyscitt/setup.py b/pyscitt/setup.py
index d7fc3a8a..3301028d 100644
--- a/pyscitt/setup.py
+++ b/pyscitt/setup.py
@@ -25,7 +25,7 @@
     },
     python_requires=">=3.8",
     install_requires=[
-        "ccf==6.0.0-dev11",
+        "ccf==6.0.0-dev18",
         "cryptography==44.*",  # needs to match ccf
         "httpx",
         "cbor2==5.4.*",
diff --git a/test/requirements.txt b/test/requirements.txt
index d367158d..ed3dbeea 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -4,7 +4,7 @@ httpx
 pytest
 loguru
 aiotools
-ccf==6.0.0-dev11
+ccf==6.0.0-dev18
 cryptography==44.*
 jwcrypto==1.5.*
 types-jwcrypto