diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh
index 0ada062505..4e4051e854 100755
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -132,9 +132,9 @@ ln -fv $RELOC_PKG_FULLPATH ../$PRODUCT-server_$SCYLLA_VERSION-$SCYLLA_RELEASE.or
 
 cp -al dist/debian/debian debian
 if [ "$PRODUCT" != "scylla" ]; then
-    for i in debian/scylla-*;do
-        mv $i ${i/scylla-/$PRODUCT-}
-    done
+    # rename all 'scylla-' prefixed artifacts in the debian folder to have the 
+    # product name as a prefix
+    find debian -maxdepth 1 -name "scylla-*" -exec bash -c 'mv $1 ${1/scylla-/$PRODUCT-}' _ {} \;
 fi
 ln -fv dist/common/sysconfig/scylla-server debian/$PRODUCT-server.default
 REVISION="1"
diff --git a/dist/debian/python3/build_deb.sh b/dist/debian/python3/build_deb.sh
index e8fbf4e6d4..6aacb950e4 100755
--- a/dist/debian/python3/build_deb.sh
+++ b/dist/debian/python3/build_deb.sh
@@ -126,9 +126,9 @@ ln -fv $RELOC_PKG_FULLPATH ../$PRODUCT-python3_$SCYLLA_VERSION-$SCYLLA_RELEASE.o
 
 cp -al dist/debian/python3/debian debian
 if [ "$PRODUCT" != "scylla" ]; then
-    for i in debian/scylla-*;do
-        mv $i ${i/scylla-/$PRODUCT-}
-    done
+    # rename all 'scylla-' prefixed artifacts in the debian folder to have the 
+    # product name as a prefix
+    find debian -maxdepth 1 -name "scylla-*" -exec bash -c 'mv $1 ${1/scylla-/$PRODUCT-}' _ {} \;
 fi
 REVISION="1"
 MUSTACHE_DIST="\"debian\": true, \"product\": \"$PRODUCT\", \"$PRODUCT\": true"