diff --git a/.circleci/config.yml b/.circleci/config.yml
index 419719e1c..6bdc529f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
       - run: |
           make ci-dependencies
       - run: |
-          ./contrib/release build
+          ./contrib/release-dokku build
           ./tests/ci/setup.sh
       - run: |
           echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
diff --git a/contrib/update-build.Dockerfile b/contrib/build-dokku-update.Dockerfile
similarity index 100%
rename from contrib/update-build.Dockerfile
rename to contrib/build-dokku-update.Dockerfile
diff --git a/contrib/build.Dockerfile b/contrib/build-dokku.Dockerfile
similarity index 100%
rename from contrib/build.Dockerfile
rename to contrib/build-dokku.Dockerfile
diff --git a/contrib/herokuish-build.Dockerfile b/contrib/build-herokuish.Dockerfile
similarity index 100%
rename from contrib/herokuish-build.Dockerfile
rename to contrib/build-herokuish.Dockerfile
diff --git a/contrib/release b/contrib/release-dokku
similarity index 99%
rename from contrib/release
rename to contrib/release-dokku
index 832c7a227..519cbdaa4 100755
--- a/contrib/release
+++ b/contrib/release-dokku
@@ -49,7 +49,7 @@ fn-build-dokku() {
     --build-arg IS_RELEASE="$IS_RELEASE" \
     --build-arg PLUGIN_MAKE_TARGET="build" \
     --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
-    -f "contrib/build.Dockerfile" \
+    -f "contrib/build-dokku.Dockerfile" \
     -t "$NAME" .
   return "$?"
 }
diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update
index 6f999ac5b..ff65578ff 100755
--- a/contrib/release-dokku-update
+++ b/contrib/release-dokku-update
@@ -32,7 +32,7 @@ fn-build-dokku() {
 
   pushd "$ROOT_DIR" >/dev/null
   docker build \
-    -f "contrib/update-build.Dockerfile" \
+    -f "contrib/build-dokku-update.Dockerfile" \
     -t dokku-update:build .
   return "$?"
 }
diff --git a/contrib/release-herokuish b/contrib/release-herokuish
index 9a3bc96b3..381897f15 100755
--- a/contrib/release-herokuish
+++ b/contrib/release-herokuish
@@ -32,7 +32,7 @@ fn-build-dokku() {
 
   pushd "$ROOT_DIR" >/dev/null
   docker build \
-    -f "contrib/herokuish-build.Dockerfile" \
+    -f "contrib/build-herokuish.Dockerfile" \
     -t herokuish:build .
   return "$?"
 }
diff --git a/docs/development/release-process.md b/docs/development/release-process.md
index 9d76c8985..872c6f443 100644
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -7,7 +7,7 @@ To propose a release, the following tasks need to be performed:
 ```shell
 export PACKAGECLOUD_TOKEN=SOME_TOKEN
 # supports major/minor/patch/betafish
-contrib/release
+contrib/release-dokku
 ```
 
 > If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
index 9bfb8fcc9..143444bf9 100755
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -43,7 +43,7 @@ install_dokku() {
     return
   fi
 
-  "${ROOT_DIR}/contrib/release" build
+  "${ROOT_DIR}/contrib/release-dokku" build
 
   echo "dokku dokku/hostname string dokku.me" | sudo debconf-set-selections
   echo "dokku dokku/key_file string /root/.ssh/id_rsa.pub" | sudo debconf-set-selections