diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69f0b46..2d31856 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,10 @@ cache:
   paths:
     - node_modules/
 
+variables:
+  S3_BUCKET_NAME: recettes.inf3.ch
+  AWS_BUCKET_REGION: us-east-1
+
 node-build:
   stage: build
   script:
@@ -14,13 +18,41 @@ node-build:
     paths:
       - build
 
-metalsmith-deploy:
-  image: kyleondy/alpine-rsync
+deploys3-branch:
+  image: "python:latest"
   stage: deploy
-  tags:
-    - pages
-  only:
-    - master
+  before_script:
+    - pip install awscli
   script:
-    - mkdir -p /volumes/output/recettes
-    - rsync -r build/ /volumes/output/recettes
+    - aws s3 cp build s3://${S3_BUCKET_NAME}/${CI_COMMIT_REF_SLUG} --recursive
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}
+    url: http://${S3_BUCKET_NAME}.s3-website-${AWS_BUCKET_REGION}.amazonaws.com/${CI_COMMIT_REF_SLUG}
+    on_stop: deploys3-clean
+  except:
+    - /^master$/
+
+deploys3-master:
+  image: "python:latest"
+  stage: deploy
+  before_script:
+    - pip install awscli
+  script:
+    - aws s3 cp . s3://${S3_BUCKET_NAME}/ --recursive
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}
+    url: http://${S3_BUCKET_NAME}.s3-website-${AWS_BUCKET_REGION}.amazonaws.com/
+  only:
+    - /^master$/
+
+deploys3-clean:
+  image: "python:latest"
+  stage: deploy
+  before_script:
+    - pip install awscli
+  script:
+    - aws s3 rm s3://${S3_BUCKET_NAME}/${CI_COMMIT_REF_SLUG} --recursive
+  environment:
+    name: ${CI_COMMIT_REF_SLUG}
+    action: stop
+  when: manual