diff --git a/gerrit/files/apache.conf b/gerrit/files/apache.conf
new file mode 100644
index 0000000..c11db68
--- /dev/null
+++ b/gerrit/files/apache.conf
@@ -0,0 +1,16 @@
+{%- from "gerrit/map.jinja" import server with context %}
+
+<VirtualHost *88>
+
+    ProxyRequests Off
+    ProxyVia Off
+    ProxyPreserveHost On
+
+    <Proxy *>
+        Order deny,allow
+        Allow from all
+    </Proxy>
+
+    AllowEncodedSlashes On
+    ProxyPass / http://127.0.0.1:8082/ nocanon
+</VirtualHost>
\ No newline at end of file
diff --git a/gerrit/files/gerrit.config b/gerrit/files/gerrit.config
index 4379b13..93510d0 100644
--- a/gerrit/files/gerrit.config
+++ b/gerrit/files/gerrit.config
@@ -62,7 +62,7 @@
 	{% endif %}
 
 [httpd]
-	listenUrl = proxy-https://*:8081/
+	listenUrl = proxy-https://*:8082/
     {% if server.httpd_maxwait is defined %}
 	maxWait = {{ server.httpd_maxwait }}
     {% endif %}
diff --git a/gerrit/files/gerrit.systemd b/gerrit/files/gerrit.systemd
index 4849fbc..c630d0d 100644
--- a/gerrit/files/gerrit.systemd
+++ b/gerrit/files/gerrit.systemd
@@ -1,3 +1,4 @@
+{%- from "gerrit/map.jinja" import server with context %}
 [Unit]
 Description=Web based code review and project management for Git based projects
 After=syslog.target network.target remote-fs.target
@@ -9,7 +10,7 @@
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=gerrit
-ExecStart=@/usr/bin/java gerrit -DGerritCodeReview=1 $JAVA_OPTIONS -jar $GERRIT_WAR daemon -d $GERRIT_SITE --console-log
+ExecStart=@/usr/bin/java gerrit -DGerritCodeReview=1 $JAVA_OPTIONS -jar {{ server.dir.site }}/bin/gerrit.war daemon -d {{ server.dir.site }} --console-log
 #MemoryLimit=768M
 OOMScoreAdjust=-1000
 LimitCPU=infinity
@@ -20,4 +21,4 @@
 LimitLOCKS=infinity
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/gerrit/map.jinja b/gerrit/map.jinja
index 4c1db62..b72f407 100644
--- a/gerrit/map.jinja
+++ b/gerrit/map.jinja
@@ -5,8 +5,8 @@
   - unzip
   - gitweb
   dir:
-    home: "/srv/gerrit2"
-    site: "/srv/gerrit2/review_site"
+    home: "/srv/gerrit"
+    site: "/srv/gerrit/review_site"
   service: gerrit
   reindex_threads: 1
 {%- endload %}
diff --git a/gerrit/server/service.sls b/gerrit/server/service.sls
index 763aefa..c9773ed 100644
--- a/gerrit/server/service.sls
+++ b/gerrit/server/service.sls
@@ -17,9 +17,11 @@
     - {{ server.dir.home }}/.ssh
     - {{ server.dir.home }}/gerrit-wars
     - {{ server.dir.site }}/bin
+    - {{ server.dir.site }}/cache
     - {{ server.dir.site }}/etc/its
     - {{ server.dir.site }}/hooks
     - {{ server.dir.site }}/lib
+    - {{ server.dir.site }}/logs
     - {{ server.dir.site }}/static
     - /var/log/gerrit
   - makedirs: true
@@ -69,9 +71,45 @@
 
 {% endif %}
 
+{{ server.dir.site }}/etc/ssh_project_rsa_key:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 600
+  - require:
+    - file: gerrit_home
+
+{{ server.dir.site }}/etc/ssh_project_rsa_key.pub:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key_pub
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 644
+  - require:
+    - file: gerrit_home
+
+{{ server.dir.site }}/etc/ssh_host_rsa_key:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 600
+  - require:
+    - file: gerrit_home
+
+{{ server.dir.site }}/etc/ssh_host_rsa_key.pub:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key_pub
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 644
+  - require:
+    - file: gerrit_home
+
 {{ server.dir.site }}/etc/ssh_welcome_rsa_key:
   file.managed:
-  - contents_pillar: gerrit:server:ssh_welcome_rsa_key
+  - contents_pillar: gerrit:server:ssh_rsa_key
   - user: gerrit2
   - group: gerrit2
   - mode: 600
@@ -80,7 +118,25 @@
 
 {{ server.dir.site }}/etc/ssh_welcome_rsa_key.pub:
   file.managed:
-  - contents_pillar: gerrit:server:ssh_welcome_rsa_key_pub
+  - contents_pillar: gerrit:server:ssh_rsa_key_pub
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 644
+  - require:
+    - file: gerrit_home
+
+{{ server.dir.home }}/.ssh/id_rsa:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key
+  - user: gerrit2
+  - group: gerrit2
+  - mode: 600
+  - require:
+    - file: gerrit_home
+
+{{ server.dir.home }}/.ssh/id_rsa.pub:
+  file.managed:
+  - contents_pillar: gerrit:server:ssh_rsa_key_pub
   - user: gerrit2
   - group: gerrit2
   - mode: 644
@@ -147,4 +203,12 @@
     - file: gerrit_server_service_symlink
     - cmd: gerrit_server_initial_index
 
+gerrit_server_known_host:
+  ssh_known_hosts.present:
+    - name: localhost
+    - port: 29418
+    - user: gerrit2
+    - require:
+      - file: gerrit_home
+
 {%- endif %}
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 4811f70..6997b61 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -10,5 +10,5 @@
         address: 0.0.0.0
       mail:
         host: localhost
-        from: gerrit
+        from: gerrit@domain.com
         include_diff: true
\ No newline at end of file