diff --git a/fabric8-java-crd-yaml-generator-demo/src/test/java/io/fabric8/java/crd/generator/BookGeneratedYamlDeserializeTest.java b/fabric8-java-crd-yaml-generator-demo/src/test/java/io/fabric8/java/crd/generator/BookGeneratedYamlDeserializeTest.java
index d6d6246..537869b 100644
--- a/fabric8-java-crd-yaml-generator-demo/src/test/java/io/fabric8/java/crd/generator/BookGeneratedYamlDeserializeTest.java
+++ b/fabric8-java-crd-yaml-generator-demo/src/test/java/io/fabric8/java/crd/generator/BookGeneratedYamlDeserializeTest.java
@@ -3,7 +3,7 @@
 import io.fabric8.demo.crd.v1alpha1.Book;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion;
-import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -15,9 +15,10 @@ class BookGeneratedYamlDeserializeTest {
   void generatedManifestShouldBeDeserializable() {
     // Given
     Book book = new Book();
+    KubernetesSerialization kubernetesSerialization = new KubernetesSerialization();
 
     // When
-    CustomResourceDefinition crd = Serialization.unmarshal(getClass().getResourceAsStream("/META-INF/fabric8/books.testing.fabric8.io-v1.yml"));
+    CustomResourceDefinition crd = kubernetesSerialization.unmarshal(getClass().getResourceAsStream("/META-INF/fabric8/books.testing.fabric8.io-v1.yml"));
 
     // Then
     assertNotNull(crd);
diff --git a/kubernetes-client-demo-parent/pom.xml b/kubernetes-client-demo-parent/pom.xml
index 1b5b5bf..76d9cc2 100644
--- a/kubernetes-client-demo-parent/pom.xml
+++ b/kubernetes-client-demo-parent/pom.xml
@@ -17,7 +17,7 @@
     <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
     <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
     <junit.version>5.9.1</junit.version>
-    <fabric8.version>6.9.0</fabric8.version>
+    <fabric8.version>6.9.1</fabric8.version>
   </properties>
 
   <modules>
diff --git a/writing-tests-with-fabric8/src/main/java/io/fabric8/demos/tests/mockserver/PodGroupService.java b/writing-tests-with-fabric8/src/main/java/io/fabric8/demos/tests/mockserver/PodGroupService.java
index 2ce2f10..db96da7 100644
--- a/writing-tests-with-fabric8/src/main/java/io/fabric8/demos/tests/mockserver/PodGroupService.java
+++ b/writing-tests-with-fabric8/src/main/java/io/fabric8/demos/tests/mockserver/PodGroupService.java
@@ -35,7 +35,7 @@ public void addToGroup(Pod newPod) {
     newLabels.putAll(matchLabels);
 
     newPod.getMetadata().setLabels(newLabels);
-    kubernetesClient.pods().resource(newPod).createOrReplace();
+    kubernetesClient.pods().resource(newPod).serverSideApply();
   }
 
   public List<StatusDetails> delete() {