diff --git a/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl
index 5ad1d18ce..49c55bde7 100644
--- a/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl
+++ b/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl
@@ -13,6 +13,7 @@ Depends: libgnutls28
 Files: proxysql /usr/bin/
  etc/proxysql.cnf /
  etc/logrotate.d/proxysql /etc/logrotate.d/
+ systemd/system/proxysql-initial.service /lib/
  systemd/system/proxysql.service /lib/
  tools/proxysql_galera_checker.sh /usr/share/proxysql/
  tools/proxysql_galera_writer.pl /usr/share/proxysql/
diff --git a/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl
index f97a3f65b..f333e32e3 100644
--- a/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl
+++ b/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl
@@ -13,6 +13,7 @@ Depends: libgnutls28 | libgnutls30
 Files: proxysql /usr/bin/
  etc/proxysql.cnf /etc/
  etc/logrotate.d/proxysql /etc/logrotate.d/
+ systemd/system/proxysql-initial.service /lib/systemd/system/
  systemd/system/proxysql.service /lib/systemd/system/
  tools/proxysql_galera_checker.sh /usr/share/proxysql/tools/
  tools/proxysql_galera_writer.pl /usr/share/proxysql/tools/
diff --git a/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec b/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec
index d88696c32..06a41c513 100644
--- a/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec
+++ b/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec
@@ -9,7 +9,7 @@ Release: 1
 License: GPL+
 Group: Development/Tools
 SOURCE0 : %{name}-%{version}.tar.gz
-URL: http://www.proxysql.com/
+URL: https://proxysql.com/
 Requires: gnutls
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -84,6 +84,7 @@ fi
 %config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_sysconfdir}/systemd/system/%{name}.service
+%{_sysconfdir}/systemd/system/%{name}-initial.service
 /usr/share/proxysql/tools/proxysql_galera_checker.sh
 /usr/share/proxysql/tools/proxysql_galera_writer.pl
 
diff --git a/systemd/system/proxysql-initial.service b/systemd/system/proxysql-initial.service
new file mode 100644
index 000000000..55f344511
--- /dev/null
+++ b/systemd/system/proxysql-initial.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=High Performance Advanced Proxy for MySQL, this service will reset the database and start ProxySQL
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/systemctl set-environment PROXYSQL_OPTS="--initial"
+ExecStart=/bin/systemctl start proxysql
+ExecStartPost=/bin/systemctl unset-environment PROXYSQL_OPTS
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target