diff --git a/nova/templates/bin/_cell-setup.sh.tpl b/nova/templates/bin/_cell-setup.sh.tpl
old mode 100644
new mode 100755
index abd1ffa57a..4a7010142d
--- a/nova/templates/bin/_cell-setup.sh.tpl
+++ b/nova/templates/bin/_cell-setup.sh.tpl
@@ -18,7 +18,7 @@ limitations under the License.
 
 set -ex
 
-NOVA_VERSION=$(nova-manage --version 2>&1)
+NOVA_VERSION=$(nova-manage --version 2>&1 | grep -Eo '[0-9]+[.][0-9]+[.][0-9]+')
 
 # NOTE(portdirect): check if nova fully supports cells v2, and manage
 # accordingly. Support was complete in ocata (V14.x.x).
diff --git a/nova/templates/bin/_db-sync.sh.tpl b/nova/templates/bin/_db-sync.sh.tpl
old mode 100644
new mode 100755
index 4e38a74624..ba6571967d
--- a/nova/templates/bin/_db-sync.sh.tpl
+++ b/nova/templates/bin/_db-sync.sh.tpl
@@ -17,7 +17,7 @@ limitations under the License.
 */}}
 
 set -ex
-NOVA_VERSION=$(nova-manage --version 2>&1)
+NOVA_VERSION=$(nova-manage --version 2>&1 | grep -Eo '[0-9]+[.][0-9]+[.][0-9]+')
 
 function manage_cells () {
   # NOTE(portdirect): check if nova fully supports cells v2, and manage