diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15af9a..1e7bdf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,3 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [XM2C-30] 
 * added checksum of configmap and secrets for deployment for **Automatically Roll Deployments**
 * changed mq default strategy from RollingUpdate to Recreate because of conflict in updating 
+
+[XM2C-54]
+* Rename all `image.repository` properties to `image`
+* Rename all `image.pullPolicy` properties to `imagePullPolicy`
diff --git a/README.md b/README.md
index 94d872d..f9057dc 100644
--- a/README.md
+++ b/README.md
@@ -246,13 +246,13 @@ For more information take a look at
 * Default: `2`
 * Description: The number of pods that will be running
 
-#### `acs.image.repository`
+#### `acs.image`
 
 * Required: true
 * Default: xenit/alfresco-repository-community:7.2.0
 * Description: The repository of the docker image that will be used
 
-#### `acs.image.pullPolicy`
+#### `acs.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -418,13 +418,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `digitalWorkspace.image.repository`
+#### `digitalWorkspace.image`
 
 * Required: true
 * Default: `quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw`
 * Description: The repository of the docker image that will be used
 
-#### `digitalWorkspace.image.pullPolicy`
+#### `digitalWorkspace.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -501,13 +501,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `share.image.repository`
+#### `share.image`
 
 * Required: true
 * Default: `xenit/alfresco-share-community:7.0`
 * Description: The repository of the docker image that will be used
 
-#### `share.image.pullPolicy`
+#### `share.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -592,13 +592,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `mq.image.repository`
+#### `mq.image`
 
 * Required: true
 * Default: `alfresco/alfresco-activemq:5.16.1`
 * Description: The repository of the docker image that will be used
 
-#### `mq.image.pullPolicy`
+#### `mq.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -669,13 +669,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `postgresql.image.repository`
+#### `postgresql.image`
 
 * Required: true
 * Default: `docker.io/xenit/postgres:9.6.23`
 * Description: The repository of the docker image that will be used
 
-#### `postgresql.image.pullPolicy`
+#### `postgresql.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -746,13 +746,13 @@ For more information take a look at
 * Default: `2`
 * Description: The number of pods that will be running
 
-#### `solr.image.repository`
+#### `solr.image`
 
 * Required: true
 * Default: `hub.xenit.eu/alfresco-enterprise/alfresco-solr6:2.0.2`
 * Description: The repository of the docker image that will be used
 
-#### `solr.image.pullPolicy`
+#### `solr.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -825,13 +825,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `transformServices.sharedFileStore.image.repository`
+#### `transformServices.sharedFileStore.image`
 
 * Required: true
 * Default: `quay.io/alfresco/alfresco-shared-file-store:0.16.0`
 * Description: The repository of the docker image that will be used
 
-#### `transformServices.sharedFileStore.image.pullPolicy`
+#### `transformServices.sharedFileStore.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -896,13 +896,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `transformServices.transformCoreAio.image.repository`
+#### `transformServices.transformCoreAio.image`
 
 * Required: true
 * Default: `alfresco/alfresco-transform-core-aio`
 * Description: The repository of the docker image that will be used
 
-#### `transformServices.transformCoreAio.image.pullPolicy`
+#### `transformServices.transformCoreAio.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -967,13 +967,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `transformServices.transformRouter.image.repository`
+#### `transformServices.transformRouter.image`
 
 * Required: true
 * Default: `quay.io/alfresco/alfresco-transform-router:1.5.2`
 * Description: The repository of the docker image that will be used
 
-#### `transformServices.transformRouter.image.pullPolicy`
+#### `transformServices.transformRouter.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -1044,13 +1044,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `syncService.image.repository`
+#### `syncService.image`
 
 * Required: true
 * Default: `quay.io/alfresco/service-sync:3.4.0`
 * Description: The repository of the docker image that will be used
 
-#### `syncService.image.pullPolicy`
+#### `syncService.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
@@ -1121,13 +1121,13 @@ For more information take a look at
 * Default: `1`
 * Description: The number of pods that will be running
 
-#### `ooi.image.repository`
+#### `ooi.image`
 
 * Required: false
 * Default: `quay.io/alfresco/alfresco-ooi-service:1.1.2`
 * Description: The repository of the docker image that will be used
 
-#### `ooi.image.pullPolicy`
+#### `ooi.imagePullPolicy`
 
 * Required: false
 * Default: `IfNotPresent`
diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
index 03eaf60..b4e425c 100644
--- a/xenit-alfresco/templates/acs/acs-deployment.yaml
+++ b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -35,8 +35,8 @@ spec:
       {{- end }}
       containers:
       - name: acs-container
-        image: {{ required "An image for the ACS pod needs to be specified under acs.image.repository" .Values.acs.image.repository }}
-        imagePullPolicy: {{ .Values.acs.image.pullPolicy | default "IfNotPresent" }}
+        image: {{ required "An image for the ACS pod needs to be specified under acs.image" .Values.acs.image }}
+        imagePullPolicy: {{ .Values.acs.imagePullPolicy | default "IfNotPresent" }}
         readinessProbe:
           failureThreshold: {{ .Values.acs.readinessProbe.failureThreshold }}
           httpGet:
