diff --git a/solr-commit.service b/solr-commit.service
new file mode 100644
index 0000000..a315ec9
--- /dev/null
+++ b/solr-commit.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Solr Optimize service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/curl http://localhost:8983/solr/dovecot/update?commit=true
diff --git a/solr-commit.timer b/solr-commit.timer
new file mode 100644
index 0000000..638518a
--- /dev/null
+++ b/solr-commit.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Solr-commit timer
+
+[Timer]
+OnActiveSec=60s
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/solr-optimize.service b/solr-optimize.service
new file mode 100644
index 0000000..b443cd5
--- /dev/null
+++ b/solr-optimize.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Solr Optimize service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/curl http://localhost:8983/solr/dovecot/update?optimize=true
diff --git a/solr-optimize.timer b/solr-optimize.timer
new file mode 100644
index 0000000..42e9eb3
--- /dev/null
+++ b/solr-optimize.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Solr-optimize timer
+
+[Timer]
+OnActiveSec=1d
+Persistent=true
+
+[Install]
+WantedBy=timers.target