diff --git a/.gitignore b/.gitignore
index 5077f86..a6c0c8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 release
 coverage.out
 vendor
+buildah-binaries
diff --git a/Dockerfile-build-buildah b/Dockerfile-build-buildah
new file mode 100644
index 0000000..4a1fe36
--- /dev/null
+++ b/Dockerfile-build-buildah
@@ -0,0 +1,33 @@
+FROM fedora
+
+RUN dnf -y install \
+    make \
+    golang \
+    bats \
+    btrfs-progs-devel \
+    device-mapper-devel \
+    glib2-devel \
+    gpgme-devel \
+    libassuan-devel \
+    libseccomp-devel \
+    git \
+    bzip2 \
+    go-md2man \
+    runc \
+    containers-common \
+    skopeo-containers
+
+# Workaround - the first install somehow leaves the golang in a bad state
+RUN dnf -y install golang
+
+ARG GIT_USER_NAME
+RUN git config --global user.name "$GIT_USER_NAME"
+
+ARG GIT_USER_EMAIL
+RUN git config --global user.email "$GIT_USER_EMAIL"
+
+RUN mkdir /root/buildah && \
+    cd /root/buildah && \
+    git clone https://github.com/harness/buildah.git ./src/github.com/containers/buildah
+
+RUN cd /root/buildah/src/github.com/containers/buildah && make && sudo make install
diff --git a/build-buildah-binaries.sh b/build-buildah-binaries.sh
new file mode 100755
index 0000000..f445357
--- /dev/null
+++ b/build-buildah-binaries.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+docker build --build-arg=GIT_USER_NAME="$(git config user.name)" --build-arg=GIT_USER_EMAIL="$(git config user.email)" \
+    -f Dockerfile-build-buildah -t buildah-dev .
+
+mkdir buildah-binaries
+
+docker container create --name extract buildah-dev  
+docker container cp extract:/root/buildah/src/github.com/containers/buildah/bin ./buildah-binaries
+docker container rm -f extract
\ No newline at end of file
diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64
index 239f8c0..22aea7d 100644
--- a/docker/docker/Dockerfile.linux.amd64
+++ b/docker/docker/Dockerfile.linux.amd64
@@ -5,7 +5,7 @@ WORKDIR /home/build
 RUN export STORAGE_DRIVER=vfs
 # Add plugin binary
 ADD release/linux/amd64/drone-docker /bin/
-ADD prebuilt/buildah /bin/
-ADD prebuilt/imgtype /bin/
-ADD prebuilt/copy /bin/
+ADD buildah-binaries/bin/buildah /bin/
+ADD buildah-binaries/bin/imgtype /bin/
+ADD buildah-binaries/bin/copy /bin/
 ENTRYPOINT ["/bin/drone-docker"]
\ No newline at end of file
diff --git a/prebuilt/buildah b/prebuilt/buildah
deleted file mode 100755
index 22e1436..0000000
Binary files a/prebuilt/buildah and /dev/null differ
diff --git a/prebuilt/copy b/prebuilt/copy
deleted file mode 100755
index 24f733c..0000000
Binary files a/prebuilt/copy and /dev/null differ
diff --git a/prebuilt/imgtype b/prebuilt/imgtype
deleted file mode 100755
index 831497f..0000000
Binary files a/prebuilt/imgtype and /dev/null differ