diff --git a/xenit-alfresco/templates/active-mq/mq-deployement.yaml b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
index 38bfbcd..2f6a4b4 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployement.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
@@ -34,8 +34,8 @@ spec:
     spec:
       containers:
         - name: activemq
-          image: {{ .Values.mq.image.repository }}
-          imagePullPolicy: {{ .Values.mq.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.mq.image }}
+          imagePullPolicy: {{ .Values.mq.imagePullPolicy | default "IfNotPresent" }}
           envFrom:
             - configMapRef:
                 name: mq-configmap
diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
index 4b5bfe4..ab46e56 100644
--- a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
+++ b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -33,8 +33,8 @@ spec:
     spec:
       containers:
         - name: digital-workspace-container
-          image: {{ .Values.digitalWorkspace.image.repository }}
-          imagePullPolicy: {{ .Values.digitalWorkspace.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.digitalWorkspace.image }}
+          imagePullPolicy: {{ .Values.digitalWorkspace.imagePullPolicy | default "IfNotPresent" }}
           livenessProbe:
             failureThreshold: 4
             httpGet:
diff --git a/xenit-alfresco/templates/ooi/ooi-deployment.yaml b/xenit-alfresco/templates/ooi/ooi-deployment.yaml
index 63771d9..47009ba 100644
--- a/xenit-alfresco/templates/ooi/ooi-deployment.yaml
+++ b/xenit-alfresco/templates/ooi/ooi-deployment.yaml
@@ -32,8 +32,8 @@ spec:
     spec:
       containers:
         - name: ooi-container
-          image: {{ .Values.ooi.image.repository }}
-          imagePullPolicy: {{ .Values.ooi.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.ooi.image }}
+          imagePullPolicy: {{ .Values.ooi.imagePullPolicy | default "IfNotPresent" }}
           livenessProbe:
             tcpSocket:
               port: 9095
diff --git a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
index a6932ab..04ea274 100644
--- a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
+++ b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
@@ -35,8 +35,8 @@ spec:
     spec:
       containers:
       - name: postgresql-container
-        image: {{ .Values.postgresql.image.repository }}
-        imagePullPolicy: {{ .Values.postgresql.image.pullPolicy | default "IfNotPresent" }}
+        image: {{ .Values.postgresql.image }}
+        imagePullPolicy: {{ .Values.postgresql.imagePullPolicy | default "IfNotPresent" }}
         envFrom:
           - configMapRef:
               name: postgresql-configmap
diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
index 4f79867..c7e9b79 100644
--- a/xenit-alfresco/templates/share/share-deployment.yaml
+++ b/xenit-alfresco/templates/share/share-deployment.yaml
@@ -33,8 +33,8 @@ spec:
     spec:
       containers:
       - name: share-container
-        image: {{ .Values.share.image.repository }}
-        imagePullPolicy: {{ .Values.share.image.pullPolicy | default "IfNotPresent" }}
+        image: {{ .Values.share.image }}
+        imagePullPolicy: {{ .Values.share.imagePullPolicy | default "IfNotPresent" }}
         lifecycle:
           preStop:
             exec:
diff --git a/xenit-alfresco/templates/solr/solr-stateful-set.yaml b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
index c2bf35c..99b228c 100644
--- a/xenit-alfresco/templates/solr/solr-stateful-set.yaml
+++ b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
@@ -30,8 +30,8 @@ spec:
     spec:
       containers:
       - name: solr-container
-        image: {{ .Values.solr.image.repository }}
-        imagePullPolicy: {{ .Values.solr.image.pullPolicy | default "IfNotPresent" }}
+        image: {{ .Values.solr.image }}
+        imagePullPolicy: {{ .Values.solr.imagePullPolicy | default "IfNotPresent" }}
         lifecycle:
           postStart:
             exec:
diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
index 8dcb2e1..04afd9d 100644
--- a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
+++ b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
@@ -35,8 +35,8 @@ spec:
     spec:
       containers:
         - name: sync-service-container
-          image: {{ .Values.syncService.image.repository }}
-          imagePullPolicy: {{ .Values.syncService.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.syncService.image }}
+          imagePullPolicy: {{ .Values.syncService.imagePullPolicy | default "IfNotPresent" }}
           livenessProbe:
             failureThreshold: 3
             httpGet:
diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
index 7bc13b4..9e7fdbe 100644
--- a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
@@ -33,8 +33,8 @@ spec:
     spec:
       containers:
         - name: shared-file-store-container
-          image: {{ .Values.transformServices.sharedFileStore.image.repository }}
-          imagePullPolicy: {{ .Values.transformServices.sharedFileStore.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.transformServices.sharedFileStore.image }}
+          imagePullPolicy: {{ .Values.transformServices.sharedFileStore.imagePullPolicy | default "IfNotPresent" }}
           envFrom:
             - configMapRef:
                 name: shared-file-store-configmap
