diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d1759f5..abab22d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,10 @@ on:
     branches:
       - '*'
 
+env:
+  CC: clang
+  CXX: clang++
+
 jobs:
   build_linux:
     strategy:
@@ -30,7 +34,7 @@ jobs:
     name: Rellic CI
     runs-on: "gha-ubuntu-32"
     container:
-      image: docker.pkg.github.com/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}:${{ matrix.image.tag }}
+      image: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}-v2:${{ matrix.image.tag }}
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/diff_tests.yml b/.github/workflows/diff_tests.yml
index 895339bf..916cda2c 100644
--- a/.github/workflows/diff_tests.yml
+++ b/.github/workflows/diff_tests.yml
@@ -13,7 +13,7 @@ jobs:
         image:
           - { name: 'ubuntu', tag: '20.04', codename: 'focal' }
         llvm: [ '16' ]
-        common_base: [ 'https://github.com/lifting-bits/cxx-common/releases/latest/download' ]
+        common_base: [ 'https://github.com/lifting-bits/cxx-common/releases/download/v0.4.1' ]
 
     env:
       CC: clang-${{ matrix.llvm }}
@@ -22,7 +22,7 @@ jobs:
     name: Diff in ouput between old and new rellic
     runs-on: gha-ubuntu-32
     container:
-      image: docker.pkg.github.com/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}:${{ matrix.image.tag }}
+      image: ghcr.io/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}-v2:${{ matrix.image.tag }}
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index 2fa7eb61..1b40a102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ FROM ${BUILD_BASE} as base
 # Build-time dependencies go here
 # See here for full list of those dependencies
 # https://github.com/lifting-bits/cxx-common/blob/master/docker/Dockerfile.ubuntu.vcpkg
-FROM trailofbits/cxx-common-vcpkg-builder-ubuntu:${UBUNTU_VERSION} as deps
+FROM ghcr.io/lifting-bits/cxx-common/vcpkg-builder-ubuntu-v2:${UBUNTU_VERSION} as deps
 ARG UBUNTU_VERSION
 ARG ARCH
 ARG LLVM_VERSION
@@ -30,6 +30,8 @@ ARG LLVM_VERSION
 ARG LIBRARIES
 ENV TRAILOFBITS_LIBRARIES="${LIBRARIES}"
 ENV PATH="${LIBRARIES}/llvm/bin/:${LIBRARIES}/cmake/bin:${PATH}"
+ENV CC=clang
+ENV CXX=clang++
 
 WORKDIR /rellic
 COPY ./ ./
diff --git a/scripts/build.sh b/scripts/build.sh
index b205e86a..4d551304 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -19,7 +19,7 @@ CURR_DIR=$( pwd )
 BUILD_DIR="${CURR_DIR}/rellic-build"
 INSTALL_DIR=/usr/local
 LLVM_VERSION=llvm-16
-CXX_COMMON_VERSION=v0.3.2
+CXX_COMMON_VERSION=v0.4.1
 OS_VERSION=unknown
 ARCH_VERSION=unknown
 BUILD_FLAGS=