diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2fee872b7..a7a3c8076 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v1
+
+      - name: set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: build package
         run: ./tests/ci/setup.sh build
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c224544cc..2d90c24da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,20 +27,20 @@ jobs:
         with:
           ruby-version: 2.6
 
-      - name: Login to Docker Hub
+      - name: login to docker hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up QEMU
+      - name: set up qemu
         uses: docker/setup-qemu-action@v1
 
-      - name: Set up Docker Buildx
+      - name: set up docker buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Inspect builder
+      - name: inspect builder
         run: |
           echo "Name:      ${{ steps.buildx.outputs.name }}"
           echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
diff --git a/contrib/release-dokku b/contrib/release-dokku
index 42bceb339..1ec03cac0 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -363,7 +363,8 @@ fn-build-docker-image() {
     docker buildx build \
       --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
       --progress plain \
-      --tag "dokku/dokku:$VERSION" .
+      --tag "dokku/dokku:latest" \
+      --tag "dokku/dokku:$(echo "$VERSION" | tr + -)" .
   fi
 }
 
@@ -422,6 +423,8 @@ main() {
     fn-build-docker-image "$NEXT_VERSION" "$IS_RELEASE" || log-fail "Error building docker image"
 
     fn-repo-push-tags "$IS_RELEASE"
+  else
+    fn-build-docker-image "$NEXT_VERSION" "$IS_RELEASE" || log-fail "Error building docker image"
   fi
 
   if [[ "$IS_RELEASE" != "true" ]]; then