diff --git a/memcached/files/entrypoint.sh b/memcached/files/entrypoint.sh
index d696a8b..87e5822 100644
--- a/memcached/files/entrypoint.sh
+++ b/memcached/files/entrypoint.sh
@@ -1,5 +1,8 @@
 {%- from "memcached/map.jinja" import server with context -%}
-#!/bin/sh
+#!/bin/bash -e
+
+salt-call --local --retcode-passthrough state.highstate
+service {{ server.service }} stop || true
 
 /usr/bin/memcached -m {{ server.cache_size }} \
     -l {{ server.bind.address }} -p {{ server.bind.port }} -U {{ server.bind.port }} \
diff --git a/memcached/server.sls b/memcached/server.sls
index 5f37d51..8ff7409 100644
--- a/memcached/server.sls
+++ b/memcached/server.sls
@@ -17,14 +17,14 @@
 
 {%- if grains.get('virtual_subtype', None) == "Docker" %}
 
-memcached_service:
+memcached_entrypoint:
   file.managed:
   - name: /entrypoint.sh
   - template: jinja
   - source: salt://memcached/files/entrypoint.sh
   - mode: 755
 
-{%- else %}
+{%- endif %}
 
 memcached_service:
   service.running:
@@ -34,5 +34,3 @@
     - file: memcached_config
 
 {%- endif %}
-
-{%- endif %}