diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c79711b5..4803f4584 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,12 +67,12 @@ aliases:
 
   - &restore-cache-buck
     keys:
-      - v3-buck-{{ arch }}-v2018.03.26.01
+      - v3-buck-{{ arch }}-v2018.06.25.01
   - &save-cache-buck
     paths:
       - ~/buck
       - ~/okbuck
-    key: v3-buck-{{ arch }}-v2018.03.26.01
+    key: v3-buck-{{ arch }}-v2018.06.25.01
 
   - &restore-cache-watchman
     keys:
@@ -145,7 +145,7 @@ aliases:
     name: Install BUCK
     command: |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.03.26.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.06.25.01 --depth=1
       fi
       cd ~/buck && ant
       buck --version
diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index b630b396e..78cb4dc22 100644
--- a/ContainerShip/Dockerfile.android-base
+++ b/ContainerShip/Dockerfile.android-base
@@ -20,7 +20,7 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 ARG SDK_VERSION=sdk-tools-linux-3859397.zip
 ARG ANDROID_BUILD_VERSION=26
 ARG ANDROID_TOOLS_VERSION=26.0.3
-ARG BUCK_VERSION=v2018.03.26.01
+ARG BUCK_VERSION=v2018.06.25.01
 ARG NDK_VERSION=10e
 ARG NODE_VERSION=8.10.0
 ARG WATCHMAN_VERSION=4.9.0