diff --git a/Dockerfile b/Dockerfile
index 609af1c..36466ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,28 @@
-FROM pritunl/archlinux
-MAINTAINER farwayer <farwayer@gmail.com>
+FROM archlinux/base
+LABEL description="Environment for building React Native apps for Android"
+LABEL maintainer="Tuomas Jaakola <tuomas.jaakola@iki.fi>"
+
+# Make pacman to use wget for more reliable downloads
+RUN pacman --noconfirm -Sy wget
+RUN sed -i 's/#VerbosePkgLists/XferCommand = \/usr\/bin\/wget -nv -c -O %o %u/g' /etc/pacman.conf
 
 RUN printf "[multilib]\n"\
 "Include=/etc/pacman.d/mirrorlist\n"\
 "[mobile]\n"\
 "SigLevel = Never\n"\
 'Server=https://farwayer.keybase.pub/arch/$repo' >> /etc/pacman.conf
-RUN pacman --noconfirm -Sy yarn npm watchman jdk8-openjdk git\
- fastlane python2 make gcc\
- android-platform-23\
- android-platform-24\
- android-platform-25\
- android-platform-26\
- android-platform-27\
- android-platform-28\
- android-sdk-build-tools-23.0.1\
- android-sdk-build-tools-23.0.3\
- android-sdk-build-tools-25\
- android-sdk-build-tools-25.0.2\
- android-sdk-build-tools-25.0.3\
- android-sdk-build-tools-26.0.1\
- android-sdk-build-tools-26.0.2\
- android-sdk-build-tools-26.0.3\
- android-sdk-build-tools-27.0.3\
- android-sdk-build-tools-28.0.2\
+
+# Install packages
+# android-sdk-build-tools should come with android-platform pkg
+RUN pacman --noconfirm --disable-download-timeout -Sy\
+ yarn npm watchman jdk8-openjdk git procps-ng\
+ python2 make gcc\
+ android-platform-29\
  android-google-repository\
  android-support-repository\
- && yes | pacman -Scc\
- && rm -rf /usr/lib/ruby/gems/*/{cache,doc} /usr/share/{doc,man,locale}\
- && mkdir /var/run/watchman
+ && yes | pacman -Scc || true\
+ && rm -rf /usr/lib/ruby/gems/*/{cache,doc} /usr/share/{doc,man,locale}
 ENV ANDROID_HOME=/opt/android-sdk
+
+# Accepting all Android SDK package licenses is required
+RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
diff --git a/README.md b/README.md
index 55f4b74..37234d9 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@ All package versions are recent for building date.
 - **26.0.3**
 - **27.0.3**  
 - **28.0.2**  
+- **28.0.3**
 
 You can install extra sdk build tools with pacman:
 ```bash