diff --git a/bin/check-dist b/bin/check-dist
index 96d376586..8573eafe5 100755
--- a/bin/check-dist
+++ b/bin/check-dist
@@ -19,6 +19,10 @@ else
               || check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"); then
             STATUS=1
         fi
+        if ! (check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}-py3-none-any.whl" \
+              || check_file "${DIST}/${PACKAGE}-${VERSION}-py3-none-any.whl"); then
+            STATUS=1
+        fi
     done
 fi
 
diff --git a/bin/release b/bin/release
index 9d73b036e..5ee1933b6 100755
--- a/bin/release
+++ b/bin/release
@@ -22,6 +22,7 @@ fi
 source "${ROOT}/bin/dist-functions"
 for PACKAGE in "neo4j-driver" "neo4j"; do
     NORMALIZED_PACKAGE="$(normalize_dist_name "$PACKAGE")"
+
     if check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}.tar.gz"
     then
         TWINE_ARGS="${TWINE_ARGS} ${DIST}/${NORMALIZED_PACKAGE}-${VERSION}.tar.gz"
@@ -31,18 +32,16 @@ for PACKAGE in "neo4j-driver" "neo4j"; do
         echo "Source distribution file for ${PACKAGE} not found"
         exit 1
     fi
-done
-
-NORMALIZED_PACKAGE="$(normalize_dist_name "neo4j")"
-if check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}-py3-none-any.whl"
-then
-    TWINE_ARGS="${TWINE_ARGS} ${DIST}/${NORMALIZED_PACKAGE}-${VERSION}-py3-none-any.whl"
-elif check_file "${DIST}/${PACKAGE}-${VERSION}-py3-none-any.whl"; then
-    TWINE_ARGS="${TWINE_ARGS} ${DIST}/${PACKAGE}-${VERSION}-py3-none-any.whl"
-else
-    echo "Wheel distribution file for ${PACKAGE} not found"
-    exit 1
-fi
 
+    if check_file "${DIST}/${NORMALIZED_PACKAGE}-${VERSION}-py3-none-any.whl"
+    then
+        TWINE_ARGS="${TWINE_ARGS} ${DIST}/${NORMALIZED_PACKAGE}-${VERSION}-py3-none-any.whl"
+    elif check_file "${DIST}/${PACKAGE}-${VERSION}-py3-none-any.whl"; then
+        TWINE_ARGS="${TWINE_ARGS} ${DIST}/${PACKAGE}-${VERSION}-py3-none-any.whl"
+    else
+        echo "Wheel distribution file for ${PACKAGE} not found"
+        exit 1
+    fi
+done
 
 twine upload ${TWINE_ARGS}