diff --git a/README.md b/README.md
index b29e3bc..20ec6b4 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ For more information take a look at
 * Required: false
 * Default: true
 * Description: Whether this is an enterprise version of Alfresco. In a community version Transform Service Router, 
-Transform Service Shared File Storage, Clustering (replica count should always have a max of 1 for ACS pods), MQ and 
+Transform Service Shared File Storage, Clustering (replica count should always have a max of 1 for ACS pods) and 
 Digital Workspace are disabled. 
 
 #### `general.hibernate`
diff --git a/xenit-alfresco/templates/acs/acs-config.yaml b/xenit-alfresco/templates/acs/acs-config.yaml
index fd58a29..086dd0d 100644
--- a/xenit-alfresco/templates/acs/acs-config.yaml
+++ b/xenit-alfresco/templates/acs/acs-config.yaml
@@ -29,8 +29,6 @@ data:
   {{- end }}
   {{- if not (.Values.general.enterprise) }}
   GLOBAL_local.transform.service.enabled: 'true'
-  GLOBAL_messaging.subsystem.autoStart: 'false'
-  GLOBAL_repo.event2.enabled: 'false'
   {{- end}}
   {{- if .Values.transformServices.enabled }}
   GLOBAL_transform.service.enabled: 'true'
diff --git a/xenit-alfresco/templates/active-mq/mq-config.yaml b/xenit-alfresco/templates/active-mq/mq-config.yaml
index 117449e..58f24f1 100644
--- a/xenit-alfresco/templates/active-mq/mq-config.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-config.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
+{{- if .Values.mq.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/xenit-alfresco/templates/active-mq/mq-deployment.yaml b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
index 3786696..c923c89 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployment.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
+{{- if .Values.mq.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/xenit-alfresco/templates/active-mq/mq-secret.yaml b/xenit-alfresco/templates/active-mq/mq-secret.yaml
index 4a9f702..8a33454 100644
--- a/xenit-alfresco/templates/active-mq/mq-secret.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-secret.yaml
@@ -1,4 +1,4 @@
-{{- if  and (not .Values.general.secrets.mq.selfManaged) (.Values.mq.enabled) (.Values.general.enterprise) }}
+{{- if  and (not .Values.general.secrets.mq.selfManaged) (.Values.mq.enabled) }}
 {{- $secret_name := "mq-secret" }}
 
 apiVersion: v1
diff --git a/xenit-alfresco/templates/active-mq/mq-service.yaml b/xenit-alfresco/templates/active-mq/mq-service.yaml
index 4d71321..711af5a 100644
--- a/xenit-alfresco/templates/active-mq/mq-service.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
+{{- if .Values.mq.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/xenit-alfresco/templates/active-mq/network-policy.yml b/xenit-alfresco/templates/active-mq/network-policy.yml
index 2efe1fe..87ea296 100644
--- a/xenit-alfresco/templates/active-mq/network-policy.yml
+++ b/xenit-alfresco/templates/active-mq/network-policy.yml
@@ -1,4 +1,4 @@
-{{- if and (.Values.general.networkPolicies.enabled) (.Values.mq.enabled) (.Values.general.enterprise) }}
+{{- if and (.Values.general.networkPolicies.enabled) (.Values.mq.enabled) }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy