diff --git a/src/controllers/api.js b/src/controllers/api.js
index 9bbb6dc5d7..99571ea65f 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -70,8 +70,6 @@ apiController.getConfig = function(req, res, next) {
 	config.environment = process.env.NODE_ENV;
 	config.loggedIn = !!req.user;
 	config['cache-buster'] = meta.config['cache-buster'] || '';
-	config['script-buster'] = meta.js.hash || '';
-	config['css-buster'] = meta.css.hash || '';
 	config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1;
 	config.topicPostSort = meta.config.topicPostSort || 'oldest_to_newest';
 	config.categoryTopicSort = meta.config.categoryTopicSort || 'newest_to_oldest';
diff --git a/src/meta/configs.js b/src/meta/configs.js
index 65ffb45b11..b7b6a13b33 100644
--- a/src/meta/configs.js
+++ b/src/meta/configs.js
@@ -4,7 +4,8 @@
 var winston = require('winston'),
 	db = require('../database'),
 	pubsub = require('../pubsub'),
-	nconf = require('nconf');
+	nconf = require('nconf'),
+	utils = require('../../public/src/utils');
 
 module.exports = function(Meta) {
 
@@ -20,6 +21,8 @@ module.exports = function(Meta) {
 				return callback(err);
 			}
 
+			config['cache-buster'] = utils.generateUUID();
+
 			Meta.config = config;
 			callback();
 		});
diff --git a/src/webserver.js b/src/webserver.js
index abeb367a90..75bccd6100 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -117,24 +117,6 @@ function cacheStaticFiles(callback) {
 
 	app.enable('cache');
 	app.enable('minification');
-
-	// Configure cache-buster timestamp
-	require('child_process').exec('git describe --tags', {
-		cwd: path.join(__dirname, '../')
-	}, function(err, stdOut) {
-		if (!err) {
-			meta.config['cache-buster'] = stdOut.trim();
-			callback();
-		} else {
-			fs.stat(path.join(__dirname, '../package.json'), function(err, stats) {
-				if (err) {
-					return callback(err);
-				}
-				meta.config['cache-buster'] = new Date(stats.mtime).getTime();
-				callback();
-			});
-		}
-	});
 }
 
 function listen(callback) {