diff --git a/ios/scripts/set_xcode_version.sh b/ios/scripts/set_xcode_version.sh
index d88d3dd2ae..c3fa745b19 100755
--- a/ios/scripts/set_xcode_version.sh
+++ b/ios/scripts/set_xcode_version.sh
@@ -23,42 +23,12 @@ if [[ $(git ls-files -m "StatusIm/Info.plist") = *"Info.plist"* ]]; then
     echo "version was set in Info.plist"
 else
     RELEASE_VERSION=$(cat ../VERSION)
-    # Build version (closest-tag-or-branch "-" commits-since-tag "-" short-hash dirty-flag)
-    BUILD_VERSION="${RELEASE_VERSION}-$(git describe --always --dirty=+)"
-
-    # Use the latest tag for short version (expected tag format "vn[.n[.n]]")
-    # or if there are no tags, we make up version 0.0.<commit count>
-    LATEST_TAG=${RELEASE_VERSION} || LATEST_TAG="HEAD"
-    if [ $LATEST_TAG = "HEAD" ]
-    then COMMIT_COUNT=$(git rev-list --count HEAD)
-        LATEST_TAG="0.0.$COMMIT_COUNT"
-        COMMIT_COUNT_SINCE_TAG=0
-    else
-        VERSION_CHANGE_COMMIT=$(git log -n 1 --pretty=format:%H -- ../VERSION)
-        COMMIT_COUNT_SINCE_TAG=$(git rev-list --count ${VERSION_CHANGE_COMMIT}..)
-        LATEST_TAG=${LATEST_TAG##v} # Remove the "v" from the front of the tag
-    fi
-    if [ $COMMIT_COUNT_SINCE_TAG = 0 ]; then
-        SHORT_VERSION="$LATEST_TAG"
-    else
-        # increment final digit of tag and append "d" + commit-count-since-tag
-        # e.g. commit after 1.0 is 1.1d1, commit after 1.0.0 is 1.0.1d1
-        # this is the bit that requires /bin/bash
-        OLD_IFS=$IFS
-        IFS="."
-        VERSION_PARTS=($LATEST_TAG)
-        LAST_PART=$((${#VERSION_PARTS[@]}-1))
-        VERSION_PARTS[$LAST_PART]=$((${VERSION_PARTS[${LAST_PART}]}+1))
-        SHORT_VERSION="${VERSION_PARTS[*]}d${COMMIT_COUNT_SINCE_TAG}"
-        IFS=$OLD_IFS
-    fi
+    BUILD_NO=$(sh ../scripts/build_no.sh)
 
     # For debugging:
-    echo "BUILD VERSION: $BUILD_VERSION"
-    echo "LATEST_TAG: $LATEST_TAG"
-    echo "COMMIT_COUNT_SINCE_TAG: $COMMIT_COUNT_SINCE_TAG"
-    echo "SHORT VERSION: $SHORT_VERSION"
+    echo "SHORT VERSION: $RELEASE_VERSION"
+    echo "BUILD NO: $BUILD_NO"
 
-    /usr/libexec/PlistBuddy -c "Add :CFBundleBuildVersion string $BUILD_VERSION" "$INFO_PLIST" 2>/dev/null || /usr/libexec/PlistBuddy -c "Set :CFBundleBuildVersion $BUILD_VERSION" "$INFO_PLIST"
-    /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_VERSION" "$INFO_PLIST"
+    /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $BUILD_NO" "$INFO_PLIST" 2>/dev/null || /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $BUILD_NO" "$INFO_PLIST"
+    /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $RELEASE_VERSION" "$INFO_PLIST"
 fi