diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ebde29..118baed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ jobs:
   build_push_to_dockerhub:
     strategy:
       matrix:
-        base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"]
+        base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bookworm", "php:8.3-bookworm", "php:8.4-bookworm"]
     runs-on: ubuntu-latest 
 
     steps:
@@ -43,19 +43,19 @@ jobs:
           echo "COMPOSER_VERSION=2" >> $GITHUB_ENV
       
       - name: Set PHP 8.2 settings
-        if: ${{ matrix.base_container == 'php:8.2-bullseye' }}
+        if: ${{ matrix.base_container == 'php:8.2-bookworm' }}
         run: |
           echo "BUILD_TAGS=10up/wordpress-ci:php-8.2" >> $GITHUB_ENV
           echo "COMPOSER_VERSION=2" >> $GITHUB_ENV
 
       - name: Set PHP 8.3 settings
-        if: ${{ matrix.base_container == 'php:8.3-bullseye' }}
+        if: ${{ matrix.base_container == 'php:8.3-bookworm' }}
         run: |
           echo "BUILD_TAGS=10up/wordpress-ci:php-8.3" >> $GITHUB_ENV
           echo "COMPOSER_VERSION=2" >> $GITHUB_ENV
 
       - name: Set PHP 8.4 settings
-        if: ${{ matrix.base_container == 'php:8.4-bullseye' }}
+        if: ${{ matrix.base_container == 'php:8.4-bookworm' }}
         run: |
           echo "BUILD_TAGS=10up/wordpress-ci:php-8.4" >> $GITHUB_ENV
           echo "COMPOSER_VERSION=2" >> $GITHUB_ENV
@@ -104,7 +104,7 @@ jobs:
         with:
           action: docker/build-push-action@v6
           attempt_limit: 3
-          attempt_delay: 5000
+          attempt_delay: 30
           with: |
             push: false # set to false for testing
             no-cache: true
diff --git a/.gitignore b/.gitignore
index 203191f..4290a99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ config.codekit
 
 id_rsa
 id_rsa.pub
+
+.claude/settings.local.json
diff --git a/Dockerfile b/Dockerfile
index 9f60a30..973f118 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -121,10 +121,10 @@ RUN gem install compass
 
 ## Ansible, awscli, other Python tools ##
 
-COPY requirements.txt /tmp/requirements.txt 
-RUN python3 -m pip -V && \
-    python3 -m pip install -r /tmp/requirements.txt
-#RUN pip3 install --upgrade pip && pip3 --no-cache-dir install -r /tmp/requirements.txt
+COPY requirements.txt /tmp/requirements.txt
+RUN PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip -V && \
+    PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install --upgrade pip && \
+    PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install -r /tmp/requirements.txt
 
 ## Composer ##
 ARG COMPOSER_VERSION 1
@@ -197,7 +197,7 @@ ENV PATH="/custom-scripts:${PATH}"
 # Create SSH directory
 # SSH keys for deploys or auth are set in entrypoint.sh
 
-RUN mkdir /root/.ssh && \
+RUN mkdir -p /root/.ssh && \
     chmod 700 /root/.ssh
 
 # force CI jobs to source root's .bashrc, which will enable NVM
diff --git a/build/install-node.sh b/build/install-node.sh
index 6a26dc8..f19ab43 100644
--- a/build/install-node.sh
+++ b/build/install-node.sh
@@ -29,10 +29,16 @@ npm install -g \
     bower \
     yarn \
     lighthouse@~10.4 \
-    serverless \
     firebase-tools \
     cypress@~13.1
 
+# TEMP FIX for issues with installing node 16
+# will be addressed in an upcoming version update
+if [[ "${NODE_VERSION}" != "16" ]];
+then
+  npm install -g serverless
+fi
+
 npm cache clean --force
 
 echo "node ${NODE_VERSION} build completed..."
diff --git a/requirements.txt b/requirements.txt
index a747fa9..8f619c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,5 +6,5 @@ yq
 python-gitlab
 awesome-codename
 cryptography
-ansible-core==2.17.6
+ansible-core==2.15.13
 dnspython