diff --git a/hyperon_das_atomdb_cpp/scripts/_build_glibc_wheel.sh b/hyperon_das_atomdb_cpp/scripts/_build_glibc_wheel.sh
index 13a46e8..9d9535f 100755
--- a/hyperon_das_atomdb_cpp/scripts/_build_glibc_wheel.sh
+++ b/hyperon_das_atomdb_cpp/scripts/_build_glibc_wheel.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $(dirname $0)/common.sh
+
 # This script is used to build a wheel for the current package.
 
 TMP_DEST_DIR="tmp_dist"
@@ -7,7 +9,7 @@ DEST_DIR="dist"
 
 # Remove existing/old wheel files
 rm -rf ${TMP_DEST_DIR}
-rm -f ${DEST_DIR}/*manylinux*.whl
+rm -f ${DEST_DIR}/${GLIBC_WHEEL_NAME_PATTERN}
 
 # Create dirs
 mkdir -p ${TMP_DEST_DIR} ${DEST_DIR}
@@ -18,7 +20,7 @@ ${PYTHON_EXECUTABLE} -m pip wheel . --wheel-dir ${TMP_DEST_DIR}
 [ $? -ne 0 ] && exit 1
 
 # Repair wheel - tag as manylinux
-find ${TMP_DEST_DIR} -type f -name "*.whl" \
+find ${TMP_DEST_DIR} -type f -name "*abi3-linux_x86_64.whl" \
   -exec ${PYTHON_EXECUTABLE} -m auditwheel repair {} -w ${DEST_DIR} \;
 [ $? -ne 0 ] && exit 1
 
diff --git a/hyperon_das_atomdb_cpp/scripts/_build_musl_wheel.sh b/hyperon_das_atomdb_cpp/scripts/_build_musl_wheel.sh
index 800cef1..e482570 100755
--- a/hyperon_das_atomdb_cpp/scripts/_build_musl_wheel.sh
+++ b/hyperon_das_atomdb_cpp/scripts/_build_musl_wheel.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source $(dirname $0)/common.sh
+
 # This script is used to build a wheel for the current package.
 
 TMP_DEST_DIR="tmp_dist"
@@ -7,7 +9,7 @@ DEST_DIR="dist"
 
 # Remove existing/old wheel files
 rm -rf ${TMP_DEST_DIR}
-rm -f ${DEST_DIR}/*musllinux*.whl
+rm -f ${DEST_DIR}/${MUSL_WHEEL_NAME_PATTERN}
 
 # Create dirs
 mkdir -p ${TMP_DEST_DIR} ${DEST_DIR}
@@ -18,7 +20,7 @@ ${PYTHON_EXECUTABLE} -m pip wheel . --wheel-dir ${TMP_DEST_DIR}
 [ $? -ne 0 ] && exit 1
 
 # Repair wheel - tag as manylinux
-find ${TMP_DEST_DIR} -type f -name "*.whl" \
+find ${TMP_DEST_DIR} -type f -name "*abi3-linux_x86_64.whl" \
   -exec ${PYTHON_EXECUTABLE} -m auditwheel repair {} -w ${DEST_DIR} \;
 [ $? -ne 0 ] && exit 1
 
diff --git a/hyperon_das_atomdb_cpp/scripts/build_glibc_wheeler_docker_image.sh b/hyperon_das_atomdb_cpp/scripts/build_glibc_wheeler_docker_image.sh
index 88e699d..e6259e7 100755
--- a/hyperon_das_atomdb_cpp/scripts/build_glibc_wheeler_docker_image.sh
+++ b/hyperon_das_atomdb_cpp/scripts/build_glibc_wheeler_docker_image.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${PWD}/scripts/common.sh
+source $(dirname $0)/common.sh
 
 docker buildx build -t ${WHEELER_GLIBC_CONTAINER_NAME} \
   --load -f ${WHEELER_GLIBC_DOCKER_FILE} .
diff --git a/hyperon_das_atomdb_cpp/scripts/build_musl_wheeler_docker_image.sh b/hyperon_das_atomdb_cpp/scripts/build_musl_wheeler_docker_image.sh
index 430744b..cea2125 100755
--- a/hyperon_das_atomdb_cpp/scripts/build_musl_wheeler_docker_image.sh
+++ b/hyperon_das_atomdb_cpp/scripts/build_musl_wheeler_docker_image.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${PWD}/scripts/common.sh
+source $(dirname $0)/common.sh
 
 docker buildx build -t ${WHEELER_MUSL_CONTAINER_NAME} \
   --load -f ${WHEELER_MUSL_DOCKER_FILE} .
diff --git a/hyperon_das_atomdb_cpp/scripts/common.sh b/hyperon_das_atomdb_cpp/scripts/common.sh
index 477505a..5c72058 100644
--- a/hyperon_das_atomdb_cpp/scripts/common.sh
+++ b/hyperon_das_atomdb_cpp/scripts/common.sh
@@ -1,7 +1,9 @@
 # AlmaLinux variables
 WHEELER_GLIBC_CONTAINER_NAME="das-atomdb-cpp-glibc-wheeler"
 WHEELER_GLIBC_DOCKER_FILE="docker/Dockerfile.glibc.wheeler"
+GLIBC_WHEEL_NAME_PATTERN="*manylinux_2_28_x86_64*.whl"
 
 # Alpine variables
 WHEELER_MUSL_CONTAINER_NAME="das-atomdb-cpp-musl-wheeler"
 WHEELER_MUSL_DOCKER_FILE="docker/Dockerfile.musl.wheeler"
+MUSL_WHEEL_NAME_PATTERN="*musllinux_1_2_x86_64*.whl"
diff --git a/hyperon_das_atomdb_cpp/scripts/run_glibc_wheeler.sh b/hyperon_das_atomdb_cpp/scripts/run_glibc_wheeler.sh
index bd57064..e02c797 100755
--- a/hyperon_das_atomdb_cpp/scripts/run_glibc_wheeler.sh
+++ b/hyperon_das_atomdb_cpp/scripts/run_glibc_wheeler.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${PWD}/scripts/common.sh
+source $(dirname $0)/common.sh
 
 # Build the wheel for GLIBC
 docker run --rm \
diff --git a/hyperon_das_atomdb_cpp/scripts/run_musl_wheeler.sh b/hyperon_das_atomdb_cpp/scripts/run_musl_wheeler.sh
index 7c48ff6..c01bccd 100755
--- a/hyperon_das_atomdb_cpp/scripts/run_musl_wheeler.sh
+++ b/hyperon_das_atomdb_cpp/scripts/run_musl_wheeler.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${PWD}/scripts/common.sh
+source $(dirname $0)/common.sh
 
 # Build the wheel for MUSL
 docker run --rm \