diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index a51c99d..4c055d3 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -15,17 +15,21 @@
#
killbill.catalog.uri=file:///Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources/NingCatalog.xml
-killbill.overdue.uri=file:///Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources/OverdueConfig.xml
-com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:13306/irs_xna
-com.ning.jetty.jdbi.user=irs_xna
-com.ning.jetty.jdbi.password=irs_xna
+# Use skeleton properties for server and configure killbill database
+com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
+com.ning.jetty.jdbi.user=root
+com.ning.jetty.jdbi.password=root
+# Use the SpyCarAdvanced.xml catalog
+killbill.catalog.uri=SpyCarAdvanced.xml
+
+# Set default timezone to UTC
user.timezone=UTC
+# For bundles that use antlr (string template)
ANTLR_USE_DIRECT_CLASS_LOADING=true
-killbill.billing.util.notificationq.notification.off=true
-killbill.billing.util.persistent.bus.off=true
-killbill.server.multitenant=false
-com.ning.billing.osgi.bundles.jruby.conf.dir=/Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources
+# To enable test endpoint and have Kill Bill run with a ClockMock
+killbill.server.test.mode=true
+
