diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db593a592..b21fd7ba9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ image: 'sigp/lighthouse:latest'
 
 stages:
   - test
-  - doc
+  - document
 
 variables:
     CARGO_HOME: /cache/cargocache
@@ -25,18 +25,12 @@ test-release:
   script:
     - cargo test --verbose --all --release
 
-pages:
-  stage: doc
+documentation:
+  stage: document
   script:
     - cargo doc --no-deps
-    - mv target/doc public
-      #    - echo '<meta http-equiv="refresh" content="0; url={{ LIBRARY NAME }}">' > public/index.html
-  artifacts:
-    paths:
-      - public
+    - aws s3 sync target/doc/ s3://lighthouse-docs.sigmaprime.io/ --exclude '.lock' --delete
+  # Configure the below when we want to have a default page (and update S3 bucket index).
+  #    - echo '<meta http-equiv="refresh" content="0; url={{ LIBRARY NAME }}">' > public/index.html
   only:
     - master
-
-cache:
-  paths:
-    - target/
diff --git a/.travis.yml b/.travis.yml
index f89db54c9..d0b2ee0e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,9 @@ language: rust
 cache:
   directories:
     - /home/travis/.cargo
-before_cache:
-  - rm -rf /home/travis/.cargo/registry
+# Going to try caching the registry
+#before_cache:
+#  - rm -rf /home/travis/.cargo/registry
 before_install:
   - curl -OL https://github.com/google/protobuf/releases/download/v3.4.0/protoc-3.4.0-linux-x86_64.zip
   - unzip protoc-3.4.0-linux-x86_64.zip -d protoc3
@@ -13,7 +14,8 @@ before_install:
   - sudo chown -R $USER /usr/local/include/google
 env:
   - BUILD=--all
-  - BUILD=--release --all
+# Not building --release on travis any more, only GitLab
+#  - BUILD=--release --all
   - BUILD= --manifest-path eth2/state_processing/Cargo.toml --release --features fake_crypto
 script:
   - cargo build --verbose $BUILD
@@ -30,14 +32,17 @@ matrix:
     - rust: nightly
   fast_finish: true
   exclude:
-      - rust: beta
-        env: BUILD=--release --all
+# Not building --release on travis any more, only GitLab
+#      - rust: beta
+#        env: BUILD=--release --all
       - rust: beta
         env: BUILD= --manifest-path eth2/state_processing/Cargo.toml --release --features fake_crypto
-      - rust: nightly
-        env: BUILD=--release --all
+# Not building --release on travis any more, only GitLab
+#      - rust: nightly
+#        env: BUILD=--release --all
       - rust: nightly
         env: BUILD= --manifest-path eth2/state_processing/Cargo.toml --release --features fake_crypto
 install:
   - rustup component add rustfmt
-  - rustup component add clippy
+# No clippy for now
+#  - rustup component add clippy
diff --git a/Dockerfile b/Dockerfile
index e693c91a3..57f677b78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM rust:latest
 
-RUN apt-get update && apt-get install -y clang libclang-dev cmake build-essential git unzip autoconf libtool
+RUN apt-get update && apt-get install -y clang libclang-dev cmake build-essential git unzip autoconf libtool awscli
 
 RUN git clone https://github.com/google/protobuf.git && \
     cd protobuf && \