diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application-default.yaml b/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application-default.yaml
new file mode 100644
index 00000000..729f6cc9
--- /dev/null
+++ b/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application-default.yaml
@@ -0,0 +1,2 @@
+queue:
+  engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.alfresco-pdf-renderer.acs}
\ No newline at end of file
diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application.properties b/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application.properties
deleted file mode 100644
index 5dde9b28..00000000
--- a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-queue.engineRequestQueue=${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.alfresco-pdf-renderer.acs}
\ No newline at end of file
diff --git a/alfresco-docker-imagemagick/src/main/resources/application-default.yaml b/alfresco-docker-imagemagick/src/main/resources/application-default.yaml
new file mode 100644
index 00000000..ef95de69
--- /dev/null
+++ b/alfresco-docker-imagemagick/src/main/resources/application-default.yaml
@@ -0,0 +1,2 @@
+queue:
+  engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.imagemagick.acs}
\ No newline at end of file
diff --git a/alfresco-docker-imagemagick/src/main/resources/application.properties b/alfresco-docker-imagemagick/src/main/resources/application.properties
deleted file mode 100644
index 858dc70f..00000000
--- a/alfresco-docker-imagemagick/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-queue.engineRequestQueue=${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.imagemagick.acs}
\ No newline at end of file
diff --git a/alfresco-docker-libreoffice/src/main/resources/application-default.yaml b/alfresco-docker-libreoffice/src/main/resources/application-default.yaml
new file mode 100644
index 00000000..ce4ca8b6
--- /dev/null
+++ b/alfresco-docker-libreoffice/src/main/resources/application-default.yaml
@@ -0,0 +1,2 @@
+queue:
+  engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs}
\ No newline at end of file
diff --git a/alfresco-docker-libreoffice/src/main/resources/application.properties b/alfresco-docker-libreoffice/src/main/resources/application.properties
deleted file mode 100644
index 321c56ed..00000000
--- a/alfresco-docker-libreoffice/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-queue.engineRequestQueue=${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs}
\ No newline at end of file
diff --git a/alfresco-docker-tika/src/main/resources/application-default.yaml b/alfresco-docker-tika/src/main/resources/application-default.yaml
new file mode 100644
index 00000000..473f77a2
--- /dev/null
+++ b/alfresco-docker-tika/src/main/resources/application-default.yaml
@@ -0,0 +1,2 @@
+queue:
+  engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.tika.acs}
\ No newline at end of file
diff --git a/alfresco-docker-tika/src/main/resources/application.properties b/alfresco-docker-tika/src/main/resources/application.properties
deleted file mode 100644
index 82f9c44e..00000000
--- a/alfresco-docker-tika/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-queue.engineRequestQueue=${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.tika.acs}
\ No newline at end of file
diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
index 67eee679..ae378a10 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
@@ -21,7 +21,6 @@
  */
 package org.alfresco.transformer;
 
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 import static org.alfresco.transformer.fs.FileManager.buildFile;
 import static org.alfresco.transformer.fs.FileManager.createTargetFileName;
 import static org.alfresco.transformer.fs.FileManager.deleteFile;
@@ -37,13 +36,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.client.model.TransformRequestValidator;
 import org.alfresco.transform.client.model.config.TransformConfig;
-import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transform.exceptions.TransformException;
+import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transformer.logging.LogEntry;
 import org.alfresco.transformer.model.FileRefResponse;
 import org.alfresco.util.TempFileProvider;
@@ -59,13 +57,15 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.DirectFieldBindingResult;
 import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.client.HttpClientErrorException;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * <p>Abstract Controller, provides structure and helper methods to sub-class transformer controllers.</p>
  *
@@ -117,8 +117,8 @@ public abstract class AbstractTransformerController implements TransformControll
             ClassPathResource classPathResource = new ClassPathResource(ENGINE_CONFIG);
             InputStream engineConfigFile = classPathResource.getInputStream();
 
-            TransformConfig transformConfig = objectMapper.setSerializationInclusion(NON_NULL)
-                .readValue(engineConfigFile, TransformConfig.class);
+            TransformConfig transformConfig = objectMapper.readValue(engineConfigFile,
+                TransformConfig.class);
             return new ResponseEntity<>(transformConfig, OK);
         }
         catch (IOException e)
diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml
index ffee2ab3..9fc75b27 100644
--- a/alfresco-transformer-base/src/main/resources/application.yaml
+++ b/alfresco-transformer-base/src/main/resources/application.yaml
@@ -10,6 +10,8 @@ spring:
     pool:
       enabled: true
       max-connections: 20
+  jackson:
+    default-property-inclusion: non_empty
 
 server:
   port: 8090