diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/mapper/ComponentMappingEntityMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/mapper/ComponentMappingEntityMapper.java
index e9c9e5788..a380d39fe 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/mapper/ComponentMappingEntityMapper.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/mapper/ComponentMappingEntityMapper.java
@@ -3,6 +3,8 @@ package com.iqser.red.service.persistence.management.v1.processor.mapper;
 import java.util.List;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.factory.Mappers;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.ComponentMappingEntity;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentMappingMetaData;
@@ -10,6 +12,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.component.C
 @Mapper
 public interface ComponentMappingEntityMapper {
 
+    ComponentMappingEntityMapper INSTANCE = Mappers.getMapper(ComponentMappingEntityMapper.class);
+
+
     ComponentMappingMetaData toComponentMappingMetaData(ComponentMappingEntity componentMappingMetaData);
 
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentMappingService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentMappingService.java
index 170fe41f9..df0f6fc63 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentMappingService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentMappingService.java
@@ -41,7 +41,7 @@ public class ComponentMappingService {
 
     ComponentMappingPersistenceService componentMappingPersistenceService;
     DossierTemplatePersistenceService dossierTemplatePersistenceService;
-    ComponentMappingEntityMapper mappingEntityMapper;
+    ComponentMappingEntityMapper mappingEntityMapper = ComponentMappingEntityMapper.INSTANCE;
 
     static CSVSorter CSV_SORTER = new CSVSorter();
 
diff --git a/publish-custom-image.sh b/publish-custom-image.sh
index c909eb8ef..82a74219f 100755
--- a/publish-custom-image.sh
+++ b/publish-custom-image.sh
@@ -22,17 +22,18 @@ if [ -z "$1" ]; then
 fi
 
 namespace=${1}
+deployment_name="persistence-service-v1"
 
 echo "deploying to ${namespace}"
 
-oldImageName=$(rancher kubectl -n ${namespace} get deployment persistence-service-v1 -o=jsonpath='{.spec.template.spec.containers[*].image}')
+oldImageName=$(rancher kubectl -n ${namespace} get deployment ${deployment_name} -o=jsonpath='{.spec.template.spec.containers[*].image}')
 
 if [ "${newImageName}" = "${oldImageName}" ]; then
     echo "Image tag did not change, redeploying..."
-    rancher kubectl rollout restart deployment persistence-service-v1 -n ${namespace}
+    rancher kubectl rollout restart deployment ${deployment_name} -n ${namespace}
 else
     echo "upgrading..."
-    rancher kubectl set image deployment/persistence-service-v1 persistence-service=${newImageName} -n ${namespace}
+    rancher kubectl set image deployment/${deployment_name} ${deployment_name}=${newImageName} -n ${namespace}
 fi
-rancher kubectl rollout status deployment persistence-service-v1 -n ${namespace}
+rancher kubectl rollout status deployment ${deployment_name} -n ${namespace}
 echo "Built ${dir} and deployed to ${namespace}"