diff --git a/System/Remote/Monitoring/Elastic.hs b/System/Remote/Monitoring/Elastic.hs
--- a/System/Remote/Monitoring/Elastic.hs
+++ b/System/Remote/Monitoring/Elastic.hs
@@ -25,16 +25,15 @@
     , defaultElasticOptions
     ) where
 
-import           Control.Concurrent    (ThreadId, threadDelay)
-import           Control.Concurrent    (forkIO)
+import           Control.Concurrent    (ThreadId, threadDelay, forkIO)
 import           Control.Lens
 import           Control.Monad         (forever, void)
 import           Data.Int              (Int64)
 import           Data.Monoid           ((<>))
 import qualified Data.Text             as T
 import           Data.Text.Lens
-import           Data.Time.Calendar    (toGregorian)
-import           Data.Time.Clock       (getCurrentTime, utctDay)
+import Data.Time.Format (defaultTimeLocale, formatTime)
+import           Data.Time.Clock       (getCurrentTime)
 import           Data.Time.Clock.POSIX (getPOSIXTime)
 import           Network.Wreq          as Wreq
 import qualified System.Metrics        as Metrics
@@ -107,7 +106,7 @@
 defaultElasticOptions = ElasticOptions
     { _host          = "127.0.0.1"
     , _port          = 9200
-    , _indexBase     = "metricbeats"
+    , _indexBase     = "metricbeat"
     , _indexByDate   = True
     , _flushInterval = 1000
     , _debug         = False
@@ -155,11 +154,8 @@
     else return (eo ^. indexBase)
   where
     appendDate base = do
-      day <- toGregorian . utctDay <$> getCurrentTime
-      return $ base <> "-" <> dateStr day
-    dateStr (y, m, d) = T.intercalate "." [toT y, toT m, toT d]
-    toT :: Show a => a -> T.Text
-    toT = T.pack . show
+      day <- formatTime defaultTimeLocale "%Y.%m.%d" <$> getCurrentTime
+      return $ base <> "-" <> (day ^. packed)
 
 --------------------------------------------------------------------------------
 -- | Create a 'BulkRequest' and send it elastic
diff --git a/ekg-elastic.cabal b/ekg-elastic.cabal
--- a/ekg-elastic.cabal
+++ b/ekg-elastic.cabal
@@ -1,5 +1,5 @@
 name:                ekg-elastic
-version:             0.2.1.0
+version:             0.2.2.0
 synopsis:            Push metrics to elastic
 description:
   This library lets you push system metrics to a elastic server.