diff --git a/modules/jenkins/files/slave_scripts/maven-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh
deleted file mode 100755
index 7386acb20c..0000000000
--- a/modules/jenkins/files/slave_scripts/maven-properties.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -ex
-
-# This file is a helper for versioning and deployment of
-# maven projects.  It sets up environment variables to
-# pass to maven build commands so that we can generate
-# versioned builds within the gerrit workflow.
-
-# get version info from scm
-SCM_TAG=`git describe --abbrev=0 --tags` || true
-SCM_SHA=`git rev-parse --short HEAD` || true
-
-# assumes format is like this  '0.0.4-2-g135721c'
-COMMITS_SINCE_TAG=`git describe | awk '{split($0,a,"-"); print a[2]}'` || true
-
-# just use git sha if there is no tag yet.
-if [[ "${SCM_TAG}" == "" ]]; then
-    SCM_TAG=$SCM_SHA
-fi
-
-# General build version should be something like '0.0.4.3.d4ee90c'
-# Release build version should be something like '0.0.5'
-if [[ "${COMMITS_SINCE_TAG}" == "" ]]; then
-    PROJECT_VER=$SCM_TAG
-else
-    PROJECT_VER="$SCM_TAG.$COMMITS_SINCE_TAG.$SCM_SHA";
-fi
-
-echo "SCM_SHA=$SCM_SHA" >maven.properties
-echo "PROJECT_VER=$PROJECT_VER" >>maven.properties
-echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>maven.properties
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
index 229193e185..88bdb2fd28 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
@@ -110,9 +110,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -149,9 +149,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -184,9 +184,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
index 14deaf2ed4..9b91f27700 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
@@ -32,9 +32,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/maven-properties.sh
+            /usr/local/jenkins/slave_scripts/version-properties.sh
         - inject:
-            properties-file: maven.properties
+            properties-file: version.properties
         - shell: |
             #!/bin/bash -xe
             # fetch drush
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
index e72ff45740..3e278c4a0c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@@ -12,9 +12,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - js-build:
           command: 'test'
           envlist: 'grunt'
@@ -49,9 +49,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - js-build:
           command: 'build'
           envlist: 'grunt'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index 9d0d6b1bc3..dbf6b7756e 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
@@ -16,9 +16,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -44,9 +44,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
index ba7b12c404..94f9a62fb0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
@@ -16,9 +16,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -44,9 +44,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
index b99fa97924..9383d17564 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
@@ -26,9 +26,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/maven-properties.sh
+            /usr/local/jenkins/slave_scripts/version-properties.sh
         - inject:
-            properties-file: maven.properties
+            properties-file: version.properties
         - shell: |
             #!/bin/bash -xe
             /usr/local/jenkins/slave_scripts/php-laravel-build.sh