diff --git a/.travis.yml b/.travis.yml
index 29f67bb..f4537ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,11 @@ env:
   - VERSION=3.4 VARIANT=alpine3.6
   - VERSION=3.3 VARIANT=alpine3.6
   - VERSION=3.2 VARIANT=alpine3.6
-  - VERSION=4.0 VARIANT=stretch ONBUILD=1
-  - VERSION=3.4 VARIANT=stretch ONBUILD=1
-  - VERSION=3.3 VARIANT=stretch ONBUILD=1
-  - VERSION=3.2 VARIANT=stretch ONBUILD=1
-  - VERSION=3.1 VARIANT=stretch ONBUILD=1
+  - VERSION=4.0 VARIANT=stretch
+  - VERSION=3.4 VARIANT=stretch
+  - VERSION=3.3 VARIANT=stretch
+  - VERSION=3.2 VARIANT=stretch
+  - VERSION=3.1 VARIANT=stretch
   - VERSION=4.0 VARIANT=jessie
   - VERSION=3.4 VARIANT=jessie
   - VERSION=3.3 VARIANT=jessie
@@ -40,7 +40,6 @@ before_script:
 script:
   - docker build -t "$image" "${VARIANT:-.}"
   - ~/official-images/test/run.sh "$image"
-  - if [ -n "$ONBUILD" ]; then docker build -t "${image}-onbuild" onbuild; fi
 
 after_script:
   - docker images
diff --git a/3.1/onbuild/Dockerfile b/3.1/onbuild/Dockerfile
deleted file mode 100644
index 1d3f823..0000000
--- a/3.1/onbuild/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "haxe update.hxml"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM haxe:3.1.3
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/3.2/onbuild/Dockerfile b/3.2/onbuild/Dockerfile
deleted file mode 100644
index fce175e..0000000
--- a/3.2/onbuild/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "haxe update.hxml"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM haxe:3.2.1
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/3.3/onbuild/Dockerfile b/3.3/onbuild/Dockerfile
deleted file mode 100644
index 329dad8..0000000
--- a/3.3/onbuild/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "haxe update.hxml"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM haxe:3.3.0-rc.1
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/3.4/onbuild/Dockerfile b/3.4/onbuild/Dockerfile
deleted file mode 100644
index 909b71a..0000000
--- a/3.4/onbuild/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "haxe update.hxml"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM haxe:3.4.7
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/4.0/onbuild/Dockerfile b/4.0/onbuild/Dockerfile
deleted file mode 100644
index df13a22..0000000
--- a/4.0/onbuild/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "haxe update.hxml"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM haxe:4.0.0-rc.3
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template
deleted file mode 100644
index 257c4ae..0000000
--- a/Dockerfile-onbuild.template
+++ /dev/null
@@ -1,15 +0,0 @@
-::HEADER::
-
-FROM haxe:::HAXE_VERSION::
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# install dependencies
-ONBUILD COPY *.hxml /usr/src/app/
-ONBUILD RUN yes | haxelib install all
-
-# compile the project
-ONBUILD COPY . /usr/src/app
-ONBUILD ARG BUILD_HXML=build.hxml
-ONBUILD RUN haxe $BUILD_HXML
\ No newline at end of file
diff --git a/Update.hx b/Update.hx
index 42766c4..d6c400f 100644
--- a/Update.hx
+++ b/Update.hx
@@ -67,10 +67,6 @@ class Update {
 			"variant": "jessie",
 			"suffix": ["jessie"]
 		},
-		{
-			"variant": "onbuild",
-			"suffix": ["onbuild"]
-		},
 		{
 			"variant": "windowsservercore-ltsc2016",
 			"suffix": ["windowsservercore-ltsc2016", "windowsservercore"]