diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c5c6e8580..01f7bcca0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -16,7 +16,8 @@ common_params:
     # - '6.3'
     # - '6.4'
     # - '6.5'
-    - '6.6'
+    # - '6.6'
+    - '6.8.1'
 
 steps:
   #
diff --git a/docker-compose.yml b/docker-compose.yml
index 40d69315c..36ec40e89 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,8 @@ services:
         build:
             context: .
             dockerfile: wordpress.Dockerfile
+            args:
+                WORDPRESS_VERSION: ${WORDPRESS_VERSION:-latest}
         container_name: 'wordpress'
         ports:
             - '80:80'
diff --git a/scripts/setup-test-site.sh b/scripts/setup-test-site.sh
index 25dba48e7..7db40e48f 100755
--- a/scripts/setup-test-site.sh
+++ b/scripts/setup-test-site.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-# This script sets up a WordPress test site on the `wordpress` docker image. 
+# This script sets up a WordPress test site on the `wordpress` docker image.
 # You might wonder "why not do this work once, then just import the database for each run?"
 # We do each step each time for each build because we're trying to get a "mint" condition site
 # for each WordPress version – if there are issues with DB migrations, different default themes
@@ -19,7 +19,7 @@ tries=0
 while true; do
 
 	code=0
-	wp db check || code=$?
+	wp db check --skip-ssl || code=$?
 
 	if [ $code == 0 ]; then
 		echo 'Database Ready'
@@ -169,5 +169,4 @@ wp option update timezone_string "America/New_York"
 
 cp -rp wp-content/plugins wp-content/plugins-backup
 
-wp db export --add-drop-table wp-content/dump.sql
-
+wp db export --skip-ssl --add-drop-table wp-content/dump.sql
diff --git a/wordpress.Dockerfile b/wordpress.Dockerfile
index c4b4c07b7..b622853ce 100644
--- a/wordpress.Dockerfile
+++ b/wordpress.Dockerfile
@@ -1,11 +1,13 @@
-FROM public.ecr.aws/docker/library/wordpress:${WORDPRESS_VERSION:-latest}
+ARG WORDPRESS_VERSION="latest"
+
+FROM public.ecr.aws/docker/library/wordpress:${WORDPRESS_VERSION}
 
 RUN apt-get update  \
   && apt-get install -y wget gpg
 
 # https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/generic-linux-install.html
 # To use the Corretto Apt repositories on Debian-based systems, such as Ubuntu, import the \
-# Corretto public key and then add the repository to the system list by using the following commands: 
+# Corretto public key and then add the repository to the system list by using the following commands:
 RUN wget -O - https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg && \
   echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list