diff --git a/README.md b/README.md
index acfe5df..768c0e9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-Docker Images
+Webratio-Docker Images
 =================
-[Docker](https://www.docker.com/) images mantained by [WebRatio] (https://www.webratio.com)
\ No newline at end of file
+All rights by https://www.webratio.com,  just a clone of https://github.com/webratio/docker for personal adjustments.
diff --git a/android-sdk/README.md b/android-sdk/README.md
index 1bbd22f..293c405 100644
--- a/android-sdk/README.md
+++ b/android-sdk/README.md
@@ -1,4 +1,4 @@
-## Gitblit Dockerfile
+## Dockerfile
 
 This repository contains **Dockerfile** of [Android SDK](https://developer.android.com/sdk/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/android-sdk/) published to the public [Docker Hub](https://hub.docker.com/).
 
@@ -7,4 +7,14 @@ This repository contains **Dockerfile** of [Android SDK](https://developer.andro
 1. Install [Docker](https://www.docker.com/).
 
 2. Pull the image
-  * `docker pull webratio/android-sdk`
\ No newline at end of file
+  * `docker pull nmaas87/webratio-android-sdk:r26.1.1`
+  
+### Infos
+#### SDK Tools Link
+https://developer.android.com/studio/releases/sdk-tools.html
+https://androidsdkoffline.blogspot.de/p/android-sdk-tools.html
+#### SDK Build Tools Link
+https://developer.android.com/studio/releases/build-tools.html
+https://androidsdkoffline.blogspot.de/p/android-sdk-build-tools.html
+#### node.js Releases
+https://nodejs.org/dist/
diff --git a/android-sdk/Dockerfile b/android-sdk/r23.0.2/Dockerfile
similarity index 52%
rename from android-sdk/Dockerfile
rename to android-sdk/r23.0.2/Dockerfile
index 97850ff..c5b2042 100644
--- a/android-sdk/Dockerfile
+++ b/android-sdk/r23.0.2/Dockerfile
@@ -1,22 +1,34 @@
-FROM webratio/ant
-
-# Installs i386 architecture required for running 32 bit Android tools
-RUN dpkg --add-architecture i386 && \
-    apt-get update -y && \
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get autoremove -y && \
-    apt-get clean
-
-# Installs Android SDK
-ENV ANDROID_SDK_FILENAME android-sdk_r23.0.2-linux.tgz
-ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21 
-ENV ANDROID_BUILD_TOOLS_VERSION 21.1.0
-ENV ANDROID_HOME /opt/android-sdk-linux
-ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-RUN cd /opt && \
-    wget -q ${ANDROID_SDK_URL} && \
-    tar -xzf ${ANDROID_SDK_FILENAME} && \
-    rm ${ANDROID_SDK_FILENAME} && \
-    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
+FROM nmaas87/webratio-ant
+
+# Installs i386 architecture required for running 32 bit Android tools
+RUN dpkg --add-architecture i386 && \
+    apt-get update -y && \
+    apt-get install -y git-core libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME android-sdk_r23.0.2-linux.tgz
+ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21
+ENV ANDROID_BUILD_TOOLS_VERSION 21.1.0
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    wget -q ${ANDROID_SDK_URL} && \
+    tar -xzf ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 4.4.4
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/android-sdk/r24.4.1/Dockerfile b/android-sdk/r24.4.1/Dockerfile
index 6dec297..4e81cae 100644
--- a/android-sdk/r24.4.1/Dockerfile
+++ b/android-sdk/r24.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/ant
+FROM nmaas87/webratio-ant
 
 ENV ANDROID_SDK_VERSION r24.4.1
 ENV ANDROID_BUILD_TOOLS_VERSION 23.0.3
@@ -6,7 +6,7 @@ ENV ANDROID_BUILD_TOOLS_VERSION 23.0.3
 # Installs i386 architecture required for running 32 bit Android tools
 RUN dpkg --add-architecture i386 && \
     apt-get update -y && \
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
+    apt-get install -y git-core libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
     apt-get clean
@@ -14,11 +14,23 @@ RUN dpkg --add-architecture i386 && \
 # Installs Android SDK
 ENV ANDROID_SDK_FILENAME android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
 ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23 
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23
 ENV ANDROID_HOME /opt/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /opt && \
     wget -q ${ANDROID_SDK_URL} && \
     tar -xzf ${ANDROID_SDK_FILENAME} && \
     rm ${ANDROID_SDK_FILENAME} && \
-    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 4.4.4
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/android-sdk/r25.2.4/Dockerfile b/android-sdk/r25.2.4/Dockerfile
new file mode 100644
index 0000000..18b6596
--- /dev/null
+++ b/android-sdk/r25.2.4/Dockerfile
@@ -0,0 +1,37 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r25.2.4
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.2
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME tools_${ANDROID_SDK_VERSION}-linux.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 6.9.2
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/android-sdk/r25.2.5/Dockerfile b/android-sdk/r25.2.5/Dockerfile
new file mode 100644
index 0000000..41551e5
--- /dev/null
+++ b/android-sdk/r25.2.5/Dockerfile
@@ -0,0 +1,37 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r25.2.5
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.2
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME tools_${ANDROID_SDK_VERSION}-linux.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 6.9.5
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/android-sdk/r26.1.1/Dockerfile b/android-sdk/r26.1.1/Dockerfile
new file mode 100644
index 0000000..106d51a
--- /dev/null
+++ b/android-sdk/r26.1.1/Dockerfile
@@ -0,0 +1,47 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r26.1.1
+ENV ANDROID_SDK_BUILD 4333796
+ENV ANDROID_BUILD_TOOLS_VERSION 27.0.3
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME sdk-tools-linux-${ANDROID_SDK_BUILD}.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25,android-26,android-27
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    yes | tools/bin/sdkmanager --licenses && \
+    tools/bin/sdkmanager tools platform-tools "platforms;android-15" "platforms;android-16" "platforms;android-17" "platforms;android-18" "platforms;android-19" "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27" "extras;android;m2repository" "extras;google;m2repository" "build-tools;27.0.3"
+
+# Installs Node.js
+ENV NODE_VERSION 9.8.0
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
+
+# Install Gradle
+ENV GRADLE_VERSION 4.6
+RUN mkdir /opt/gradle && \
+    cd /opt/gradle && \
+    wget -q http://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \
+    unzip gradle-*-bin.zip && \
+    mv gradle-*/* . && \
+    rm gradle-*-bin.zip && \
+    rm -rf gradle-*
+ENV PATH ${PATH}:/opt/gradle/bin
diff --git a/ant/1.9.4/Dockerfile b/ant/1.9.4/Dockerfile
deleted file mode 100644
index 9859046..0000000
--- a/ant/1.9.4/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM webratio/java:7
-
-# Installs Ant
-ENV ANT_VERSION 1.9.4
-RUN cd && \
-    wget -q http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    mv apache-ant-${ANT_VERSION} /opt/ant && \
-    rm apache-ant-${ANT_VERSION}-bin.tar.gz
-ENV ANT_HOME /opt/ant
-ENV PATH ${PATH}:/opt/ant/bin
\ No newline at end of file
diff --git a/ant/1.9.6/Dockerfile b/ant/1.9.6/Dockerfile
deleted file mode 100644
index ade9ed7..0000000
--- a/ant/1.9.6/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM webratio/java:7
-
-# Installs Ant
-ENV ANT_VERSION 1.9.6
-RUN cd && \
-    wget -q http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    mv apache-ant-${ANT_VERSION} /opt/ant && \
-    rm apache-ant-${ANT_VERSION}-bin.tar.gz
-ENV ANT_HOME /opt/ant
-ENV PATH ${PATH}:/opt/ant/bin
\ No newline at end of file
diff --git a/ant/1.9.5/Dockerfile b/ant/Dockerfile
similarity index 78%
rename from ant/1.9.5/Dockerfile
rename to ant/Dockerfile
index 9c46f47..2624b93 100644
--- a/ant/1.9.5/Dockerfile
+++ b/ant/Dockerfile
@@ -1,11 +1,11 @@
-FROM webratio/java:7
-
-# Installs Ant
-ENV ANT_VERSION 1.9.5
-RUN cd && \
-    wget -q http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    mv apache-ant-${ANT_VERSION} /opt/ant && \
-    rm apache-ant-${ANT_VERSION}-bin.tar.gz
-ENV ANT_HOME /opt/ant
-ENV PATH ${PATH}:/opt/ant/bin
\ No newline at end of file
+FROM openjdk:8-jdk
+
+# Installs Ant
+ENV ANT_VERSION 1.10.2
+RUN cd && \
+    wget -q http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
+    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
+    mv apache-ant-${ANT_VERSION} /opt/ant && \
+    rm apache-ant-${ANT_VERSION}-bin.tar.gz
+ENV ANT_HOME /opt/ant
+ENV PATH ${PATH}:/opt/ant/bin
diff --git a/ant/1.9.6/README.md b/ant/README.md
similarity index 60%
rename from ant/1.9.6/README.md
rename to ant/README.md
index d82a45b..d70ae7b 100644
--- a/ant/1.9.6/README.md
+++ b/ant/README.md
@@ -1,13 +1,17 @@
-## Gitblit Dockerfile
-
-This repository contains **Dockerfile** of [Apache Ant](http://ant.apache.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/ant/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/ant`
-  * `docker pull webratio/ant:1.9.4`
-  * `docker pull webratio/ant:1.9.5`
-  * `docker pull webratio/ant:1.9.6`
+## Dockerfile
+
+This repository contains **Dockerfile** of [Apache Ant](http://ant.apache.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/ant/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-ant`
+
+### Info
+#### Platform
+Currently using OpenJDK 8 from Docker Hub and Ant 1.10.2
+
+#### Link for Apache Ant files
+http://www.us.apache.org/dist//ant/binaries/
diff --git a/cordova/3.5.0-0.2.7/Dockerfile b/cordova/3.5.0-0.2.7/Dockerfile
deleted file mode 100644
index a365060..0000000
--- a/cordova/3.5.0-0.2.7/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 3.5.0-0.2.7
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/3.6.3-0.2.13/Dockerfile b/cordova/3.6.3-0.2.13/Dockerfile
deleted file mode 100644
index a3481ba..0000000
--- a/cordova/3.6.3-0.2.13/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 3.6.3-0.2.13
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.0.1/Dockerfile b/cordova/4.0.1/Dockerfile
deleted file mode 100644
index e000135..0000000
--- a/cordova/4.0.1/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.0.1
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.1.0/Dockerfile b/cordova/4.1.0/Dockerfile
deleted file mode 100644
index 1c548b8..0000000
--- a/cordova/4.1.0/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.1.0
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.1.1/Dockerfile b/cordova/4.1.1/Dockerfile
deleted file mode 100644
index 01664c3..0000000
--- a/cordova/4.1.1/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.1.1
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.1.2/Dockerfile b/cordova/4.1.2/Dockerfile
deleted file mode 100644
index 0fb3d59..0000000
--- a/cordova/4.1.2/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.1.2
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.2.0/Dockerfile b/cordova/4.2.0/Dockerfile
deleted file mode 100644
index 5421e0a..0000000
--- a/cordova/4.2.0/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.2.0
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.3.0/Dockerfile b/cordova/4.3.0/Dockerfile
deleted file mode 100644
index e736c21..0000000
--- a/cordova/4.3.0/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM webratio/nodejs-with-android-sdk
-
-# Installs Cordova
-# Forces a platform add in order to preload libraries
-ENV CORDOVA_VERSION 4.3.0
-RUN npm install -g npm && \
-    npm install -g cordova@${CORDOVA_VERSION} && \
-    cd /tmp && \
-    cordova create fakeapp && \
-    cd /tmp/fakeapp && \
-    cordova platform add android && \
-    cd && \
-    rm -rf /tmp/fakeapp
-
-VOLUME ["/data"]
-WORKDIR /data
-
-EXPOSE 8000
\ No newline at end of file
diff --git a/cordova/4.3.0/README.md b/cordova/4.3.0/README.md
deleted file mode 100644
index e831f34..0000000
--- a/cordova/4.3.0/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-## Cordova Dockerfile
-
-This repository contains **Dockerfile** of [Cordova](http://cordova.apache.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/cordova/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/cordova`
-  * `docker pull webratio/cordova:3.5`
-  * `docker pull webratio/cordova:3.5.0-0.2.7`
-  * `docker pull webratio/cordova:3.6`
-  * `docker pull webratio/cordova:3.6.3-0.2.13`
-  * `docker pull webratio/cordova:4.0`
-  * `docker pull webratio/cordova:4.0.1`
-  * `docker pull webratio/cordova:4.1`
-  * `docker pull webratio/cordova:4.1.0`
-  * `docker pull webratio/cordova:4.1.1`
-  * `docker pull webratio/cordova:4.1.2`
-  * `docker pull webratio/cordova:4.2`
-  * `docker pull webratio/cordova:4.2.0`
-  * `docker pull webratio/cordova:4.3`
-  * `docker pull webratio/cordova:4.3.0`
-
-### Usage
-
-#### Run `cordova create`
-
-    docker run -v <app-parent-dir>:/data webratio/cordova cordova create <app-name>
-
-#### Run `cordova platform add android`
-
-    docker run -v <app-dir>:/data webratio/cordova cordova platform add android
-
-#### Run `cordova serve`
-
-    docker run -v <app-dir>:/data webratio/cordova cordova serve
-
-#### Run `cordova build android`
-
-    docker run -v <app-dir>:/data webratio/cordova cordova build android
-
diff --git a/gitblit/Dockerfile b/gitblit/Dockerfile
deleted file mode 100644
index 7622c53..0000000
--- a/gitblit/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM jmoger/gitblit
-
-# Disables the HTTPS port
-RUN sed -e "s/server\.httpsPort\s=\s8443/server\.httpsPort=0/" \
-        -e "s/server\.httpPort\s=\s0/server\.httpPort=80/" \
-        -e "s/web\.enableRpcManagement\s=\sfalse/web\.enableRpcManagement=true/" \
-        -e "s/web\.enableRpcAdministration\s=\sfalse/web.enableRpcAdministration=true/" \
-        /opt/gitblit-data/default.properties > /opt/gitblit-data/gitblit.properties
-
-CMD ["java", "-server", "-Xmx1024M", "-Djava.awt.headless=true", "-jar", "/opt/gitblit/gitblit.jar", "--baseFolder", "/opt/gitblit-data"]
diff --git a/gitblit/README.md b/gitblit/README.md
deleted file mode 100644
index 005d48a..0000000
--- a/gitblit/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Gitblit Dockerfile
-
-This repository contains **Dockerfile** of [Gitblit](http://gitblit.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/gitblit`
-
-### Usage
-
-    docker run -d -p 80:80 -p 9418:9418 -p 29418:29418 webratio/gitblit
diff --git a/groovy/2.3.10/Dockerfile b/groovy/2.3.10/Dockerfile
deleted file mode 100644
index aa39768..0000000
--- a/groovy/2.3.10/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.3.10
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.3.11/Dockerfile b/groovy/2.3.11/Dockerfile
deleted file mode 100644
index c6df2d5..0000000
--- a/groovy/2.3.11/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.3.11
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.3.7/Dockerfile b/groovy/2.3.7/Dockerfile
deleted file mode 100644
index 7d59f63..0000000
--- a/groovy/2.3.7/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.3.7
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.3.8/Dockerfile b/groovy/2.3.8/Dockerfile
deleted file mode 100644
index 3408617..0000000
--- a/groovy/2.3.8/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.3.8
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.3.9/Dockerfile b/groovy/2.3.9/Dockerfile
deleted file mode 100644
index 3101e4d..0000000
--- a/groovy/2.3.9/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.3.9
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.0/Dockerfile b/groovy/2.4.0/Dockerfile
deleted file mode 100644
index c96eddc..0000000
--- a/groovy/2.4.0/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.4.0
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.1/Dockerfile b/groovy/2.4.1/Dockerfile
deleted file mode 100644
index 8ebbe17..0000000
--- a/groovy/2.4.1/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.4.1
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.2/Dockerfile b/groovy/2.4.2/Dockerfile
deleted file mode 100644
index aca568c..0000000
--- a/groovy/2.4.2/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.4.2
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.3/Dockerfile b/groovy/2.4.3/Dockerfile
deleted file mode 100644
index fe8e00e..0000000
--- a/groovy/2.4.3/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.4.3
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.4/Dockerfile b/groovy/2.4.4/Dockerfile
deleted file mode 100644
index 6be811a..0000000
--- a/groovy/2.4.4/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/gvm
-
-# Defines environment variables
-ENV GROOVY_VERSION 2.4.4
-
-# Installs Groovy 
-RUN /bin/bash -c "source /root/.gvm/bin/gvm-init.sh && gvm install groovy ${GROOVY_VERSION}"
-ENV GROOVY_HOME /root/.gvm/groovy/current
-ENV PATH $GROOVY_HOME/bin:$PATH
-
-WORKDIR /source
-ENTRYPOINT ["groovy", "-Dgrape.root=/graperoot"]
\ No newline at end of file
diff --git a/groovy/2.4.4/README.md b/groovy/2.4.4/README.md
deleted file mode 100644
index e698086..0000000
--- a/groovy/2.4.4/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## Groovy Dockerfile
-
-This repository contains **Dockerfile** of [Groovy](http://groovy.codehaus.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/groovy/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image 
-  * `docker pull webratio/groovy`
-  * `docker pull webratio/groovy:2.3`
-  * `docker pull webratio/groovy:2.3.7`
-  * `docker pull webratio/groovy:2.3.8`
-  * `docker pull webratio/groovy:2.3.9`
-  * `docker pull webratio/groovy:2.3.10`
-  * `docker pull webratio/groovy:2.3.11`
-  * `docker pull webratio/groovy:2.4`
-  * `docker pull webratio/groovy:2.4.0`
-  * `docker pull webratio/groovy:2.4.1`
-  * `docker pull webratio/groovy:2.4.2`
-  * `docker pull webratio/groovy:2.4.3`
-  * `docker pull webratio/groovy:2.4.4`
-  
-### Usage
-
-    docker run -v $(pwd):/source -v <grape-root-dir>:/graperoot webratio/groovy <groovy-file> 
diff --git a/gvm/Dockerfile b/gvm/Dockerfile
deleted file mode 100644
index 2ca7f98..0000000
--- a/gvm/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM webratio/java:7
-
-# Defines environment variables
-ENV HOME /root
-ENV DEBIAN_FRONTEND noninteractive
-
-# Installs curl and GVM
-RUN apt-get update && \
-    apt-get install -y curl unzip && \
-    curl -s get.gvmtool.net | bash && \
-    apt-get autoremove -y && \
-    apt-get clean
\ No newline at end of file
diff --git a/gvm/README.md b/gvm/README.md
deleted file mode 100644
index 4dd4750..0000000
--- a/gvm/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## GVM Dockerfile
-
-This repository contains **Dockerfile** of [GVM - the Groovy enVironment Manager](http://gvmtool.net/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/gvm/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/gvm`
-
-### Usage
-
-    docker run webratio/gvm gvm install groovy
diff --git a/java/7/Dockerfile b/java/7/Dockerfile
deleted file mode 100644
index 4015921..0000000
--- a/java/7/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:trusty
-
-RUN apt-get update -y && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:webupd8team/java -y && \
-    apt-get update -y && \
-    echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-    apt-get install -y oracle-java7-installer && \
-    apt-get remove software-properties-common -y && \
-    apt-get autoremove -y && \
-    apt-get clean
-ENV JAVA_HOME /usr/lib/jvm/java-7-oracle
\ No newline at end of file
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
deleted file mode 100644
index 810c6eb..0000000
--- a/java/8/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:trusty
-
-RUN apt-get update -y && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:webupd8team/java -y && \
-    apt-get update -y && \
-    echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-    apt-get install -y oracle-java8-installer && \
-    apt-get remove software-properties-common -y && \
-    apt-get autoremove -y && \
-    apt-get clean
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
\ No newline at end of file
diff --git a/java/8/README.md b/java/8/README.md
deleted file mode 100644
index 2f3a561..0000000
--- a/java/8/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Java Dockerfile
-
-This repository contains **Dockerfile** of [Java](https://www.java.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/java/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image 
-  * `docker pull webratio/java`
-  * `docker pull webratio/java:7`
-  * `docker pull webratio/java:8`
\ No newline at end of file
diff --git a/nodejs-with-android-sdk/0.10.33/Dockerfile b/nodejs-with-android-sdk/0.10.33/Dockerfile
deleted file mode 100644
index 18c0ff9..0000000
--- a/nodejs-with-android-sdk/0.10.33/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM webratio/android-sdk
-
-# Installs Node.js
-ENV NODE_VERSION 0.10.33
-RUN cd && \
-    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
-    rm node-v${NODE_VERSION}-linux-x64.tar.gz
-ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/nodejs-with-android-sdk/0.10.36/Dockerfile b/nodejs-with-android-sdk/0.10.36/Dockerfile
deleted file mode 100644
index 7b84d0f..0000000
--- a/nodejs-with-android-sdk/0.10.36/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM webratio/android-sdk
-
-# Installs Node.js
-ENV NODE_VERSION 0.10.36
-RUN cd && \
-    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
-    rm node-v${NODE_VERSION}-linux-x64.tar.gz
-ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/nodejs-with-android-sdk/4.4.1/Dockerfile b/nodejs-with-android-sdk/4.4.1/Dockerfile
deleted file mode 100644
index cceda8b..0000000
--- a/nodejs-with-android-sdk/4.4.1/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM webratio/android-sdk:r24.4.1
-
-# Installs Node.js
-ENV NODE_VERSION 4.4.1
-RUN cd && \
-    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
-    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
-    rm node-v${NODE_VERSION}-linux-x64.tar.gz
-ENV PATH ${PATH}:/opt/node/bin
\ No newline at end of file
diff --git a/nodejs-with-android-sdk/4.4.1/README.md b/nodejs-with-android-sdk/4.4.1/README.md
deleted file mode 100644
index ee9619f..0000000
--- a/nodejs-with-android-sdk/4.4.1/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## Gitblit Dockerfile
-
-This repository contains **Dockerfile** of [Node.js](http://nodejs.org/) combined with [Android SDK](https://developer.android.com/sdk/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/android-sdk-with-nodejs/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/nodejs-with-android-sdk:0.10.33`
-  * `docker pull webratio/nodejs-with-android-sdk:0.10.36`
-  * `docker pull webratio/nodejs-with-android-sdk:4.4.1`
-  * `docker pull webratio/nodejs-with-android-sdk`  
\ No newline at end of file
diff --git a/phonegap/3.5.0-0.21.18/Dockerfile b/phonegap/3.5.0-0.21.18/Dockerfile
index ffdac4a..a75d6e9 100644
--- a/phonegap/3.5.0-0.21.18/Dockerfile
+++ b/phonegap/3.5.0-0.21.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
diff --git a/phonegap/3.6.0-0.21.19/Dockerfile b/phonegap/3.6.0-0.21.19/Dockerfile
index f9af63e..b58774e 100644
--- a/phonegap/3.6.0-0.21.19/Dockerfile
+++ b/phonegap/3.6.0-0.21.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
@@ -16,4 +16,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/3.6.3-0.22.7/Dockerfile b/phonegap/3.6.3-0.22.7/Dockerfile
index efe9390..40f1116 100644
--- a/phonegap/3.6.3-0.22.7/Dockerfile
+++ b/phonegap/3.6.3-0.22.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
@@ -17,4 +17,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/4.0.0-0.22.7/Dockerfile b/phonegap/4.0.0-0.22.7/Dockerfile
index 636b06b..a349765 100644
--- a/phonegap/4.0.0-0.22.7/Dockerfile
+++ b/phonegap/4.0.0-0.22.7/Dockerfile
@@ -1,10 +1,9 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
 ENV PHONEGAP_VERSION 4.0.0-0.22.7
-RUN npm install -g npm && \
-    npm install -g phonegap@${PHONEGAP_VERSION} && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
     npm install -g xmldom && \
     npm install -g xpath && \
     cd /tmp && \
@@ -17,4 +16,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/4.1.2-0.22.12/Dockerfile b/phonegap/4.1.2-0.22.12/Dockerfile
index 43d3d56..44d43f2 100644
--- a/phonegap/4.1.2-0.22.12/Dockerfile
+++ b/phonegap/4.1.2-0.22.12/Dockerfile
@@ -1,10 +1,9 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
 ENV PHONEGAP_VERSION 4.1.2-0.22.12
-RUN npm install -g npm && \
-    npm install -g phonegap@${PHONEGAP_VERSION} && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
     npm install -g xmldom && \
     npm install -g xpath && \
     cd /tmp && \
@@ -17,4 +16,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/4.2.0-0.24.2/Dockerfile b/phonegap/4.2.0-0.24.2/Dockerfile
index d6c1929..c2fc2ea 100644
--- a/phonegap/4.2.0-0.24.2/Dockerfile
+++ b/phonegap/4.2.0-0.24.2/Dockerfile
@@ -1,10 +1,9 @@
-FROM webratio/nodejs-with-android-sdk
+FROM nmaas87/webratio-android-sdk:r23.0.2
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
 ENV PHONEGAP_VERSION 4.2.0-0.24.2
-RUN npm install -g npm && \
-    npm install -g phonegap@${PHONEGAP_VERSION} && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
     npm install -g xmldom && \
     npm install -g xpath && \
     cd /tmp && \
@@ -17,4 +16,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/6.0.3/Dockerfile b/phonegap/6.0.3/Dockerfile
index e8df54b..5feb4fb 100644
--- a/phonegap/6.0.3/Dockerfile
+++ b/phonegap/6.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk:4.4.1
+FROM nmaas87/webratio-android-sdk:r24.4.1
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
@@ -17,4 +17,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/6.1.0/Dockerfile b/phonegap/6.1.0/Dockerfile
index 6246f94..100801d 100644
--- a/phonegap/6.1.0/Dockerfile
+++ b/phonegap/6.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk:4.4.1
+FROM nmaas87/webratio-android-sdk:r24.4.1
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
@@ -17,4 +17,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/6.2.0/Dockerfile b/phonegap/6.2.0/Dockerfile
index 1a77152..65b58a3 100644
--- a/phonegap/6.2.0/Dockerfile
+++ b/phonegap/6.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM webratio/nodejs-with-android-sdk:4.4.1
+FROM nmaas87/webratio-android-sdk:r24.4.1
 
 # Installs PhoneGap
 # Forces a create and build in order to preload libraries
@@ -17,4 +17,4 @@ RUN npm install -g npm && \
 VOLUME ["/data"]
 WORKDIR /data
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
diff --git a/phonegap/6.2.0/README.md b/phonegap/6.2.0/README.md
deleted file mode 100644
index 8950a81..0000000
--- a/phonegap/6.2.0/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-## PhoneGap Dockerfile
-
-This repository contains **Dockerfile** of [PhoneGap](http://phonegap.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/phonegap`
-  * `docker pull webratio/phonegap:3.5.0`
-  * `docker pull webratio/phonegap:3.5.0-0.21.18`
-  * `docker pull webratio/phonegap:3.6.0`
-  * `docker pull webratio/phonegap:3.6.0-0.21.19`
-  * `docker pull webratio/phonegap:3.6.3`
-  * `docker pull webratio/phonegap:3.6.3-0.22.7`
-  * `docker pull webratio/phonegap:4.0.0`
-  * `docker pull webratio/phonegap:4.0.0-0.22.7`
-  * `docker pull webratio/phonegap:4.1.2`
-  * `docker pull webratio/phonegap:4.1.2-0.22.12`
-  * `docker pull webratio/phonegap:4.2.0`
-  * `docker pull webratio/phonegap:4.2.0-0.24.2`
-  * `docker pull webratio/phonegap:6.0.3`
-  * `docker pull webratio/phonegap:6.1.0`
-  * `docker pull webratio/phonegap:6.2.0`
-
-### Usage
-
-#### Run `phonegap create`
-
-    docker run -v <application-parent-dir>:/data webratio/phonegap phonegap create <application-name>
-
-#### Run `phonegap serve`
-
-    docker run -d -p <port>:3000 -v <application-dir>:/data webratio/phonegap phonegap serve -p 3000
-
-#### Run `phonegap build android`
-
-    docker run -v <application-dir>:/data webratio/phonegap phonegap build android
diff --git a/phonegap/6.2.2/Dockerfile b/phonegap/6.2.2/Dockerfile
new file mode 100644
index 0000000..80f890e
--- /dev/null
+++ b/phonegap/6.2.2/Dockerfile
@@ -0,0 +1,20 @@
+FROM nmaas87/webratio-android-sdk:r24.4.1
+
+# Installs PhoneGap
+# Forces a create and build in order to preload libraries
+ENV PHONEGAP_VERSION 6.2.2
+RUN npm install -g npm && \
+    npm install -g phonegap@${PHONEGAP_VERSION} && \
+    npm install -g xmldom && \
+    npm install -g xpath && \
+    cd /tmp && \
+    phonegap create fakeapp && \
+    cd /tmp/fakeapp && \
+    phonegap build android && \
+    cd && \
+    rm -rf /tmp/fakeapp
+
+VOLUME ["/data"]
+WORKDIR /data
+
+EXPOSE 3000
diff --git a/phonegap/6.4.2/Dockerfile b/phonegap/6.4.2/Dockerfile
new file mode 100644
index 0000000..a297db8
--- /dev/null
+++ b/phonegap/6.4.2/Dockerfile
@@ -0,0 +1,21 @@
+FROM nmaas87/webratio-android-sdk:r25.2.4
+
+# Installs PhoneGap
+# Forces a create and build in order to preload libraries
+ENV PHONEGAP_VERSION 6.4.2
+# Remove upgrade of npm because it breaks npm
+# RUN npm install -g npm && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
+    npm install -g xmldom && \
+    npm install -g xpath && \
+    cd /tmp && \
+    phonegap create fakeapp && \
+    cd /tmp/fakeapp && \
+    phonegap build android && \
+    cd && \
+    rm -rf /tmp/fakeapp
+
+VOLUME ["/data"]
+WORKDIR /data
+
+EXPOSE 3000
diff --git a/phonegap/6.4.2/README.md b/phonegap/6.4.2/README.md
new file mode 100644
index 0000000..15791e6
--- /dev/null
+++ b/phonegap/6.4.2/README.md
@@ -0,0 +1,41 @@
+## PhoneGap Dockerfile
+
+This repository contains **Dockerfile** of [PhoneGap](http://phonegap.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/nmaas87/webratio-phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-phonegap`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0-0.21.18`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0-0.21.19`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2-0.22.12`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0-0.24.2`
+  * `docker pull nmaas87/webratio-phonegap:6.0.3`
+  * `docker pull nmaas87/webratio-phonegap:6.1.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.2`
+  * `docker pull nmaas87/webratio-phonegap:6.4.2`
+  
+### Usage
+
+#### Run `phonegap create`
+
+    docker run -v <application-parent-dir>:/data nmaas87/webratio-phonegap phonegap create <application-name>
+
+#### Run `phonegap serve`
+
+    docker run -d -p <port>:3000 -v <application-dir>:/data nmaas87/webratio-phonegap phonegap serve -p 3000
+
+#### Run `phonegap build android`
+
+    docker run -v <application-dir>:/data nmaas87/webratio-phonegap phonegap build android
diff --git a/phonegap/6.5.0/Dockerfile b/phonegap/6.5.0/Dockerfile
new file mode 100644
index 0000000..39b33a5
--- /dev/null
+++ b/phonegap/6.5.0/Dockerfile
@@ -0,0 +1,21 @@
+FROM nmaas87/webratio-android-sdk:r25.2.5
+
+# Installs PhoneGap
+# Forces a create and build in order to preload libraries
+ENV PHONEGAP_VERSION 6.5.0
+# Remove upgrade of npm because it breaks npm
+# RUN npm install -g npm && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
+    npm install -g xmldom && \
+    npm install -g xpath && \
+    cd /tmp && \
+    phonegap create fakeapp && \
+    cd /tmp/fakeapp && \
+    phonegap build android && \
+    cd && \
+    rm -rf /tmp/fakeapp
+
+VOLUME ["/data"]
+WORKDIR /data
+
+EXPOSE 3000
diff --git a/phonegap/6.5.0/README.md b/phonegap/6.5.0/README.md
new file mode 100644
index 0000000..3af0d43
--- /dev/null
+++ b/phonegap/6.5.0/README.md
@@ -0,0 +1,42 @@
+## PhoneGap Dockerfile
+
+This repository contains **Dockerfile** of [PhoneGap](http://phonegap.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/nmaas87/webratio-phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-phonegap`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0-0.21.18`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0-0.21.19`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2-0.22.12`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0-0.24.2`
+  * `docker pull nmaas87/webratio-phonegap:6.0.3`
+  * `docker pull nmaas87/webratio-phonegap:6.1.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.2`
+  * `docker pull nmaas87/webratio-phonegap:6.4.2`
+  * `docker pull nmaas87/webratio-phonegap:6.5.0`
+  
+### Usage
+
+#### Run `phonegap create`
+
+    docker run -v <application-parent-dir>:/data nmaas87/webratio-phonegap phonegap create <application-name>
+
+#### Run `phonegap serve`
+
+    docker run -d -p <port>:3000 -v <application-dir>:/data nmaas87/webratio-phonegap phonegap serve -p 3000
+
+#### Run `phonegap build android`
+
+    docker run -v <application-dir>:/data nmaas87/webratio-phonegap phonegap build android
diff --git a/phonegap/6.5.2/Dockerfile b/phonegap/6.5.2/Dockerfile
new file mode 100644
index 0000000..03af106
--- /dev/null
+++ b/phonegap/6.5.2/Dockerfile
@@ -0,0 +1,22 @@
+FROM nmaas87/webratio-android-sdk:r26.1.1
+
+# Installs PhoneGap
+# Forces a create and build in order to preload libraries
+ENV PHONEGAP_VERSION 6.5.2
+# Remove upgrade of npm because it breaks npm
+# RUN npm install -g npm && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
+    npm install -g xmldom && \
+    npm install -g xpath && \
+    cd /tmp && \
+    phonegap analytics off && \
+    phonegap create fakeapp && \
+    cd /tmp/fakeapp && \
+    phonegap build android && \
+    cd && \
+    rm -rf /tmp/fakeapp
+
+VOLUME ["/data"]
+WORKDIR /data
+
+EXPOSE 3000
diff --git a/phonegap/6.5.2/README.md b/phonegap/6.5.2/README.md
new file mode 100644
index 0000000..3af0d43
--- /dev/null
+++ b/phonegap/6.5.2/README.md
@@ -0,0 +1,42 @@
+## PhoneGap Dockerfile
+
+This repository contains **Dockerfile** of [PhoneGap](http://phonegap.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/nmaas87/webratio-phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-phonegap`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0-0.21.18`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0-0.21.19`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2-0.22.12`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0-0.24.2`
+  * `docker pull nmaas87/webratio-phonegap:6.0.3`
+  * `docker pull nmaas87/webratio-phonegap:6.1.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.2`
+  * `docker pull nmaas87/webratio-phonegap:6.4.2`
+  * `docker pull nmaas87/webratio-phonegap:6.5.0`
+  
+### Usage
+
+#### Run `phonegap create`
+
+    docker run -v <application-parent-dir>:/data nmaas87/webratio-phonegap phonegap create <application-name>
+
+#### Run `phonegap serve`
+
+    docker run -d -p <port>:3000 -v <application-dir>:/data nmaas87/webratio-phonegap phonegap serve -p 3000
+
+#### Run `phonegap build android`
+
+    docker run -v <application-dir>:/data nmaas87/webratio-phonegap phonegap build android
diff --git a/phonegap/7.1.1/Dockerfile b/phonegap/7.1.1/Dockerfile
new file mode 100644
index 0000000..eb53070
--- /dev/null
+++ b/phonegap/7.1.1/Dockerfile
@@ -0,0 +1,22 @@
+FROM nmaas87/webratio-android-sdk:r26.1.1
+
+# Installs PhoneGap
+# Forces a create and build in order to preload libraries
+ENV PHONEGAP_VERSION 7.1.1
+# Remove upgrade of npm because it breaks npm
+# RUN npm install -g npm && \
+RUN npm install -g phonegap@${PHONEGAP_VERSION} && \
+    npm install -g xmldom && \
+    npm install -g xpath && \
+    cd /tmp && \
+    phonegap analytics off && \
+    phonegap create fakeapp && \
+    cd /tmp/fakeapp && \
+    phonegap build android && \
+    cd && \
+    rm -rf /tmp/fakeapp
+
+VOLUME ["/data"]
+WORKDIR /data
+
+EXPOSE 3000
diff --git a/phonegap/7.1.1/README.md b/phonegap/7.1.1/README.md
new file mode 100644
index 0000000..3af0d43
--- /dev/null
+++ b/phonegap/7.1.1/README.md
@@ -0,0 +1,42 @@
+## PhoneGap Dockerfile
+
+This repository contains **Dockerfile** of [PhoneGap](http://phonegap.com/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/nmaas87/webratio-phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-phonegap`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0`
+  * `docker pull nmaas87/webratio-phonegap:3.5.0-0.21.18`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0`
+  * `docker pull nmaas87/webratio-phonegap:3.6.0-0.21.19`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3`
+  * `docker pull nmaas87/webratio-phonegap:3.6.3-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0`
+  * `docker pull nmaas87/webratio-phonegap:4.0.0-0.22.7`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2`
+  * `docker pull nmaas87/webratio-phonegap:4.1.2-0.22.12`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0`
+  * `docker pull nmaas87/webratio-phonegap:4.2.0-0.24.2`
+  * `docker pull nmaas87/webratio-phonegap:6.0.3`
+  * `docker pull nmaas87/webratio-phonegap:6.1.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.0`
+  * `docker pull nmaas87/webratio-phonegap:6.2.2`
+  * `docker pull nmaas87/webratio-phonegap:6.4.2`
+  * `docker pull nmaas87/webratio-phonegap:6.5.0`
+  
+### Usage
+
+#### Run `phonegap create`
+
+    docker run -v <application-parent-dir>:/data nmaas87/webratio-phonegap phonegap create <application-name>
+
+#### Run `phonegap serve`
+
+    docker run -d -p <port>:3000 -v <application-dir>:/data nmaas87/webratio-phonegap phonegap serve -p 3000
+
+#### Run `phonegap build android`
+
+    docker run -v <application-dir>:/data nmaas87/webratio-phonegap phonegap build android
diff --git a/postgresql-with-plperl/8.4/Dockerfile b/postgresql-with-plperl/8.4/Dockerfile
deleted file mode 100644
index 87779dd..0000000
--- a/postgresql-with-plperl/8.4/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM postgres:8.4
-
-RUN apt-get update \
-    && apt-get install -y postgresql-plperl-8.4=8.4.22-1.pgdg70+1 \
-    && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/postgresql-with-plperl/8.4/README.md b/postgresql-with-plperl/8.4/README.md
deleted file mode 100644
index 7e5d7fe..0000000
--- a/postgresql-with-plperl/8.4/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-## PhoneGap Dockerfile
-
-This repository contains **Dockerfile** of [PostgreSQL](http://www.postgresql.org/) combined with PL/Perl for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/phonegap/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/postgresql-with-plperl:8.4`
-
-### Usage
-
-See the verified PostgreSQL image [documentation](https://registry.hub.docker.com/_/postgres/)
-
-#### Add PL/Perl to a database
-
-    docker exec <container-id> createlang -U <db-user> plperl <db-name>