diff --git a/ansible/playbooks/installExist.yml b/ansible/playbooks/installExist.yml
index 0f6e2de..2ee4e4f 100644
--- a/ansible/playbooks/installExist.yml
+++ b/ansible/playbooks/installExist.yml
@@ -14,18 +14,17 @@
 #    add inet.d startup
 #    change sudoer file
 #    sudoer changes
-#    change port to 80 or make firewall change
 #    memory settings
 #    WHAT ELSE?
 #
 - hosts: naked-existdb
   vars:
-    existSvnUrl: svn://svn.code.sf.net/p/exist/code/stable/eXist-2.0.x
+    existgitUrl: https://github.com/eXist-db/exist.git
     existDir: /usr/local/exist2.0.x
     existLn: /usr/local/existlatest
     existShLn: /usr/local/exist
-    #java_home: /usr/lib/jvm/java
-    existJettyPort: 80
+    java_home: /usr/lib/jvm/java-1.7.0-openjdk-amd64
+    existJettyPort: 8080
     jettyConfFile: /usr/local/existlatest/tools/jetty/etc/jetty.xml
     wrapperConfFile: /usr/local/existlatest/tools/wrapper/conf/wrapper.conf
     # MBytes
@@ -49,24 +48,31 @@
   - name: test
     debug: msg="test is successful"
     when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL'
+    
+  - name: add user svcexist
+    user: name=svcexist
       
   - name: install java-1.7.0-openjdk latest version
-    action: yum pkg=java-1.7.0-openjdk state=latest
-    
-  - name: set alternatives up for java 1.7 openJdk
-    action: script ../../bash/javaAlternatives.sh
+    apt: pkg=openjdk-7-jdk state=latest
     
   - name: install ant lastest version
-    action: yum pkg=ant state=latest
+    apt: pkg=ant state=latest
     when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL'
     
-  - name: install svn
-    action: yum pkg=svn state=present
+  - name: install git
+    apt: pkg=git-core state=present
     when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL'
     
-  - name: checkout exist-db from svn at ${existSvnUrl}
-    action: command svn checkout ${existSvnUrl} ${existDir}
-    when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL'
+  - git: repo={{ existgitUrl }}
+       dest={{ existDir }}
+       version=eXist-2.0.x
+    when: buildSuccess.stdout != 'BUILD SUCCESSFUL'
+    
+  - name: add missing directories
+    file: dest={{ item }} state=directory
+    with_items:
+      - {{ existDir }}/lib/extensions
+      - {{ existDir }}/extensions/modules/lib
     
   - name: build existdb with javac in this location ${existDir}
     action: script ../../bash/buildExistdb.sh ${existDir}
@@ -121,4 +127,4 @@
     
   - name: set the jetty wrapper port for http to ${existJettyPort}
     action: lineinfile backup="yes" dest="${jettyConfFile}" state=present line='<Set name="port"><SystemProperty name="jetty.port" default="${existJettyPort}"/></Set>' regexp='<Set name="port"><SystemProperty\sname="jetty.port"\s'
-    
\ No newline at end of file
+    
diff --git a/ansible/templates/ec2ExistRclocal.template b/ansible/templates/ec2ExistRclocal.template
index ad29854..4addbb8 100644
--- a/ansible/templates/ec2ExistRclocal.template
+++ b/ansible/templates/ec2ExistRclocal.template
@@ -9,5 +9,11 @@ EXIST_HOME={{ existLn }}
 echo 'Starting the eXist native XML database from within /etc/rc.d/rc.local ...'
 grep 'jetty.port' $EXIST_HOME/tools/jetty/etc/jetty.xml
 echo 'Stating with the following max memory (MB)'
-grep 'wrapper.java.maxmemory' $EXIST_HOME/tools/wrapper/wrapper.conf
-/etc/init.d/exist start
\ No newline at end of file
+grep 'wrapper.java.maxmemory' $EXIST_HOME/tools/wrapper/conf/wrapper.conf
+# start as service user
+su svcexist -c /etc/init.d/exist start
+
+# add nat rule to forward 8080 to 80. 8080 also accessible with this config.
+iptables -A INPUT -i eth0 -p tcp --dport 80 -j ACCEPT
+iptables -A INPUT -i eth0 -p tcp --dport 8080 -j ACCEPT
+iptables -A PREROUTING -t nat -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080