diff --git a/handlers/main.yml b/handlers/main.yml
index 09dedab..d694bfb 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Restart adjutant services
-  command: "/bin/true"
-  notify:
-    - Stop services
-    - Start services
-
 - name: Stop services
   service:
     name: "{{ item.value.service_name }}"
@@ -31,6 +25,8 @@
   until: _stop is success
   retries: 5
   delay: 2
+  listen:
+    - Restart adjutant services
 
 - name: Start services
   service:
@@ -46,3 +42,5 @@
   until: _start is success
   retries: 5
   delay: 2
+  listen:
+    - Restart adjutant services
diff --git a/tasks/adjutant_post_install.yml b/tasks/adjutant_post_install.yml
index 0985d36..39e46ed 100644
--- a/tasks/adjutant_post_install.yml
+++ b/tasks/adjutant_post_install.yml
@@ -31,6 +31,7 @@
       config_type: "yaml"
   notify:
     - Restart adjutant services
+    - Restart uwsgi services
 
 - name: Drop Adjutant WSGI Configs
   template:
@@ -42,3 +43,4 @@
   when: adjutant_use_uwsgi | bool
   notify:
     - Restart adjutant services
+    - Restart uwsgi services