diff --git a/README.org b/README.org
index 189592d..3721825 100644
--- a/README.org
+++ b/README.org
@@ -14,4 +14,4 @@ Construeix i deploya una web estàtica amb hugo
 - GIT_REPO_URL: Url SSH del repositori amb la web
 - GIT_SSH_ID_FILE: Clau pública d'accés SSH
 - HUGO_PARAMS: Paràmetres extra per a la comanda d'`hugo`
-- TARGET_DIR: Directori de destí per construir la pàgina
+- TARGET_DIR: Host i directori de destí per construir la pàgina
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 9e80e11..09c52c0 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -1,7 +1,7 @@
 FROM klakegg/hugo:alpine-ci
 
 # Install git and ssh
-RUN apk add --no-cache git openssh
+RUN apk add --no-cache git openssh rsync
 
 # Install python/pip
 ENV PYTHONUNBUFFERED=1
diff --git a/docker-compose.yml b/docker-compose.yml
index c9bb170..fddf477 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,4 +10,4 @@ services:
       - "6000:6000"
     volumes:
       - ./test/config.json:/app/config.json
-      - /home/marc/.ssh/lajuntament:/app/lajuntament
+      - /home/marc/vatnajokull/nomad_volumes/webhooks/webhooks:/app/lajuntament
diff --git a/scripts/deploy_hugo.sh b/scripts/deploy_hugo.sh
index 882e4eb..4002a46 100644
--- a/scripts/deploy_hugo.sh
+++ b/scripts/deploy_hugo.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -e
+set -xe
 
 echo "Deploying for $GIT_REPO_URL"
 
@@ -7,8 +7,9 @@ CONTENT_DIR=$(mktemp -d -t ci-XXXXXXXXXX)
 echo "Working directory: ${CONTENT_DIR}"
 mkdir -p ${CONTENT_DIR}
 
-GIT_SSH_COMMAND="ssh -oStrictHostKeyChecking=no -i ${GIT_SSH_ID_FILE}" git clone ${GIT_REPO_URL} ${CONTENT_DIR}
+GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -i ${GIT_SSH_ID_FILE}" git clone --recurse-submodules ${GIT_REPO_URL} ${CONTENT_DIR}
 
-# mkdir -p ${TARGET_DIR}
-cd ${CONTENT_DIR} && hugo ${HUGO_PARAMS} --destination ${TARGET_DIR}
+cd ${CONTENT_DIR}
+HUGO_DESTINATION=public hugo ${HUGO_PARAMS}
+rsync -Pav -e "ssh -o StrictHostKeyChecking=no -i ${GIT_SSH_ID_FILE}" public/* ${TARGET_DIR}
 rm -rf ${CONTENT_DIR}
diff --git a/test/config.json b/test/config.json
index 1a86eff..3693e04 100644
--- a/test/config.json
+++ b/test/config.json
@@ -2,12 +2,12 @@
     "lajuntament": {
         "test": {
             "secret": "elsecret",
-            "deploy_script": "./scripts/deploy_hugo.sh",
+            "deploy_script": "/app/scripts/deploy_hugo.sh",
             "env": {
                 "GIT_REPO_URL": "ssh://git@git.lajuntament.space:2222/lajuntament/web.git",
-                "GIT_SSH_ID_FILE": "/app/lajuntament",
+                "GIT_SSH_ID_FILE": "/app/data/webhooks",
                 "HUGO_PARAMS": "",
-                "TARGET_DIRECTORY": "public"
+                "TARGET_DIR": "nfs@vatnajokull:/mnt/raid1/sites/lajuntament-web"
             }
         }
     }