diff --git a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
index d5f63c9..004eea4 100644
--- a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
@@ -33,8 +33,8 @@ spec:
     spec:
       containers:
         - name: transform-core-aio-container
-          image: {{ .Values.transformServices.transformCoreAio.image.repository }}
-          imagePullPolicy: {{ .Values.transformServices.transformCoreAio.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.transformServices.transformCoreAio.image }}
+          imagePullPolicy: {{ .Values.transformServices.transformCoreAio.imagePullPolicy | default "IfNotPresent" }}
           envFrom:
             - configMapRef:
                 name: transform-core-aio-configmap
diff --git a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
index 3414925..e311f45 100644
--- a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
@@ -33,8 +33,8 @@ spec:
     spec:
       containers:
         - name: transform-router-container
-          image: {{ .Values.transformServices.transformRouter.image.repository }}
-          imagePullPolicy: {{ .Values.transformServices.transformRouter.image.pullPolicy | default "IfNotPresent" }}
+          image: {{ .Values.transformServices.transformRouter.image }}
+          imagePullPolicy: {{ .Values.transformServices.transformRouter.imagePullPolicy | default "IfNotPresent" }}
           livenessProbe:
             failureThreshold: 1
             httpGet:
diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
index f9d3ca5..b9dcd0c 100644
--- a/xenit-alfresco/values.yaml
+++ b/xenit-alfresco/values.yaml
@@ -26,8 +26,7 @@ ingress:
 
 acs:
   replicaCount: 1
-  image:
-    repository: 'xenit/alfresco-repository-community:7.2.0'
+  image: 'xenit/alfresco-repository-community:7.2.0'
   strategy:
     type: RollingUpdate
   resources:
@@ -54,8 +53,7 @@ acs:
 digitalWorkspace:
   enabled: true
   replicaCount: 1
-  image:
-    repository: 'quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw'
+  image: 'quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw'
   strategy:
     type: RollingUpdate
   resources:
@@ -67,8 +65,7 @@ digitalWorkspace:
 share:
   enabled: true
   replicaCount: 1
-  image:
-    repository: 'xenit/alfresco-share-community:7.0'
+  image: 'xenit/alfresco-share-community:7.0'
   strategy:
     type: RollingUpdate
   resources:
@@ -79,8 +76,7 @@ share:
 mq:
   enabled: true
   replicaCount: 1
-  image:
-    repository: 'alfresco/alfresco-activemq:5.16.1'
+  image: 'alfresco/alfresco-activemq:5.16.1'
   strategy:
     type: Recreate
   resources:
@@ -90,8 +86,7 @@ mq:
 
 postgresql:
   enabled: true
-  image:
-    repository: 'docker.io/xenit/postgres'
+  image: 'docker.io/xenit/postgres'
   strategy:
     type: RollingUpdate
   resources:
@@ -102,8 +97,7 @@ postgresql:
 solr:
   enabled: true
   replicaCount: 2
-  image:
-    repository: 'hub.xenit.eu/alfresco-enterprise/alfresco-solr6:2.0.2'
+  image: 'hub.xenit.eu/alfresco-enterprise/alfresco-solr6:2.0.2'
   strategy:
     type: RollingUpdate
   resources:
@@ -115,8 +109,7 @@ transformServices:
   enabled: true
   sharedFileStore:
     replicaCount: 1
-    image:
-      repository: 'quay.io/alfresco/alfresco-shared-file-store:0.16.0'
+    image: 'quay.io/alfresco/alfresco-shared-file-store:0.16.0'
     strategy:
       type: RollingUpdate
     resources:
@@ -125,8 +118,7 @@ transformServices:
         cpu: "200m"
   transformCoreAio:
     replicaCount: 1
-    image:
-      repository: 'alfresco/alfresco-transform-core-aio'
+    image: 'alfresco/alfresco-transform-core-aio'
     strategy:
       type: RollingUpdate
     resources:
@@ -135,8 +127,7 @@ transformServices:
         cpu: "150m"
   transformRouter:
     replicaCount: 1
-    image:
-      repository: 'quay.io/alfresco/alfresco-transform-router:1.5.2'
+    image: 'quay.io/alfresco/alfresco-transform-router:1.5.2'
     strategy:
       type: RollingUpdate
     resources:
@@ -147,8 +138,7 @@ transformServices:
 syncService:
   enabled: false
   replicaCount: 1
-  image:
-    repository: 'quay.io/alfresco/service-sync:3.4.0'
+  image: 'quay.io/alfresco/service-sync:3.4.0'
   strategy:
     type: RollingUpdate
   resources:
@@ -159,8 +149,7 @@ syncService:
 ooi:
   enabled: false
   replicaCount: 1
-  image:
-    repository: 'quay.io/alfresco/alfresco-ooi-service:1.1.2'
+  image: 'quay.io/alfresco/alfresco-ooi-service:1.1.2'
   strategy:
     type: RollingUpdate
   resources: