diff --git a/roles/aws_efs_config/tasks/main.yml b/roles/aws_efs_config/tasks/main.yml
index 33ab2aa..df8ca09 100644
--- a/roles/aws_efs_config/tasks/main.yml
+++ b/roles/aws_efs_config/tasks/main.yml
@@ -5,7 +5,6 @@
     state: directory
     path: "{{ atl_shared_mountpoint }}"
     mode: 0755
-  when: atl_product_edition!= "crowd"
 
 - name: Enable mountpoint in fstab
   mount:
@@ -14,4 +13,3 @@
     fstype: efs
     opts: "defaults,_netdev"
     state: mounted
-  when: atl_product_edition!= "crowd"
diff --git a/roles/crowd_config/defaults/main.yml b/roles/crowd_config/defaults/main.yml
index 641d4d7..3de162a 100644
--- a/roles/crowd_config/defaults/main.yml
+++ b/roles/crowd_config/defaults/main.yml
@@ -19,7 +19,7 @@ atl_tomcat_minsparethreads: "10"
 atl_tomcat_port: "8080"
 atl_tomcat_redirectport: "8443"
 atl_tomcat_secure: "true"
-atl_tomcat_scheme: "https"
+atl_tomcat_scheme: "http"
 atl_proxy_port: "443"
 atl_tomcat_protocol: "HTTP/1.1"
 atl_tomcat_contextpath: ""
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index 650e313..37ae45c 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -1,12 +1,5 @@
 ---
 
-
-- name: Create database config
-  template:
-    src: dbconfig.xml.j2
-    dest: "{{ atl_product_home }}/dbconfig.xml"
-    owner: "{{ atl_product_user }}"
-
 - name: Create cluster config
   template:
     src: cluster.properties.j2
diff --git a/roles/crowd_config/templates/dbconfig.xml.j2 b/roles/crowd_config/templates/dbconfig.xml.j2
deleted file mode 100644
index 1b96cef..0000000
--- a/roles/crowd_config/templates/dbconfig.xml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<crowd-database-config>
-  <name>defaultDS</name>
-  <delegator-name>default</delegator-name>
-  <database-type>postgres72</database-type>
-  <schema-name>public</schema-name>
-  <jdbc-datasource>
-    <url>{{ atl_jdbc_url }}</url>
-    <username>{{ atl_jdbc_user }}</username>
-    <password>{{ atl_jdbc_password }}</password>
-    <driver-class>{{ atl_db_driver }}</driver-class>
-
-    <pool-min-size>{{ atl_db_poolminsize }}</pool-min-size>
-    <pool-max-size>{{ atl_db_poolmaxsize }}</pool-max-size>
-    <pool-min-idle>{{ atl_db_minidle }}</pool-min-idle>
-    <pool-max-idle>{{ atl_db_maxidle }}</pool-max-idle>
-
-    <pool-max-wait>{{ atl_db_maxwaitmillis }}</pool-max-wait>
-    <validation-query>select 1</validation-query>
-    <time-between-eviction-runs-millis>{{ atl_db_timebetweenevictionrunsmillis }}</time-between-eviction-runs-millis>
-    <min-evictable-idle-time-millis>{{ atl_db_minevictableidletimemillis }}</min-evictable-idle-time-millis>
-    <pool-remove-abandoned>{{ atl_db_removeabandoned }}</pool-remove-abandoned>
-    <pool-remove-abandoned-timeout>{{ atl_db_removeabandonedtimeout }}</pool-remove-abandoned-timeout>
-    <pool-test-while-idle>{{ atl_db_testwhileidle }}</pool-test-while-idle>
-    <pool-test-on-borrow>{{ atl_db_testonborrow }}</pool-test-on-borrow>
-  </jdbc-datasource>
-</crowd-database-config>