diff --git a/Gruntfile.js b/Gruntfile.js
index 84b88b5d..2f5ad03b 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,7 +19,7 @@
 'use strict';
 
 var pkg = require('./package.json');
-var AV_CONFIG_VERSION = 'master';
+var AV_CONFIG_VERSION = '5.0.0';
 
 //Using exclusion patterns slows down Grunt significantly
 //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
@@ -165,10 +165,10 @@ module.exports = function (grunt) {
         options: {
           remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
           append: [
-            {selector:'body',html:'<script src="/libnocompat-vmaster.js"></script>'},
+            {selector:'body',html:'<script src="/libnocompat-v5.0.0.js"></script>'},
             {selector:'body',html:'<!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-common/blob/master/README.md -->'},
-            {selector:'body',html:'<script src="/appCommon-vmaster.js"></script>'},
-            {selector:'body',html:'<script src="/avPlugins-vmaster.js"></script>'},
+            {selector:'body',html:'<script src="/appCommon-v5.0.0.js"></script>'},
+            {selector:'body',html:'<script src="/avPlugins-v5.0.0.js"></script>'},
             {selector:'head',html:'<link rel="stylesheet" id="theme" href="/themes/default/app.min.css">'}
           ]
         },
@@ -194,9 +194,9 @@ module.exports = function (grunt) {
           'temp/libnocompat.js': ['<%= dom_munger.data.libnocompatjs %>'],
           'temp/lib.js': ['<%= dom_munger.data.libjs %>'],
           'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>'],
-          'dist/avConfig-vmaster.js': ['avConfig.js'],
-          'dist/avThemes-vmaster.js': ['avThemes.js'],
-          'dist/avPlugins-vmaster.js': ['plugins/**/*.js']
+          'dist/avConfig-v5.0.0.js': ['avConfig.js'],
+          'dist/avThemes-v5.0.0.js': ['avThemes.js'],
+          'dist/avPlugins-v5.0.0.js': ['plugins/**/*.js']
         }
       }
     },
@@ -229,9 +229,9 @@ module.exports = function (grunt) {
           beautify: true
         },
         files: {
-          'dist/appCommon-vmaster.js': 'temp/app.js',
-          'dist/libCommon-vmaster.js': 'temp/lib.js',
-          'dist/libnocompat-vmaster.js': 'temp/libnocompat.js',
+          'dist/appCommon-v5.0.0.js': 'temp/app.js',
+          'dist/libCommon-v5.0.0.js': 'temp/lib.js',
+          'dist/libnocompat-v5.0.0.js': 'temp/libnocompat.js',
           'dist/avWidgets.js': 'avWidgets.js',
 
           "dist/locales/moment/es.js": "node_modules/moment/locale/es.js",
diff --git a/avConfig.js b/avConfig.js
index 842daf19..6d13950e 100644
--- a/avConfig.js
+++ b/avConfig.js
@@ -20,7 +20,7 @@
  * in this same file, which you might want to edit and tune if needed.
  */
 
-var AV_CONFIG_VERSION = 'master';
+var AV_CONFIG_VERSION = '5.0.0';
 
 var avConfigData = {
   // the base url path for ajax requests, for example for sending ballots or
diff --git a/dist/appCommon-vmaster.js b/dist/appCommon-v5.0.0.js
similarity index 100%
rename from dist/appCommon-vmaster.js
rename to dist/appCommon-v5.0.0.js
diff --git a/dist/avConfig-vmaster.js b/dist/avConfig-v5.0.0.js
similarity index 99%
rename from dist/avConfig-vmaster.js
rename to dist/avConfig-v5.0.0.js
index 842daf19..6d13950e 100644
--- a/dist/avConfig-vmaster.js
+++ b/dist/avConfig-v5.0.0.js
@@ -20,7 +20,7 @@
  * in this same file, which you might want to edit and tune if needed.
  */
 
-var AV_CONFIG_VERSION = 'master';
+var AV_CONFIG_VERSION = '5.0.0';
 
 var avConfigData = {
   // the base url path for ajax requests, for example for sending ballots or
diff --git a/dist/avPlugins-vmaster.js b/dist/avPlugins-v5.0.0.js
similarity index 100%
rename from dist/avPlugins-vmaster.js
rename to dist/avPlugins-v5.0.0.js
diff --git a/dist/avThemes-vmaster.js b/dist/avThemes-v5.0.0.js
similarity index 100%
rename from dist/avThemes-vmaster.js
rename to dist/avThemes-v5.0.0.js
diff --git a/dist/index.html b/dist/index.html
index b5c0c188..e947dc4a 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html id="ng-app" ng-app="agora-gui-common"><head><title>Agora Voting</title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><meta charset="utf-8"><link rel="stylesheet" id="theme" href="/themes/default/app.min.css"></head><body><!-- Livereload script for development only (stripped during dist build) --><!-- IE8 bind workaround (needed for less) --><!-- JS from node modules --><!-- Add New Bower Component JS Above --><!-- JS from Vendor Components --><!-- Add New Vendor Component JS Above --><!-- Configuration file JS --><!-- Themes JS --><!-- Main App JS --><!-- registration --><!-- ui --><!-- for security, we do not include the dynamic directive in the app,
-       so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><script src="/libnocompat-vmaster.js"></script><!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-common/blob/master/README.md --><script src="/appCommon-vmaster.js"></script><script src="/avPlugins-vmaster.js"></script></body></html>
\ No newline at end of file
+       so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><script src="/libnocompat-v5.0.0.js"></script><!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-common/blob/master/README.md --><script src="/appCommon-v5.0.0.js"></script><script src="/avPlugins-v5.0.0.js"></script></body></html>
\ No newline at end of file
diff --git a/dist/libCommon-vmaster.js b/dist/libCommon-v5.0.0.js
similarity index 100%
rename from dist/libCommon-vmaster.js
rename to dist/libCommon-v5.0.0.js
diff --git a/dist/libnocompat-vmaster.js b/dist/libnocompat-v5.0.0.js
similarity index 100%
rename from dist/libnocompat-vmaster.js
rename to dist/libnocompat-v5.0.0.js
diff --git a/package.json b/package.json
index 02a1ad67..7e1eb8cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "agora-gui-common",
-  "version" : "4.0.0",
+  "version" : "5.0.0",
   "license": "AGPL-3.0-only",
   "author": {
     "name": "Agora Voting SL and others",