diff --git a/pom.xml b/pom.xml
index 178187e30b..63fd617e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,7 +464,7 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco.groupId>org.alfresco</alfresco.groupId>
       <alfresco.share.artifactId>share</alfresco.share.artifactId>
-      <alfresco-spring-webscripts.version>6.19</alfresco-spring-webscripts.version>
+      <alfresco-spring-webscripts.version>6.20</alfresco-spring-webscripts.version>
       <api.explorer.version>6.0.7-ga</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.version>0.0</alfresco.version>
diff --git a/rm-community/rm-community-repo/.env b/rm-community/rm-community-repo/.env
new file mode 100644
index 0000000000..1a971577f8
--- /dev/null
+++ b/rm-community/rm-community-repo/.env
@@ -0,0 +1,2 @@
+SOLR6_TAG=1.1.1
+POSTGRES_TAG=10.1
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/docker-compose.yml b/rm-community/rm-community-repo/docker-compose.yml
index 6d9d2c55eb..b5d3ab9117 100644
--- a/rm-community/rm-community-repo/docker-compose.yml
+++ b/rm-community/rm-community-repo/docker-compose.yml
@@ -26,6 +26,11 @@ services:
                 -Dftp.dataPortFrom=30000
                 -Dftp.dataPortTo=30099
                 -Dcifs.enabled=true
+                -Dcsrf.filter.enabled=false
+                -Dalfresco.host=localhost
+                -Dalfresco.port.ssl=80
+                -Dalfresco.protocol=http
+                -Dalfresco.port=8080
                 "
         ports:
             - 8080:8080
@@ -36,7 +41,7 @@ services:
             - "30000-30099:30000-30099"
 
     postgres:
-        image: library/postgres:10.1
+        image: library/postgres:${POSTGRES_TAG}
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -45,7 +50,7 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:1.1.1
+        image: alfresco/alfresco-search-services:${SOLR6_TAG}
         environment:
             #Solr needs to know how to register itself with Alfresco
             - SOLR_ALFRESCO_HOST=alfresco
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
index e6ed70983b..5de7ee766c 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java
@@ -46,8 +46,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.extensions.webscripts.GUID;
 
-import javax.xml.soap.Node;
-
 /**
  * Integration test for RM-4804
  *