diff --git a/.github/workflows/publish-e2e-test-suites-docker-image.yaml b/.github/workflows/publish-e2e-test-suites-docker-image.yaml
index ca41ad8..3d740e8 100644
--- a/.github/workflows/publish-e2e-test-suites-docker-image.yaml
+++ b/.github/workflows/publish-e2e-test-suites-docker-image.yaml
@@ -1,5 +1,5 @@
 name: Publish E2E Test Suites
-run-name: ${{ format('Publish {0} E2E Test Suites {1}', inputs.release_type) }}
+run-name: ${{ format('Publish E2E Test Suites{0} {1} Release', ':', inputs.release_type) }}
 on:
   workflow_dispatch:
     inputs:
@@ -18,10 +18,12 @@ on:
 
 jobs:
   Image:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@v2.2.1
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@v2.4.1-pre
     with:
       release_type: ${{ inputs.release_type }}
       version_number_input: ${{ inputs.version_number_input }}
       cloud_provider: 'default'
+      java_version: '17'
       force_release: 'yes'
+      skip_tests: true
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/validate-image.yaml b/.github/workflows/validate-image.yaml
index 3294602..326e955 100644
--- a/.github/workflows/validate-image.yaml
+++ b/.github/workflows/validate-image.yaml
@@ -16,25 +16,31 @@ on:
 
 jobs:
   build-publish-docker-default:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.0
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.4.1-pre
     with: 
       failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
       fail_on_error: ${{ inputs.fail_on_error || true }}
       cloud_provider: 'default'
+      java_version: '17'
+      skip_tests: true
     secrets: inherit
   build-publish-docker-aws:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.0
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.4.1-pre
     with: 
       failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
       fail_on_error: ${{ inputs.fail_on_error || true }}
       cloud_provider: 'aws'
+      java_version: '17'
+      skip_tests: true
     secrets: inherit
     needs: [build-publish-docker-default]
   build-publish-docker-gcp:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.0
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.4.1-pre
     with: 
       failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
       fail_on_error: ${{ inputs.fail_on_error || true }}
       cloud_provider: 'gcp'
+      java_version: '17'
+      skip_tests: true
     secrets: inherit
     needs: [build-publish-docker-aws]
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index ffab8e3..da599bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ######################
 # Build dependencies #
 ######################
-FROM maven:3.9.1-eclipse-temurin-17
+FROM maven:3.9.5-eclipse-temurin-17
 
 WORKDIR /app
 
@@ -26,15 +26,10 @@ ENV UID2_E2E_PIPELINE_OPERATOR_URL ""
 ENV UID2_E2E_PIPELINE_OPERATOR_TYPE ""
 ENV UID2_E2E_PIPELINE_OPERATOR_CLOUD_PROVIDER ""
 
-# TODO: UID2-988 - Delete LOCAL_PUBLIC case after optout is integrated into local dev env
 CMD \
-  if [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "LOCAL_PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PRIVATE" ] ; \
+  if [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PRIVATE" ] ; \
   then \
     echo "ERROR: Incorrect operator type: $UID2_E2E_PIPELINE_OPERATOR_TYPE" ; \
-  elif [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" = "LOCAL_PUBLIC" ] ; \
-  then \
-    export UID2_E2E_PIPELINE_OPERATOR_TYPE="PUBLIC" ; \
-    mvn test -Dtest="E2ELocalPublicOperatorTestSuite" ; \
   elif [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" = "PUBLIC" ] ; \
   then \
     mvn test -Dtest="E2EPublicOperatorTestSuite" ; \
diff --git a/version.json b/version.json
new file mode 100644
index 0000000..878213e
--- /dev/null
+++ b/version.json
@@ -0,0 +1 @@
+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.32", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }