diff --git a/.github/workflows/pull-request-tests.yml b/.github/workflows/pull-request-tests.yml
index 77d8e59..59404bc 100644
--- a/.github/workflows/pull-request-tests.yml
+++ b/.github/workflows/pull-request-tests.yml
@@ -57,8 +57,12 @@ jobs:
           cp -av ${{ github.workspace }}/.mvn/filters/*.txt ${{ steps.find-home.outputs.home }}/.m2/repository/.remoteRepositoryFilters/
 
       - name: Run Maven Build and Verify
+        # Note: This also builds a container image to ensure image building
+        #  continues to work, but does not push it to any registry
         run: >-
           ./mvnw
           --batch-mode
           clean
           verify
+          -Dquarkus.container-image.build=true
+          -Dquarkus.container-image.push=false
diff --git a/parent/pom.xml b/parent/pom.xml
index 6463f1d..0a632bd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -67,15 +67,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <maven.compiler.release>21</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
 
     <!-- Maven site skin version (can't include dots in name) -->
     <maven-fluido-skin-version>2.0.0-M8</maven-fluido-skin-version>
 
     <!-- Requirements -->
-    <requirements.java-version>[21,)</requirements.java-version>
+    <requirements.java-version>[17,)</requirements.java-version>
     <requirements.maven-version>[3.9.2,)</requirements.maven-version>
 
     <!-- Support Quarkus knowing about multimodule project -->
@@ -327,6 +325,13 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>${version.maven-failsafe-plugin}</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.manager>
+                org.jboss.logmanager.LogManager
+              </java.util.logging.manager>
+            </systemPropertyVariables>
+          </configuration>
           <executions>
             <execution>
               <id>default-integration-test</id>
@@ -427,6 +432,11 @@
                 <excludes>
                   <exclude>**/*IntegrationTest.java</exclude>
                 </excludes>
+                <systemPropertyVariables>
+                  <java.util.logging.manager>
+                    org.jboss.logmanager.LogManager
+                  </java.util.logging.manager>
+                </systemPropertyVariables>
               </configuration>
             </execution>
           </executions>
@@ -569,12 +579,16 @@
               <mutator>STRONGER</mutator>
             </mutators>
 
+            <jvmArgs>
+              <jvmArg>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</jvmArg>
+            </jvmArgs>
+
             <!--
               Ensure a minimum mutation threshold percentage (line threshold
               will be checked by JaCoCo)
             -->
             <!-- TODO: Increase this percentage as tests cover additional code -->
-            <mutationThreshold>40</mutationThreshold>
+            <mutationThreshold>35</mutationThreshold>
 
             <!--
               Unless overridden by a Maven profile (below), do not include
diff --git a/rest-client/src/main/java/com/fwmotion/threescale/cms/ThreescaleCmsClientImpl.java b/rest-client/src/main/java/com/fwmotion/threescale/cms/ThreescaleCmsClientImpl.java
index 26ce5af..7c54f1a 100644
--- a/rest-client/src/main/java/com/fwmotion/threescale/cms/ThreescaleCmsClientImpl.java
+++ b/rest-client/src/main/java/com/fwmotion/threescale/cms/ThreescaleCmsClientImpl.java
@@ -192,6 +192,7 @@ public void save(@Nonnull CmsFile file, @Nullable File fileContent) throws ApiEx
 
     @Override
     public void save(@Nonnull CmsTemplate template, @Nullable File templateDraft) throws ApiException {
+        /* When upgraded to JDK21:
         switch (template) {
             case CmsBuiltinPage cmsBuiltinPage -> saveBuiltinPage(cmsBuiltinPage, templateDraft);
             case CmsBuiltinPartial cmsBuiltinPartial -> saveBuiltinPartial(cmsBuiltinPartial, templateDraft);
@@ -200,6 +201,20 @@ public void save(@Nonnull CmsTemplate template, @Nullable File templateDraft) th
             case CmsPartial cmsPartial -> savePartial(cmsPartial, templateDraft);
             default -> throw new UnsupportedOperationException("Unknown template type: " + template.getClass().getName());
         }
+        */
+        if (template instanceof CmsBuiltinPage cmsBuiltinPage) {
+            saveBuiltinPage(cmsBuiltinPage, templateDraft);
+        } else if (template instanceof CmsBuiltinPartial cmsBuiltinPartial) {
+            saveBuiltinPartial(cmsBuiltinPartial, templateDraft);
+        } else if (template instanceof CmsLayout cmsLayout) {
+            saveLayout(cmsLayout, templateDraft);
+        } else if (template instanceof CmsPage cmsPage) {
+            savePage(cmsPage, templateDraft);
+        } else if (template instanceof CmsPartial cmsPartial) {
+            savePartial(cmsPartial, templateDraft);
+        } else {
+            throw new UnsupportedOperationException("Unknown template type: " + template.getClass().getName());
+        }
     }
 
     private void saveBuiltinPage(@Nonnull CmsBuiltinPage page, @Nullable File templateDraft) throws ApiException {
diff --git a/rest-client/src/main/java/com/fwmotion/threescale/cms/mappers/CmsTemplateMapper.java b/rest-client/src/main/java/com/fwmotion/threescale/cms/mappers/CmsTemplateMapper.java
index 90df2e9..8906c07 100644
--- a/rest-client/src/main/java/com/fwmotion/threescale/cms/mappers/CmsTemplateMapper.java
+++ b/rest-client/src/main/java/com/fwmotion/threescale/cms/mappers/CmsTemplateMapper.java
@@ -83,6 +83,7 @@ public interface CmsTemplateMapper {
     TemplateUpdatableFields toRestPartialUpdate(CmsPartial partial);
 
     default CmsTemplate fromRest(Template template) {
+        /* When upgraded to JDK21:
         return switch (template) {
             case null -> null;
 
@@ -94,6 +95,22 @@ default CmsTemplate fromRest(Template template) {
 
             default -> throw new UnsupportedOperationException("Unknown template type: " + template.getClass().getName());
         };
+        */
+        if (template == null) {
+            return null;
+        } else if (template instanceof BuiltinPage builtinPage) {
+            return fromRestBuiltinPage(builtinPage);
+        } else if (template instanceof BuiltinPartial builtinPartial) {
+            return fromRestBuiltinPartial(builtinPartial);
+        } else if (template instanceof Layout layout) {
+            return fromRestLayout(layout);
+        } else if (template instanceof Page page) {
+            return fromRestPage(page);
+        } else if (template instanceof Partial partial) {
+            return fromRestPartial(partial);
+        } else {
+            throw new UnsupportedOperationException("Unknown template type: " + template.getClass().getName());
+        }
     }
 
     default String mapHandlerFromRest(EnumHandler handler) {